svn commit: r350231 - head/graphics/giflib

[Dirk Meyer]

Author: dinoex
Date: Sat Apr  5 14:19:32 2014
New Revision: 350231
URL: http://svnweb.freebsd.org/changeset/ports/350231
QAT: https://qat.redports.org/buildarchive/r350231/

Log:
  - use CONFIGURE_ENABLE
  - register all x11 libs
  - fix build with gcc48

Modified:
  head/graphics/giflib/Makefile

Modified: head/graphics/giflib/Makefile
==============================================================================
--- head/graphics/giflib/Makefile	Sat Apr  5 14:19:29 2014	(r350230)
+++ head/graphics/giflib/Makefile	Sat Apr  5 14:19:32 2014	(r350231)
@@ -20,8 +20,11 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCBOOK X11
+OPTIONS_SUB=	yes
 DOCBOOK_DESC=	Generate API documentation (requires DOCS)
 
+X11_CONFIGURE_ENABLE=	x11
+
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
@@ -33,12 +36,9 @@ PLIST_SUB+=	WITH_DOCBOOK='@comment '
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-USE_XORG=	sm x11
-PLIST_SUB+=	X11=''
+USE_XORG=	x11 sm ice
 CPPFLAGS+=	-I${LOCALBASE}/include
 .else
-PLIST_SUB+=	X11='@comment '
-CONFIGURE_ARGS+=	--with-x=no
 NOX11SUFFIX=	-nox11
 .endif