Index: fonts/ghostscript-cidfonts-ryumin/Makefile
===================================================================
RCS file: /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	25 Dec 2013 07:44:58 -0000
@@ -2,21 +2,21 @@
 
 DISTNAME=	ghostscript-cidfonts-ryumin-${GS_VERSION}
 DISTFILES=	# empty
+# following will attach both -agpl and -gpl, so sounds a little bit strange, but ..
 PKGREVISION=	6
 CATEGORIES=	fonts
 
 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
+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
+PKG_OPTIONS.ghostscript+=	disable-compile-inits
+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
@@ -32,6 +32,7 @@
 SUBST_SED.ttf_path=	-e 's|%%PREFIX%%|${PREFIX}|'
 .endif
 
+PLIST_SUBST+=		PKGVERSION_NOREV=${PKGVERSION_NOREV}
 # To edit %%PREFIX%% in cidfmap before installation by SUBST,
 do-build:
 .if !empty(GS_CIDFMAP)
@@ -54,9 +55,16 @@
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 
-.include "../../print/ghostscript-gpl/buildlink3.mk"
+.if !empty(PKG_OPTIONS.gs_type:Mghostscript-agpl)
+. include "../../print/ghostscript-agpl/Makefile.common"
+. include "../../print/ghostscript-agpl/buildlink3.mk"
+.else 
+. include "../../print/ghostscript-gpl/Makefile.common"
+. include "../../print/ghostscript-gpl/buildlink3.mk"
+.endif
 
-.if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits)
+.if empty(PKG_OPTIONS.ghostscript:Mdisable-compile-inits)
+# #    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.'
 .endif
 
Index: fonts/ghostscript-cidfonts-ryumin/PLIST
===================================================================
RCS file: /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	25 Dec 2013 07:44:58 -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