[Midnightbsd-cvs] mports: graphics/gd: Overhaul Makefile.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Overhaul Makefile.

Switch to options framework.  Allow options for x11, xpm, fontconfig, iconv.

Clean up MAKE_ENV

Modified Files:
--------------
    mports/graphics/gd:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/gd/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L graphics/gd/Makefile -L graphics/gd/Makefile -u -r1.3 -r1.4
--- graphics/gd/Makefile
+++ graphics/gd/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	2.0.35
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.libgd.org/releases/
@@ -23,25 +23,48 @@
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-MAKE_ENV=	WRKSRC="${WRKSRC}" CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
+USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 SCRIPTDIR=	${FILESDIR}
-CPPFLAGS+=	-DHAVE_FT2BUILD_H
+CPPFLAGS+=	-DHAVE_ERRNO_H -DHAVE_FT2BUILD_H -DHAVE_LIBFREETYPE -DHAVE_LIBJPEG -DHAVE_LIBPNG \
+		-DHAVE_LIBZ -DHAVE_STDDEF_H -DHAVE_STDINT_H -DHAVE_STDLIB_H
+LDFLAGS2=	-L${PREFIX}/lib -L${LOCALBASE}/lib
+FEATURES=	GD_JPEG GD_FREETYPE GD_PNG GD_GIF GD_GIFANIM GD_OPENPOLYGON
 FAKE_OPTS=	trueprefix
 WANT_PERL=	yes
 
+OPTIONS=	X11 "X11 Support" off \
+		XPM "XPM color bitmap loading support (requires X11)" off \
+		FONTCONFIG "fontconfig library support (requires X11)" off \
+		ICONV "iconv support" off
+
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_XPM) && !defined(WITHOUT_X11)
+.if !defined(WITHOUT_X11)
+.if defined(WITH_XPM)
 USE_XORG=	xpm x11
 CPPFLAGS+=	-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include -DHAVE_LIBXPM
 LDFLAGS+=	-L${LOCALBASE}/lib -lXpm -lX11
-LDFLAGS2=	-L${PREFIX}/lib -L${LOCALBASE}/lib
-FEATURES=	GD_XPM GD_JPEG GD_FONTCONFIG GD_FREETYPE GD_GIF GD_PNG
-.else
-LDFLAGS2=	-L${PREFIX}/lib -L${LOCALBASE}/lib
-FEATURES=	GD_JPEG GD_FONTCONFIG GD_FREETYPE GD_GIF GD_PNG
+LDFLAGS2+=	-L${LOCALBASE}/lib
+FEATURES+=	GD_XPM
+.endif
+
+.if defined(WITH_FONTCONFIG)
+LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_LIBFONTCONFIG -DHAVE_PTHREAD ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -lfontconfig
+LDFLAGS2+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+FEATURES+=	GD_FONTCONFIG
+.endif
+
+.endif
+
+.if defined(WITH_ICONV)
+USE_ICONV=	yes
+CPPFLAGS+=	-DHAVE_ICONV -DHAVE_ICONV_H -DHAVE_ICONV_T_DEF
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 .endif
 
 .if defined(GD_FONTS)
@@ -49,9 +72,7 @@
 SCRIPTS_ENV+=		GD_FONTS="${GD_FONTS}"
 .endif
 
-pre-everything::
-	@${ECHO_MSG} "gd has the following tunables:"
-	@${ECHO_MSG} "	WITH_XPM=yes			Turns on Xpm support"
+FONTBASE=	${LOCALBASE}/lib/X11/fonts
 
 post-configure:
 	${SED} -e 's|@libdir@|${PREFIX}/lib|' \
@@ -65,6 +86,9 @@
 		-e 's|@FEATURES@|${FEATURES}|' \
 		${WRKSRC}/config/gdlib-config.in \
 		> ${WRKDIR}/gdlib-config
+	${REINPLACE_CMD} \
+		-e 's|#define DEFAULT_FONTPATH .*|#define DEFAULT_FONTPATH "${FONTBASE}/TTF:${FONTBASE}/Type1:${FONTBASE}"|' \
+		${WRKSRC}/gd.h
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gdfx.h ${WRKSRC}/gdhelpers.h \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/gd/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/gd/distinfo -L graphics/gd/distinfo -u -r1.2 -r1.3
--- graphics/gd/distinfo
+++ graphics/gd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gd-2.0.35.tar.gz) = 982963448dc36f20cb79b6e9ba6fdede
-SHA256 (gd-2.0.35.tar.gz) = bbd16b9c268377aaea9c3c2d64c5c1104c53600e4090f222d7bb38938c3d7d52
-SIZE (gd-2.0.35.tar.gz) = 1345700
+MD5 (gd-2.0.35.tar.bz2) = 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
+SHA256 (gd-2.0.35.tar.bz2) = bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
+SIZE (gd-2.0.35.tar.bz2) = 1212730