summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2013-03-16 23:02:18 +0000
committerdholland <dholland@pkgsrc.org>2013-03-16 23:02:18 +0000
commit10e542a269df9072c00ccef5648d0fa28ffcc98d (patch)
treef67d59395c159f87c14dfaca94539d62fc778f3a /fonts
parent817a61d54b38b140ba4a10fb9b47515cd73ce1af (diff)
downloadpkgsrc-10e542a269df9072c00ccef5648d0fa28ffcc98d.tar.gz
Explicitly use ghostscript-gpl, as one of these sets GS_REQD=9.05.
Nothing in ghostscript seems to have *checked* that, but for now let's assume it matters. XXX: someone please review this and update/adjust as needed.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/ghostscript-cidfonts-ryumin/Makefile10
-rw-r--r--fonts/ghostscript-cidfonts/Makefile8
2 files changed, 9 insertions, 9 deletions
diff --git a/fonts/ghostscript-cidfonts-ryumin/Makefile b/fonts/ghostscript-cidfonts-ryumin/Makefile
index a74a0ef2a7b..bc6735015f2 100644
--- a/fonts/ghostscript-cidfonts-ryumin/Makefile
+++ b/fonts/ghostscript-cidfonts-ryumin/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.4 2013/02/16 11:21:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2013/03/16 23:02:18 dholland Exp $
DISTNAME= ghostscript-cidfonts-ryumin-${GS_VERSION}
DISTFILES= # empty
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Enable Ryumin-Light and GothicBBB for ghostscript
LICENSE= generic-nonlicense
-.include "../../print/ghostscript/Makefile.common"
+.include "../../print/ghostscript-gpl/Makefile.common"
GS_RESOURCEDIR= share/ghostscript/${PKGVERSION}/Resource
WRKSRC= ${WRKDIR}/gcr
INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Font
INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Init
-DEPENDS+= ghostscript>=9.05:../../print/ghostscript
+DEPENDS+= ghostscript-gpl>=9.05:../../print/ghostscript-gpl
DEPENDS+= ghostscript-cidfonts>=20000901nb3:../../fonts/ghostscript-cidfonts
BUILD_DEFS+= GS_CIDFMAP
# used in options.mk to switch adobe or ttf
@@ -54,7 +54,7 @@ NO_BUILD= yes
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-.include "../../print/ghostscript/buildlink3.mk"
+.include "../../print/ghostscript-gpl/buildlink3.mk"
.if empty(PKG_BUILD_OPTIONS.ghostscript:Mdisable-compile-inits)
PKG_FAIL_REASON+= 'You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile
index 4b417988593..27f6ae3d04e 100644
--- a/fonts/ghostscript-cidfonts/Makefile
+++ b/fonts/ghostscript-cidfonts/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2012/10/07 14:21:48 mef Exp $
+# $NetBSD: Makefile,v 1.18 2013/03/16 23:02:18 dholland Exp $
DISTNAME= ghostscript-cidfonts-20000901
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,10 +10,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= CIDFont resources for Ghostscript
DEPENDS+= adobe-cidfonts>=20000901:../../fonts/adobe-cidfonts
-DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript
+DEPENDS+= ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
GHOSTSCRIPT_REQD= 9.05
-.include "../../print/ghostscript/Makefile.common"
+.include "../../print/ghostscript-gpl/Makefile.common"
ADOBE_RESOURCEDIR= ${PREFIX}/share/Adobe/Resource
GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource