[Midnightbsd-cvs] mports: graphics/libfpx: Fix libfpx so that ImageMagick works

[laffer1 at midnightbsd.org]

Log Message:
-----------
Fix libfpx so that ImageMagick works

Modified Files:
--------------
    mports/graphics/libfpx:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.2 -> r1.3)
    mports/graphics/libfpx/files:
        Makefile.bsd (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/libfpx/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/libfpx/pkg-plist -L graphics/libfpx/pkg-plist -u -r1.2 -r1.3
--- graphics/libfpx/pkg-plist
+++ graphics/libfpx/pkg-plist
@@ -1,4 +1,4 @@
-lib/libfpx.so.1
+lib/libfpx.so.2
 lib/libfpx.so
 lib/libfpx.a
 include/fpxlib.h
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/libfpx/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/libfpx/Makefile -L graphics/libfpx/Makefile -u -r1.2 -r1.3
--- graphics/libfpx/Makefile
+++ graphics/libfpx/Makefile
@@ -1,43 +1,32 @@
-# New ports collection makefile for:	fpx
-# Date created:				Jan 10 2001
-# Whom:					Mikhail Teterin <mi at aldan.algebra.com>
-#
-# $FreeBSD: ports/graphics/libfpx/Makefile,v 1.19 2005/03/01 17:43:34 mi Exp $
 # $MidnightBSD$
-#
 
 PORTNAME=	libfpx
 PORTVERSION=	1.2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
-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
+MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL}
+MASTER_SITE_SUBDIR=	ehaupt
+PATCHFILES=	fpx.mega-patch.2007-11-01.bz2
+PATCH_SITES=	http://aldan.algebra.com/~mi/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Library routines for working with Flashpix images
-LICENSE=	unknown
+LICENSE=	other
 
-MAKE_ARGS+=	-j2
+MAKE_ARGS+=	-j`${SYSCTL} -n hw.ncpu`
 USE_BZIP2=	yes
 
 post-patch:
-	${RM} ${WRKSRC}/ri_image/wchar.c
+	${RM} ${WRKSRC}/ri_image/wchar.c ${WRKSRC}/fpx/fpxlib.h
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 .include <bsd.port.mk>
+
+# We want the port's Makefile to build compiler-flags from scratch
+# (based on WARNS= in particular) instead of being influenced by
+# the environment... There is no obvious way to prevent bsd.port.mk
+# from adding CFLAGS and CXXFLAGS to the build environment, so we
+# remove them here.
+MAKE_ENV:=	${MAKE_ENV:NCFLAGS=*:NCXXFLAGS=*}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/libfpx/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libfpx/distinfo -L graphics/libfpx/distinfo -u -r1.1 -r1.2
--- graphics/libfpx/distinfo
+++ graphics/libfpx/distinfo
@@ -1,3 +1,6 @@
 MD5 (libfpx-1.2.0.12.tar.bz2) = a82d33cc0ede71752802da0f410398b8
 SHA256 (libfpx-1.2.0.12.tar.bz2) = c9b5ec94c255cbfebcefa6a045f5c7ca3c8ab9de2ad17b88ba4bfce924b91a97
 SIZE (libfpx-1.2.0.12.tar.bz2) = 2301747
+MD5 (fpx.mega-patch.2007-11-01.bz2) = 56a2ad668275485c2767924abb8a7209
+SHA256 (fpx.mega-patch.2007-11-01.bz2) = 1b71d5178c2b85d673e5fece161834d27942c829918ff2c04840f07ffecfab6d
+SIZE (fpx.mega-patch.2007-11-01.bz2) = 122232
Index: Makefile.bsd
===================================================================
RCS file: /home/cvs/mports/graphics/libfpx/files/Makefile.bsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libfpx/files/Makefile.bsd -L graphics/libfpx/files/Makefile.bsd -u -r1.1 -r1.2
--- graphics/libfpx/files/Makefile.bsd
+++ graphics/libfpx/files/Makefile.bsd
@@ -1,7 +1,8 @@
 LIB	=	fpx
 INCS	=	fpxlib.h
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 SHLIB_MINOR=	7
+WARNS=	3
 
 LIBDIR	=	${LOCALBASE}/lib
 INCSDIR	=	${LOCALBASE}/include
@@ -26,17 +27,21 @@
 
 CPPS	+=	${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS}
 
-SRCS	=	${CPPS:T}
+SRCS	=	${CPPS:T:Nejpeg.c}
 
-CXXFLAGS+=	-fno-rtti -fno-exceptions ${HAVES}
+CXXFLAGS+=	-fno-rtti -fno-exceptions -fno-strict-aliasing ${HAVES}
 LDADD	+=	-L${LOCALBASE}/lib -lm -lstdc++
 
 .PATH: ${CPPS:H}
 
-.for d in oless/h jpeg ole basics ri_image oless fpx
+.for d in oless/h jpeg ole basics ri_image oless fpx .
 CXXFLAGS+=	-I${.CURDIR}/$d
 .endfor
 
 CXXFLAGS+=	-I${LOCALBASE}/include -D_UNIX
 
 .include <bsd.lib.mk>
+
+# Work-around the bug in g++4.2's system header:
+# /usr/include/c++/4.2/bits/basic_ios.h:156: warning: empty body in an if-statement
+CXXFLAGS:=	${CXXFLAGS:N-Wsystem-headers}