svn commit: r392952 - in head: Mk/Uses print/ghostscript7-nox11 print/ghostscript8-nox11 print/ghostscript9-agpl-nox11 print/ghostscript9-nox11
Hiroki Sato
hrs at FreeBSD.org
Mon Jul 27 01:18:55 UTC 2015
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 <nik at FreeBSD.org>
# $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 <nik at FreeBSD.org>
# $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
More information about the svn-ports-all
mailing list