From owner-svn-ports-head@freebsd.org  Thu Jul 16 22:29:20 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40BB89A450A;
 Thu, 16 Jul 2015 22:29:20 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 31A921AEF;
 Thu, 16 Jul 2015 22:29:20 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6GMTK0l018119;
 Thu, 16 Jul 2015 22:29:20 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6GMTKen018118;
 Thu, 16 Jul 2015 22:29:20 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201507162229.t6GMTKen018118@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Thu, 16 Jul 2015 22:29:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r392327 - head/print/apsfilter
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jul 2015 22:29:20 -0000

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 \