Date: Fri, 2 Dec 2005 17:12:36 +0100 (CET) From: Ulrich Spoerlein <q@galgenberg.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: netchild@FreeBSD.org Subject: ports/89853: Teach bsd.port.mk about ghostscript-gpl Message-ID: <200512021612.jB2GCaO3084706@roadrunner.q.local> Resent-Message-ID: <200512021620.jB2GK7jo048437@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 89853
>Category: ports
>Synopsis: Teach bsd.port.mk about ghostscript-gpl
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 02 16:20:07 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
>Description:
bsd.port.mk checks if WITH_GHOSTSCRIPT_AFPL is defined and then checks
explicitly if it is set to "yes". If you happen to set it to "true"
it is ignored.
And ghostscript-gpl which is in the tree for several months now is
missing too.
>How-To-Repeat:
>Fix:
Remove the explicit check for "yes"
Add ghostscript-gpl to the list
--- gs.patch begins here ---
--- bsd.port.mk.orig Thu Nov 10 03:23:34 2005
+++ bsd.port.mk Fri Dec 2 17:05:45 2005
@@ -330,6 +330,9 @@
# Some installations may wish to override the default
# to specify a version without X11 and/or localized
# versions for their nationality.
+# WITH_GHOSTSCRIPT_GPL
+# - If set, this port uses the GPL version of the ghostscript
+# software instead of the GNU version, which is used otherwise.
# WITH_GHOSTSCRIPT_AFPL
# - If set, this port uses the AFPL version of the ghostscript
# software instead of the GNU version, which is used otherwise.
@@ -1784,21 +1787,17 @@
# compatible functionality.
.if !defined(WITHOUT_X11)
.if defined(WITH_GHOSTSCRIPT_AFPL)
-.if ${WITH_GHOSTSCRIPT_AFPL} == yes
GHOSTSCRIPT_PORT?= print/ghostscript-afpl
-.else
-GHOSTSCRIPT_PORT?= print/ghostscript-gnu
-.endif
+.elif defined(WITH_GHOSTSCRIPT_GPL)
+GHOSTSCRIPT_PORT?= print/ghostscript-gpl
.else
GHOSTSCRIPT_PORT?= print/ghostscript-gnu
.endif
.else
.if defined(WITH_GHOSTSCRIPT_AFPL)
-.if ${WITH_GHOSTSCRIPT_AFPL} == yes
GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11
-.else
-GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11
-.endif
+.elif defined(WITH_GHOSTSCRIPT_GPL)
+GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11
.else
GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11
.endif
--- gs.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512021612.jB2GCaO3084706>