svn commit: r357344 - head/graphics/tiff

[Dirk Meyer]

Author: dinoex
Date: Tue Jun 10 16:10:54 2014
New Revision: 357344
URL: http://svnweb.freebsd.org/changeset/ports/357344
QAT: https://qat.redports.org/buildarchive/r357344/

Log:
  - drop option X11
  - remove "tiffgt" from port
  PR:		190816

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

Modified: head/graphics/tiff/Makefile
==============================================================================
--- head/graphics/tiff/Makefile	Tue Jun 10 16:08:51 2014	(r357343)
+++ head/graphics/tiff/Makefile	Tue Jun 10 16:10:54 2014	(r357344)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tiff
 PORTVERSION=	4.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://download.osgeo.org/libtiff/
@@ -22,9 +22,10 @@ USES=		libtool:oldver
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-jpeg-include-dir=${LOCALBASE}/include \
-			--with-jpeg-lib-dir=${LOCALBASE}/lib
+			--with-jpeg-lib-dir=${LOCALBASE}/lib \
+			--without-x
 
-MLINKS=	TIFFError.3tiff          TIFFSetErrorHandler.3tiff \
+MLNKS=	TIFFError.3tiff          TIFFSetErrorHandler.3tiff \
 	TIFFFlush.3tiff          TIFFFlushData.3tiff \
 	TIFFGetField.3tiff       TIFFGetFieldDefaulted.3tiff \
 	TIFFGetField.3tiff       TIFFVGetField.3tiff \
@@ -82,16 +83,10 @@ MLINKS=	TIFFError.3tiff          TIFFSet
 	TIFFtile.3tiff           TIFFTileRowSize.3tiff \
 	TIFFtile.3tiff           TIFFVTileSize.3tiff
 
-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>
 
 .if !defined(BUILDING_INDEX)
-__pmlinks3!= ${ECHO_CMD} '${MLINKS:S/    / /}' | ${AWK} \
+__pmlinks3!= ${ECHO_CMD} '${MLNKS:S/    / /}' | ${AWK} \
 	'{ if (NF % 2 != 0) { print "broken"; exit; } \
 	for (i=1; i<=NF; i++) { \
 		if ( i % 2 == 0) { print " " $$i " ;"; } \
@@ -103,6 +98,9 @@ pre-configure:
 	${REINPLACE_CMD} \
 		-e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \
 		${WRKSRC}/libtiff/Makefile.in
+	${REINPLACE_CMD} \
+		-e 's|tiffgt.1 ||' \
+		${WRKSRC}/man/Makefile.in
 	${REINPLACE_CMD} -e 's|^docfiles|no-docfiles|' \
 		-e 's|man html|man|' ${WRKSRC}/Makefile.in
 

Modified: head/graphics/tiff/pkg-plist
==============================================================================
--- head/graphics/tiff/pkg-plist	Tue Jun 10 16:08:51 2014	(r357343)
+++ head/graphics/tiff/pkg-plist	Tue Jun 10 16:10:54 2014	(r357344)
@@ -17,7 +17,6 @@ bin/tiffcp
 bin/tiffcrop
 bin/tiffdither
 bin/tiffdump
-%%X11%%bin/tiffgt
 bin/tiffinfo
 bin/tiffmedian
 bin/tiffset
@@ -56,7 +55,6 @@ man/man1/tiffcp.1.gz
 man/man1/tiffcrop.1.gz
 man/man1/tiffdither.1.gz
 man/man1/tiffdump.1.gz
-man/man1/tiffgt.1.gz
 man/man1/tiffinfo.1.gz
 man/man1/tiffmedian.1.gz
 man/man1/tiffset.1.gz