svn commit: r392327 - head/print/apsfilter

[Koop Mast]

Author: kwm
Date: Thu Jul 16 22:29:19 2015
New Revision: 392327
URL: https://svnweb.freebsd.org/changeset/ports/392327

Log:
  Fix index after ghostscript USES addition.
  
  Allow USES=ghostscript to select which port we need.
  Manualy set WITHOUT_X11 in the !X11 case since USES=ghostscript
  doesn't check PORT_OPTIONS for set/unset of the X11 option.

Modified:
  head/print/apsfilter/Makefile

Modified: head/print/apsfilter/Makefile
==============================================================================
--- head/print/apsfilter/Makefile	Thu Jul 16 22:12:16 2015	(r392326)
+++ head/print/apsfilter/Makefile	Thu Jul 16 22:29:19 2015	(r392327)
@@ -50,6 +50,7 @@ COMPRESS_DESC=	print compressed document
 DOCS_MAKE_ARGS=	-DDOCS
 PORTDOCS=	ANNOUNCE FAQ HOWTO-BUGREPORTS apsfilter4.png \
 		README.BSD handbook.html README.TeX paper
+GS_USES=	ghostscript:run
 
 .include <bsd.port.options.mk>
 
@@ -58,9 +59,9 @@ PORTDOCS=	ANNOUNCE FAQ HOWTO-BUGREPORTS 
 # (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
 # sure that NO_X is defined *and* has a value.
 MAKE_ENV+=	NO_X=true
-.if empty(GHOSTSCRIPT_PORT:M*-nox11)
-GSUFX=	-nox11
-.endif
+# ghostscript.mk USES doesn't check PORT_OPTIONS:MX11, so set this manualy
+# so it selects the nox11 gs port
+WITHOUT_X11=	yes
 .endif
 
 # hint: for batch mode you can now draw the following decisions
@@ -76,7 +77,6 @@ PSUFX=	-letter
 PSUFX=	-letterdj
 .endif
 
-_DEPENDS_GS=	gs:${PORTSDIR}/${GHOSTSCRIPT_PORT}${GSUFX}
 _DEPENDS_ASCII=	a2ps:${PORTSDIR}/print/a2ps \
 		enscript:${PORTSDIR}/print/enscript${PSUFX} \
 		mpage:${PORTSDIR}/print/mpage \