svn commit: r337838 - head/graphics/gd
Dirk Meyer
dinoex at FreeBSD.org
Sat Dec 28 06:37:49 UTC 2013
Author: dinoex
Date: Sat Dec 28 06:37:48 2013
New Revision: 337838
URL: http://svnweb.freebsd.org/changeset/ports/337838
Log:
- use OPT_CONFIGURE_*
Modified:
head/graphics/gd/Makefile
Modified: head/graphics/gd/Makefile
==============================================================================
--- head/graphics/gd/Makefile Sat Dec 28 06:37:24 2013 (r337837)
+++ head/graphics/gd/Makefile Sat Dec 28 06:37:48 2013 (r337838)
@@ -36,6 +36,9 @@ ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_AR
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 <bsd.port.options.mk>
@@ -43,16 +46,6 @@ PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgc
# 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,
More information about the svn-ports-all
mailing list