Date: Wed, 17 May 2006 17:15:37 GMT From: Arseny Nasokin <tarc@tarc.po.cs.msu.su> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/97406: [PATCH] bsd.port.mk: ghostscript port detection refactoring Message-ID: <200605171715.k4HHFbfC088022@www.freebsd.org> Resent-Message-ID: <200605171720.k4HHKNN6007626@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97406
>Category: ports
>Synopsis: [PATCH] bsd.port.mk: ghostscript port detection refactoring
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed May 17 17:20:22 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Arseny Nasokin
>Release: FreeBSD-7.0
>Organization:
CMC MSU
>Environment:
$FreeBSD: ports/Mk/bsd.port.mk,v 1.532 2006/05/02 10:09:23 netchild Exp $
>Description:
detectng, which ghostscrpt port to use, is not efficient.
>How-To-Repeat:
see this make file.
>Fix:
--- bsd.port.mk.orig Wed May 17 21:00:14 2006
+++ bsd.port.mk Wed May 17 21:01:13 2006
@@ -1843,23 +1843,19 @@
# Set the default for the installation of Postscript(TM)-
# compatible functionality.
-.if !defined(WITHOUT_X11)
+.if !defined(GHOSTSCRIPT_PORT)
.if defined(WITH_GHOSTSCRIPT_AFPL)
-GHOSTSCRIPT_PORT?= print/ghostscript-afpl
+GHOSTSCRIPT_PORT= print/ghostscript-afpl
.elif defined(WITH_GHOSTSCRIPT_GPL)
-GHOSTSCRIPT_PORT?= print/ghostscript-gpl
+GHOSTSCRIPT_PORT= print/ghostscript-gpl
.else
-GHOSTSCRIPT_PORT?= print/ghostscript-gnu
-.endif
-.else
-.if defined(WITH_GHOSTSCRIPT_AFPL)
-GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11
-.elif defined(WITH_GHOSTSCRIPT_GPL)
-GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11
-.else
-GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11
+GHOSTSCRIPT_PORT= print/ghostscript-gnu
.endif
+
+.if !defined(WITHOUT_X11)
+GHOSTSCRIPT_PORT:= ${GHOSTSCRIPT_PORT}-nox11
.endif
+.endif #!defined GHOSTSCRIPT_PORT
# Set up the ghostscript dependencies.
.if defined(USE_GHOSTSCRIPT) || defined(USE_GHOSTSCRIPT_BUILD)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605171715.k4HHFbfC088022>