From owner-svn-ports-head@freebsd.org  Mon Jul 20 23:38:12 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB07A9A7CD6;
 Mon, 20 Jul 2015 23:38:12 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9AA4D1F25;
 Mon, 20 Jul 2015 23:38:12 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KNcC7T019120;
 Mon, 20 Jul 2015 23:38:12 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KNcCtF019119;
 Mon, 20 Jul 2015 23:38:12 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201507202338.t6KNcCtF019119@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 20 Jul 2015 23:38:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r392606 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jul 2015 23:38:12 -0000

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