This package has a controversial history. It was originally "given" to

the ImageMagick team, where Bob Friesenhahn made it work with IM.

Since then, Bob and other developers forked GraphicsMagick. libfpx
remained unchanged until January 2005, when ImageMagick released an
updated tar-ball with a patch applied. The release was botched (missing
a subdirectory) and I changed the port to use the old tar-ball on
GraphicsMagick's site and apply the same patch.

Since then, GraphicsMagick replaced the old 1.2.0.9 tarball with the new
1.2.0.10, where the patch is applied. On the same date, ImageMagick,
not to be outdone, "released" 1.2.0.11, WHICH IS NO DIFFERENT from
GraphicsMagick's version, except for libtool/configure soup.

I'm now switching the port to ImageMagick's mirrors again, simply
because they seem to have better bandwidth.

I must add, for the record, that ImageMagick team's behavior appears
rather dubious and unscrupulous in this incident. There was no need to
"release" their own tarball, especially considering, that some sources
are marked as "GraphicsMagick" (an embarassing oversight). I also
found, that those of my postings on ImageMagick's support forum, which
mentioned GraphicsMagick, were misteriously removed from the board
shortly after posting...

This update is made neccessary by there being no MASTER_SITES for the
original 1.2.0.9 tarball left. While at it, however, I also remove the
jpeg-dependency -- libfpx does not, actually, use it.

Prompted by: pointyhat	(kris)

3 files changed, 23 insertions, 11 deletions

diff --git a/graphics/libfpx/Makefile b/graphics/libfpx/Makefile
index 28efdd7..53de702 100644
--- a/graphics/libfpx/Makefile
+++ b/graphics/libfpx/Makefile
@@ -6,22 +6,34 @@
 #
 
 PORTNAME=	libfpx
-PORTVERSION=	1.2.0.9
-PORTREVISION=	1
+PORTVERSION=	1.2.0.11
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.graphicsmagick.org/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR=	GraphicsMagick/delegates
+MASTER_SITES=	ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
+		ftp://ftp.sunet.se/pub/multimedia/graphics/%SUBDIR%/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/ImageMagick,} \
+		ftp://ftp.crc.ca/pub/packages/graphics/imagemagick/ \
+		ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \
+		ftp://ftp.planetmirror.com/pub/%SUBDIR%/ \
+		ftp://ftp.fu-berlin.de/unix/X11/graphics/%SUBDIR%/ \
+		ftp://zoffy.asahi-net.or.jp/pub/graphics/%SUBDIR%/ \
+		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/%SUBDIR%/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/graphics/%SUBDIR%/ \
+		ftp://ftp.kddlabs.co.jp/graphics/%SUBDIR%/ \
+		ftp://ftp.icm.edu.pl/pub/graphics/%SUBDIR%/ \
+		ftp://giswitch.sggw.waw.pl/pub/graphics/%SUBDIR%/ \
+		ftp://ftp.fifi.org/pub/%SUBDIR%/ \
+		ftp://ftp.simplesystems.org/pub/%SUBDIR%/
+MASTER_SITE_SUBDIR=ImageMagick/delegates
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Library routines for working with Flashpix images
 
-PATCHFILES=	libfpx.diff
-PATCH_SITES=	http://www.kdewebdev.org/~amantia/
-PATCH_DIST_STRIP=-p1
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 MAKE_ARGS+=	-j2
 USE_BZIP2=	yes
 
+post-patch:
+	${RM} ${WRKSRC}/ri_image/wchar.c
+
 INSTALLS_SHLIB=	yes
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
diff --git a/graphics/libfpx/distinfo b/graphics/libfpx/distinfo
index 47ecad0..78eb36f 100644
--- a/graphics/libfpx/distinfo
+++ b/graphics/libfpx/distinfo
@@ -1,4 +1,4 @@
-MD5 (libfpx-1.2.0.9.tar.bz2) = aa9a74dbcacbd5884c9aa3d4c97f9db7
-SIZE (libfpx-1.2.0.9.tar.bz2) = 2240442
+MD5 (libfpx-1.2.0.11.tar.bz2) = 96f4b64d0513956206731a2302de4eca
+SIZE (libfpx-1.2.0.11.tar.bz2) = 2300670
 MD5 (libfpx.diff) = 6446475771ea4a7344957af0fef71350
 SIZE (libfpx.diff) = 1545
diff --git a/graphics/libfpx/files/Makefile.bsd b/graphics/libfpx/files/Makefile.bsd
index 4f1e3d6..78d0127 100644
--- a/graphics/libfpx/files/Makefile.bsd
+++ b/graphics/libfpx/files/Makefile.bsd
@@ -28,7 +28,7 @@ CPPS	+=	${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS}
 SRCS	=	${CPPS:T}
 
 CXXFLAGS+=	-fno-rtti -fno-exceptions ${HAVES}
-LDADD	+=	-L${LOCALBASE}/lib -ljpeg -lstdc++
+LDADD	+=	-L${LOCALBASE}/lib -lm -lstdc++
 
 .PATH: ${CPPS:H}