Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jul 2015 23:38:12 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r392606 - head/Mk/Uses
Message-ID:  <201507202338.t6KNcCtF019119@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Mon Jul 20 23:38:11 2015
New Revision: 392606
URL: https://svnweb.freebsd.org/changeset/ports/392606

Log:
  - Fix an error with fmake. [*]
  - Allow "agpl" as an additional keyword in GHOSTSCRIPT_DEFAULT.
  
  Spotted by:	kib [*]

Modified:
  head/Mk/Uses/ghostscript.mk

Modified: head/Mk/Uses/ghostscript.mk
==============================================================================
--- head/Mk/Uses/ghostscript.mk	Mon Jul 20 22:10:17 2015	(r392605)
+++ head/Mk/Uses/ghostscript.mk	Mon Jul 20 23:38:11 2015	(r392606)
@@ -65,18 +65,23 @@ _GS_RUN_DEP=	yes
 .undef _GS_AGPL_SUFFIX
 .undef _GS_SELECTED
 .for V in ${_GS_ARGS} ${GHOSTSCRIPT_DEFAULT}
-.if ${V:M9}
+_V=${V}
+.if ${_V:M9}
 _GS_SELECTED?=		9
-.elif ${V:M9.06}
+.elif ${_V:M9.06}
 _GS_SELECTED?=		9
-.elif ${V:M9.16}
+.elif ${_V:M9.16}
 _GS_SELECTED?=		9
 _GS_AGPL_SUFFIX?=	-agpl
-.elif ${V:Magpl} && defined(_GS_SELECTED) && !empty(_GS_SELECTED:N9)
+.elif ${_V:Magpl} && defined(_GS_SELECTED)
+.if ${_GS_SELECTED:M9}
+_GS_AGPL_SUFFIX?=	-agpl
+.else
 IGNORE=		Ghostscript-agpl is only available in version 9
-.elif ${V:M8}
+.endif
+.elif ${_V:M8}
 _GS_SELECTED?=		8
-.elif ${V:M7}
+.elif ${_V:M7}
 _GS_SELECTED?=		7
 .endif
 .endfor



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507202338.t6KNcCtF019119>