From owner-svn-ports-all@freebsd.org Mon Jul 27 01:18:55 2015 Return-Path: Delivered-To: svn-ports-all@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 B9D119AACFB; Mon, 27 Jul 2015 01:18:55 +0000 (UTC) (envelope-from hrs@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 A9107D20; Mon, 27 Jul 2015 01:18:55 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6R1Itn1072510; Mon, 27 Jul 2015 01:18:55 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6R1IrXM072503; Mon, 27 Jul 2015 01:18:53 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201507270118.t6R1IrXM072503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 27 Jul 2015 01:18:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392952 - in head: Mk/Uses print/ghostscript7-nox11 print/ghostscript8-nox11 print/ghostscript9-agpl-nox11 print/ghostscript9-nox11 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 01:18:55 -0000 Author: hrs Date: Mon Jul 27 01:18:53 2015 New Revision: 392952 URL: https://svnweb.freebsd.org/changeset/ports/392952 Log: - Fix -nox11 packages and ghostscript:nox11 in ghostscript.mk. This also fixes an issue that user-defined OPTIONS_UNSET was overridden. - Loosen up depdendency a bit by using a binary instead of a package name. PR: 201864 Modified: head/Mk/Uses/ghostscript.mk head/print/ghostscript7-nox11/Makefile head/print/ghostscript8-nox11/Makefile head/print/ghostscript9-agpl-nox11/Makefile head/print/ghostscript9-nox11/Makefile Modified: head/Mk/Uses/ghostscript.mk ============================================================================== --- head/Mk/Uses/ghostscript.mk Sun Jul 26 23:00:18 2015 (r392951) +++ head/Mk/Uses/ghostscript.mk Mon Jul 27 01:18:53 2015 (r392952) @@ -84,19 +84,18 @@ _GS_SELECTED?= 7 IGNORE?= Invalid ghostscript argument or GHOSTSCRIPT_DEFAULT .endif -.undef _GS_NOX11_SUFFIX -.if ${_GS_ARGS:Mnox11} || defined(WITHOUT_X11) -_GS_NOX11_SUFFIX= -nox11 -.endif - # dependencies -_GS_PORT= ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}${_GS_NOX11_SUFFIX} +_GS_PORT= ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX} + +.if ${_GS_ARGS:Mnox11} +DEPENDS_ARGS+= print_${_GS_PORT}_UNSET_FORCE+=X11 +.endif .if defined(_GS_BUILD_DEP) -BUILD_DEPENDS+= ${_GS_PORT}>=0:${PORTSDIR}/print/${_GS_PORT} +BUILD_DEPENDS+= gs:${PORTSDIR}/print/${_GS_PORT} .endif .if defined(_GS_RUN_DEP) -RUN_DEPENDS+= ${_GS_PORT}>=0:${PORTSDIR}/print/${_GS_PORT} +RUN_DEPENDS+= gs:${PORTSDIR}/print/${_GS_PORT} .endif .endif # _INCLUDE_USES_GHOSTSCRIPT_MK Modified: head/print/ghostscript7-nox11/Makefile ============================================================================== --- head/print/ghostscript7-nox11/Makefile Sun Jul 26 23:00:18 2015 (r392951) +++ head/print/ghostscript7-nox11/Makefile Mon Jul 27 01:18:53 2015 (r392952) @@ -1,7 +1,7 @@ # Created by: Nik Clayton # $FreeBSD$ -WITHOUT_X11= yes +DEPENDS_ARGS+= print_ghostscript7_UNSET_FORCE+=X11 MASTERDIR= ${.CURDIR}/../ghostscript7 Modified: head/print/ghostscript8-nox11/Makefile ============================================================================== --- head/print/ghostscript8-nox11/Makefile Sun Jul 26 23:00:18 2015 (r392951) +++ head/print/ghostscript8-nox11/Makefile Mon Jul 27 01:18:53 2015 (r392952) @@ -1,7 +1,7 @@ # Created by: Nik Clayton # $FreeBSD$ -OPTIONS_UNSET= X11 +DEPENDS_ARGS+= print_ghostscript8_UNSET_FORCE+=X11 MASTERDIR= ${.CURDIR}/../ghostscript8 Modified: head/print/ghostscript9-agpl-nox11/Makefile ============================================================================== --- head/print/ghostscript9-agpl-nox11/Makefile Sun Jul 26 23:00:18 2015 (r392951) +++ head/print/ghostscript9-agpl-nox11/Makefile Mon Jul 27 01:18:53 2015 (r392952) @@ -1,6 +1,6 @@ # $FreeBSD$ -OPTIONS_UNSET= X11 +DEPENDS_ARGS+= print_ghostscript9-agpl_UNSET_FORCE+=X11 MASTERDIR= ${.CURDIR}/../ghostscript9-agpl Modified: head/print/ghostscript9-nox11/Makefile ============================================================================== --- head/print/ghostscript9-nox11/Makefile Sun Jul 26 23:00:18 2015 (r392951) +++ head/print/ghostscript9-nox11/Makefile Mon Jul 27 01:18:53 2015 (r392952) @@ -1,6 +1,6 @@ # $FreeBSD$ -OPTIONS_UNSET= X11 +DEPENDS_ARGS+= print_ghostscript9_UNSET_FORCE+=X11 MASTERDIR= ${.CURDIR}/../ghostscript9