aboutsummaryrefslogtreecommitdiffstats
path: root/print
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2015-07-27 09:18:53 +0800
committerhrs <hrs@FreeBSD.org>2015-07-27 09:18:53 +0800
commitfd0c38bf4011f349d96d83fe3dc8a97080ac354e (patch)
treed47de09741b45d5e1118a29045a23e6dd5c0d6e2 /print
parent646c92f0b10f8c88d44f48538968168345dacf44 (diff)
downloadfreebsd-ports-gnome-fd0c38bf4011f349d96d83fe3dc8a97080ac354e.tar.gz
freebsd-ports-gnome-fd0c38bf4011f349d96d83fe3dc8a97080ac354e.tar.zst
freebsd-ports-gnome-fd0c38bf4011f349d96d83fe3dc8a97080ac354e.zip
- 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
Diffstat (limited to 'print')
-rw-r--r--print/ghostscript7-nox11/Makefile2
-rw-r--r--print/ghostscript8-nox11/Makefile2
-rw-r--r--print/ghostscript9-agpl-nox11/Makefile2
-rw-r--r--print/ghostscript9-nox11/Makefile2
4 files changed, 4 insertions, 4 deletions
diff --git a/print/ghostscript7-nox11/Makefile b/print/ghostscript7-nox11/Makefile
index 0d4a87498e3a..320d1499ebef 100644
--- a/print/ghostscript7-nox11/Makefile
+++ b/print/ghostscript7-nox11/Makefile
@@ -1,7 +1,7 @@
# Created by: Nik Clayton <nik@FreeBSD.org>
# $FreeBSD$
-WITHOUT_X11= yes
+DEPENDS_ARGS+= print_ghostscript7_UNSET_FORCE+=X11
MASTERDIR= ${.CURDIR}/../ghostscript7
diff --git a/print/ghostscript8-nox11/Makefile b/print/ghostscript8-nox11/Makefile
index d2ce0e8adf6d..d9ad1f0e4625 100644
--- a/print/ghostscript8-nox11/Makefile
+++ b/print/ghostscript8-nox11/Makefile
@@ -1,7 +1,7 @@
# Created by: Nik Clayton <nik@FreeBSD.org>
# $FreeBSD$
-OPTIONS_UNSET= X11
+DEPENDS_ARGS+= print_ghostscript8_UNSET_FORCE+=X11
MASTERDIR= ${.CURDIR}/../ghostscript8
diff --git a/print/ghostscript9-agpl-nox11/Makefile b/print/ghostscript9-agpl-nox11/Makefile
index 2a5d7b6fe65e..47cb48eb8757 100644
--- a/print/ghostscript9-agpl-nox11/Makefile
+++ b/print/ghostscript9-agpl-nox11/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-OPTIONS_UNSET= X11
+DEPENDS_ARGS+= print_ghostscript9-agpl_UNSET_FORCE+=X11
MASTERDIR= ${.CURDIR}/../ghostscript9-agpl
diff --git a/print/ghostscript9-nox11/Makefile b/print/ghostscript9-nox11/Makefile
index 9aa91cda0c9f..f704708db82d 100644
--- a/print/ghostscript9-nox11/Makefile
+++ b/print/ghostscript9-nox11/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-OPTIONS_UNSET= X11
+DEPENDS_ARGS+= print_ghostscript9_UNSET_FORCE+=X11
MASTERDIR= ${.CURDIR}/../ghostscript9