? fonts/ghostscript-cidfonts-ryumin/:q ? fonts/ghostscript-cidfonts-ryumin/ktrace.out Index: fonts/ghostscript-cidfonts-ryumin/Makefile =================================================================== RCS file: /cvs/cvsroot/pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- fonts/ghostscript-cidfonts-ryumin/Makefile 4 Jun 2013 22:16:03 -0000 1.10 +++ fonts/ghostscript-cidfonts-ryumin/Makefile 4 Jan 2014 13:27:24 -0000 @@ -9,18 +9,18 @@ COMMENT= Enable Ryumin-Light and GothicBBB for ghostscript LICENSE= generic-nonlicense -.include "../../print/ghostscript-gpl/Makefile.common" - -GS_RESOURCEDIR= share/ghostscript/${PKGVERSION}/Resource +# in PLIST, just use PKGVERSION for the same value +GS_RESOURCEDIR= share/ghostscript/${GS_VERSION}/Resource WRKSRC= ${WRKDIR}/gcr INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Font INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Init -DEPENDS+= ghostscript-gpl>=9.05:../../print/ghostscript-gpl +DEPENDS+= ghostscript>=9.05:../../print/ghostscript DEPENDS+= ghostscript-cidfonts>=20000901nb3:../../fonts/ghostscript-cidfonts BUILD_DEFS+= GS_CIDFMAP # used in options.mk to switch adobe or ttf SUBST_VARS= GCR_INSTALL_TYPE +PLIST_SUBST= PKGVERSION_NOREV=${PKGVERSION_NOREV} .include "options.mk" @@ -54,10 +54,24 @@ NO_CHECKSUM= yes NO_CONFIGURE= yes -.include "../../print/ghostscript-gpl/buildlink3.mk" +PKG_OPTIONS.ghostscript-agpl+= disable-compile-inits +PKG_OPTIONS.ghostscript-gpl+= disable-compile-inits +.include "../../print/ghostscript/buildlink3.mk" + +# Following logic is flakey, for looking at PKG_OPTIONS.gs_type now NOT at build time +.if !empty(PKG_OPTIONS.gs_type:Mghostscript-gpl) +. include "../../print/ghostscript-gpl/Makefile.common" +#. include "../../print/ghostscript-gpl/buildlink3.mk" +. if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits) +PKG_FAIL_REASON+= '(gpl) You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.' +. endif +.else +. include "../../print/ghostscript-agpl/Makefile.common" +#. include "../../print/ghostscript-agpl/buildlink3.mk" +. if empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mdisable-compile-inits) +PKG_FAIL_REASON+= '(agpl) You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.' +. endif -.if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits) -PKG_FAIL_REASON+= 'You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.' .endif #.include "../../fonts/adobe-cidfonts/buildlink3.mk" Index: fonts/ghostscript-cidfonts-ryumin/PLIST =================================================================== RCS file: /cvs/cvsroot/pkgsrc/fonts/ghostscript-cidfonts-ryumin/PLIST,v retrieving revision 1.1 diff -u -r1.1 PLIST --- fonts/ghostscript-cidfonts-ryumin/PLIST 7 Oct 2012 14:22:52 -0000 1.1 +++ fonts/ghostscript-cidfonts-ryumin/PLIST 4 Jan 2014 13:27:24 -0000 @@ -1,7 +1,7 @@ @comment $NetBSD: PLIST,v 1.1 2012/10/07 14:22:52 mef Exp $ -share/ghostscript/${PKGVERSION}/Resource/Font/GothicBBB-Medium-H -share/ghostscript/${PKGVERSION}/Resource/Font/GothicBBB-Medium-EUC-H -share/ghostscript/${PKGVERSION}/Resource/Font/Ryumin-Light-EUC-H -share/ghostscript/${PKGVERSION}/Resource/Font/Ryumin-Light-H -share/ghostscript/${PKGVERSION}/Resource/Font/Ryumin-Light-Identity-H -share/ghostscript/${PKGVERSION}/Resource/Init/cidfmap +share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/GothicBBB-Medium-H +share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/GothicBBB-Medium-EUC-H +share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/Ryumin-Light-EUC-H +share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/Ryumin-Light-H +share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/Ryumin-Light-Identity-H +share/ghostscript/${PKGVERSION_NOREV}/Resource/Init/cidfmap