From 1df7965f6abc4ef1bb80e68e8ab6ca5a0b7e9342 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Sat, 28 Dec 2013 06:37:48 +0000 Subject: [PATCH] - use OPT_CONFIGURE_* --- graphics/gd/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 457ec891d1fc..c289c6766912 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -36,6 +36,9 @@ ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --with-libiconv-prefix=no VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_OFF= --without-vpx +XPM_USE= xorg=xpm,x11 +XPM_CONFIGURE_ON= --with-x +XPM_CONFIGURE_OFF= --with-xpm=no .include @@ -43,16 +46,6 @@ PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig # force gdlib-config --ldflags LDFLAGS+= -L${LOCALBASE}/lib -# honor global WITHOUT_X11 -.if !defined(WITHOUT_X11) -.if ${PORT_OPTIONS:MXPM} -USE_XORG= xpm x11 -GNU_CONFIGURE_ARGS+= --with-x -.else -GNU_CONFIGURE_ARGS+= --with-xpm=no -.endif -.endif - # The GD_FONTS environment variable can be set to specify the gzipped # tar-ball containing the fonts in bdf format and the bdf file names. # The tarball is the first argument, the tiny, small, medium-bold,