From 03ecb8ca379ff3723cdacbb43802454ff9773ea0 Mon Sep 17 00:00:00 2001 From: mef Date: Thu, 23 Jan 2014 00:08:02 +0000 Subject: For PR pkg/48479, old make (like NetBSD-5.1) behaves differently with undefined VARIABLE: Malformed conditional (!empty(PKG_OPTIONS.gs_type:Mghostscript-agpl)) So, avoid using ghostscript version dependent installation path. PKGREVISION++ (installation path changed). Thanks obache@ --- fonts/ghostscript-cidfonts/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile index 66db0be7039..019c1d5a5cd 100644 --- a/fonts/ghostscript-cidfonts/Makefile +++ b/fonts/ghostscript-cidfonts/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2014/01/09 02:39:42 mef Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/23 00:08:02 mef Exp $ DISTNAME= ghostscript-cidfonts-20000901 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= fonts MASTER_SITES= # empty DISTFILES= # empty @@ -15,7 +15,7 @@ DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript GHOSTSCRIPT_REQD= 9.05 ADOBE_RESOURCEDIR= ${PREFIX}/share/Adobe/Resource -GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource +GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/fonts NO_CONFIGURE= yes NO_BUILD= yes @@ -26,12 +26,6 @@ FILES_SUBST+= PKG_INFO=${PKG_INFO:Q} REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont -.if !empty(PKG_OPTIONS.gs_type:Mghostscript-agpl) -. include "../../print/ghostscript-agpl/Makefile.common" -.else -. include "../../print/ghostscript-gpl/Makefile.common" -.endif - do-install: # nothing .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3