svn commit: r336518 - head/graphics/tiff

[Dirk Meyer]

Author: dinoex
Date: Sun Dec 15 12:22:29 2013
New Revision: 336518
URL: http://svnweb.freebsd.org/changeset/ports/336518

Log:
  - use X11_CONFIGURE_WITH, X11_USE

Modified:
  head/graphics/tiff/Makefile
  head/graphics/tiff/pkg-plist

Modified: head/graphics/tiff/Makefile
==============================================================================
--- head/graphics/tiff/Makefile	Sun Dec 15 12:19:33 2013	(r336517)
+++ head/graphics/tiff/Makefile	Sun Dec 15 12:22:29 2013	(r336518)
@@ -81,6 +81,9 @@ MLINKS=	TIFFError.3tiff          TIFFSet
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
+OPTIONS_SUB=	yes
+X11_CONFIGURE_WITH=	x libgl
+X11_USE=	xorg=sm,ice,xmu,xi,x11 gl=glut,glu,gl
 
 .include <bsd.port.options.mk>
 
@@ -93,15 +96,6 @@ __pmlinks3!= ${ECHO_CMD} '${MLINKS:S/   
 	} }'
 .endif
 
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	sm ice xmu xi x11
-USE_GL=		glut glu gl
-PLIST_SUB+=	WITH_X11=""
-.else
-CONFIGURE_ARGS+=	--without-x --without-libgl
-PLIST_SUB+=	WITH_X11="@comment "
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} \
 		-e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \

Modified: head/graphics/tiff/pkg-plist
==============================================================================
--- head/graphics/tiff/pkg-plist	Sun Dec 15 12:19:33 2013	(r336517)
+++ head/graphics/tiff/pkg-plist	Sun Dec 15 12:22:29 2013	(r336518)
@@ -17,7 +17,7 @@ bin/tiffcp
 bin/tiffcrop
 bin/tiffdither
 bin/tiffdump
-%%WITH_X11%%bin/tiffgt
+%%X11%%bin/tiffgt
 bin/tiffinfo
 bin/tiffmedian
 bin/tiffset