Sat Mar 16 23:02:18 2013 UTC ()
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.


(dholland)
diff -r1.17 -r1.18 pkgsrc/fonts/ghostscript-cidfonts/Makefile
diff -r1.4 -r1.5 pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile
cvs diff -r1.17 -r1.18 pkgsrc/fonts/ghostscript-cidfonts/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/ghostscript-cidfonts/Makefile 2012/10/07 14:21:48 1.17
+++ pkgsrc/fonts/ghostscript-cidfonts/Makefile 2013/03/16 23:02:18 1.18
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.17 2012/10/07 14:21:48 mef Exp $ 1# $NetBSD: Makefile,v 1.18 2013/03/16 23:02:18 dholland Exp $
2 2
3DISTNAME= ghostscript-cidfonts-20000901 3DISTNAME= ghostscript-cidfonts-20000901
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= fonts 5CATEGORIES= fonts
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= CIDFont resources for Ghostscript 10COMMENT= CIDFont resources for Ghostscript
11 11
12DEPENDS+= adobe-cidfonts>=20000901:../../fonts/adobe-cidfonts 12DEPENDS+= adobe-cidfonts>=20000901:../../fonts/adobe-cidfonts
13DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript 13DEPENDS+= ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
14 14
15GHOSTSCRIPT_REQD= 9.05 15GHOSTSCRIPT_REQD= 9.05
16.include "../../print/ghostscript/Makefile.common" 16.include "../../print/ghostscript-gpl/Makefile.common"
17 17
18ADOBE_RESOURCEDIR= ${PREFIX}/share/Adobe/Resource 18ADOBE_RESOURCEDIR= ${PREFIX}/share/Adobe/Resource
19GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource 19GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
20 20
21NO_CONFIGURE= yes 21NO_CONFIGURE= yes
22NO_BUILD= yes 22NO_BUILD= yes
23 23
24FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q} 24FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q}
25FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q} 25FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q}
26FILES_SUBST+= PKG_INFO=${PKG_INFO:Q} 26FILES_SUBST+= PKG_INFO=${PKG_INFO:Q}
27 27
28REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont 28REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont
29 29
cvs diff -r1.4 -r1.5 pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile 2013/02/16 11:21:11 1.4
+++ pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile 2013/03/16 23:02:18 1.5
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.4 2013/02/16 11:21:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2013/03/16 23:02:18 dholland Exp $
2 2
3DISTNAME= ghostscript-cidfonts-ryumin-${GS_VERSION} 3DISTNAME= ghostscript-cidfonts-ryumin-${GS_VERSION}
4DISTFILES= # empty 4DISTFILES= # empty
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= fonts 6CATEGORIES= fonts
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Enable Ryumin-Light and GothicBBB for ghostscript 9COMMENT= Enable Ryumin-Light and GothicBBB for ghostscript
10LICENSE= generic-nonlicense 10LICENSE= generic-nonlicense
11 11
12.include "../../print/ghostscript/Makefile.common" 12.include "../../print/ghostscript-gpl/Makefile.common"
13 13
14GS_RESOURCEDIR= share/ghostscript/${PKGVERSION}/Resource 14GS_RESOURCEDIR= share/ghostscript/${PKGVERSION}/Resource
15WRKSRC= ${WRKDIR}/gcr 15WRKSRC= ${WRKDIR}/gcr
16INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Font 16INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Font
17INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Init 17INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Init
18 18
19DEPENDS+= ghostscript>=9.05:../../print/ghostscript 19DEPENDS+= ghostscript-gpl>=9.05:../../print/ghostscript-gpl
20DEPENDS+= ghostscript-cidfonts>=20000901nb3:../../fonts/ghostscript-cidfonts 20DEPENDS+= ghostscript-cidfonts>=20000901nb3:../../fonts/ghostscript-cidfonts
21BUILD_DEFS+= GS_CIDFMAP 21BUILD_DEFS+= GS_CIDFMAP
22# used in options.mk to switch adobe or ttf 22# used in options.mk to switch adobe or ttf
23SUBST_VARS= GCR_INSTALL_TYPE 23SUBST_VARS= GCR_INSTALL_TYPE
24 24
25.include "options.mk" 25.include "options.mk"
26 26
27.if !empty(GS_CIDFMAP) 27.if !empty(GS_CIDFMAP)
28SUBST_CLASSES+= ttf_path 28SUBST_CLASSES+= ttf_path
29SUBST_STAGE.ttf_path= post-build 29SUBST_STAGE.ttf_path= post-build
30SUBST_MESSAGE.ttf_path=Fixing ttf install directory in cidfmap 30SUBST_MESSAGE.ttf_path=Fixing ttf install directory in cidfmap
31SUBST_FILES.ttf_path= ${GS_CIDFMAP} 31SUBST_FILES.ttf_path= ${GS_CIDFMAP}
32SUBST_SED.ttf_path= -e 's|%%PREFIX%%|${PREFIX}|' 32SUBST_SED.ttf_path= -e 's|%%PREFIX%%|${PREFIX}|'
@@ -44,21 +44,21 @@ do-install: @@ -44,21 +44,21 @@ do-install:
44 ${INSTALL_DATA} ${WRKSRC}/${GS_CIDFMAP} ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Init/cidfmap 44 ${INSTALL_DATA} ${WRKSRC}/${GS_CIDFMAP} ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Init/cidfmap
45.endif 45.endif
46 # mainly Ryumin and GothicBBB 46 # mainly Ryumin and GothicBBB
47 ${INSTALL_DATA} files/${GCR_INSTALL_TYPE}/[GR]* ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Font 47 ${INSTALL_DATA} files/${GCR_INSTALL_TYPE}/[GR]* ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Font
48 48
49# no need to edit cidfmap 49# no need to edit cidfmap
50.if empty(GS_CIDFMAP) 50.if empty(GS_CIDFMAP)
51NO_BUILD= yes 51NO_BUILD= yes
52.endif 52.endif
53 53
54NO_CHECKSUM= yes 54NO_CHECKSUM= yes
55NO_CONFIGURE= yes 55NO_CONFIGURE= yes
56 56
57.include "../../print/ghostscript/buildlink3.mk" 57.include "../../print/ghostscript-gpl/buildlink3.mk"
58 58
59.if empty(PKG_BUILD_OPTIONS.ghostscript:Mdisable-compile-inits) 59.if empty(PKG_BUILD_OPTIONS.ghostscript:Mdisable-compile-inits)
60PKG_FAIL_REASON+= 'You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.' 60PKG_FAIL_REASON+= 'You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
61.endif 61.endif
62 62
63#.include "../../fonts/adobe-cidfonts/buildlink3.mk" 63#.include "../../fonts/adobe-cidfonts/buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"