? fonts/fontconfig/work
? fonts/tex-amsfonts/work
? fonts/tex-cm/work
Index: fonts/ghostscript-cidfonts/Makefile
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/fonts/ghostscript-cidfonts/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- fonts/ghostscript-cidfonts/Makefile	16 Mar 2013 23:02:18 -0000	1.18
+++ fonts/ghostscript-cidfonts/Makefile	23 Dec 2013 07:02:57 -0000
@@ -10,10 +10,10 @@
 COMMENT=	CIDFont resources for Ghostscript
 
 DEPENDS+=	adobe-cidfonts>=20000901:../../fonts/adobe-cidfonts
-DEPENDS+=	ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
+DEPENDS+=	ghostscript-[0-9]*:../../print/ghostscript
 
 GHOSTSCRIPT_REQD=	9.05
-.include	"../../print/ghostscript-gpl/Makefile.common"
+#.include	"../../print/ghostscript-gpl/Makefile.common"
 
 ADOBE_RESOURCEDIR=	${PREFIX}/share/Adobe/Resource
 GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
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	23 Dec 2013 07:02:57 -0000
@@ -7,16 +7,15 @@
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Enable Ryumin-Light and GothicBBB for ghostscript
-LICENSE=	generic-nonlicense
+LICENSE=	2-clause-bsd
 
-.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/${PKGVERSION_NOREV}/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
@@ -54,10 +53,23 @@
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 
-.include "../../print/ghostscript-gpl/buildlink3.mk"
+.include "../../print/ghostscript/buildlink3.mk"
+
 
-.if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits)
+# in print/ghostscript, PKG_OPTIONS.gs_type, but here:
+.if !empty(PKG_BUILD_OPTIONS.ghostscript:Mghostscript-agpl)
+. include	"../../print/ghostscript-agpl/Makefile.common"
+. if empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mdisable-compile-inits)
+PKG_FAIL_REASON+=	'You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
+. endif
+.elif !empty(PKG_BUILD_OPTIONS.ghostscript:Mghostscript-gpl)
+. include	"../../print/ghostscript-gpl/Makefile.common"
+. 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
+#      Set default
+.else
+. include	"../../print/ghostscript-gpl/Makefile.common"
 .endif
 
 #.include "../../fonts/adobe-cidfonts/buildlink3.mk"