summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authormef <mef>2014-01-09 08:08:55 +0000
committermef <mef>2014-01-09 08:08:55 +0000
commit8e1260236b4f547e813c5457b33cb26166ccee87 (patch)
tree28084f3ce2e421af9d3b495dfaa8db333cf61a7b /fonts
parentb75edadbdf5caf3411414c9e45729439466ad42b (diff)
downloadpkgsrc-8e1260236b4f547e813c5457b33cb26166ccee87.tar.gz
Related change with PR pkg/48479 (of ghostscript-cidfonts):
Makefile Adjust for splitting ghostscript-{,a}gpl done before. Convert LICENSE from generic-nonlicense to 2-clause-bsd. Set MAINTAINER, to notice-quick-if-fail. PLIST Convert path from ${PKGVERSION} to ${PKGVERSION_NOREV}. files/cidfmap-adobe Add one entry /Ryumin-Light /WadaMin-Regular (NO PKGREVISION++, binaries may not have been built yet). Thanks dholland@ for taking care of -agpl and -gpl split.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/ghostscript-cidfonts-ryumin/Makefile44
-rw-r--r--fonts/ghostscript-cidfonts-ryumin/PLIST14
-rw-r--r--fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe3
3 files changed, 41 insertions, 20 deletions
diff --git a/fonts/ghostscript-cidfonts-ryumin/Makefile b/fonts/ghostscript-cidfonts-ryumin/Makefile
index ac388ab0e83..7f4e21ffaa7 100644
--- a/fonts/ghostscript-cidfonts-ryumin/Makefile
+++ b/fonts/ghostscript-cidfonts-ryumin/Makefile
@@ -1,27 +1,30 @@
-# $NetBSD: Makefile,v 1.10 2013/06/04 22:16:03 tron Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/09 08:08:55 mef Exp $
DISTNAME= ghostscript-cidfonts-ryumin-${GS_VERSION}
DISTFILES= # empty
PKGREVISION= 6
CATEGORIES= fonts
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= makoto@ki.nu
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_NOREV 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}
+# Set following two variables and buildlink appropriate fonts
+# GS_CIDFMAP
+# GCR_INSTALL_TYPE
.include "options.mk"
.if !empty(GS_CIDFMAP)
@@ -43,7 +46,7 @@ do-install:
.if !empty(GS_CIDFMAP)
${INSTALL_DATA} ${WRKSRC}/${GS_CIDFMAP} ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Init/cidfmap
.endif
- # mainly Ryumin and GothicBBB
+# mainly Ryumin and GothicBBB
${INSTALL_DATA} files/${GCR_INSTALL_TYPE}/[GR]* ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Font
# no need to edit cidfmap
@@ -54,11 +57,28 @@ NO_BUILD= yes
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-.include "../../print/ghostscript-gpl/buildlink3.mk"
+# Set options for ghostscript in case the package are not built yet:
+# But for pbulk, it will override default binary package with this option (?)
+# No. Probably fails because build already done, and stops with FAIL_REASON being checked below.
+## PKGSRC_MAKE_ENV+= PKG_OPTIONS.ghostscript+=disable-compile-inits
+## PKG_OPTIONS.ghostscript+= disable-compile-inits
+# Either above gives no effect, you need set manually on /etc/mk.conf or so.
+# You may check if this option is enabled or not, by looking the string
+# 'Initialization file are compiled into the executable.' when 'gs --help |grep Init'
+# (String above shown means option is NOT selected).
+.include "../../print/ghostscript/buildlink3.mk"
-.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.'
+# Following logic is flaky, for looking at PKG_OPTIONS.gs_type now NOT at build time
+.if !empty(PKG_OPTIONS.gs_type:Mghostscript-agpl)
+. include "../../print/ghostscript-agpl/Makefile.common"
+. 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
+.else
+. include "../../print/ghostscript-gpl/Makefile.common"
+. 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
.endif
-#.include "../../fonts/adobe-cidfonts/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-cidfonts-ryumin/PLIST b/fonts/ghostscript-cidfonts-ryumin/PLIST
index 567b8c57d8a..411b9ec8294 100644
--- a/fonts/ghostscript-cidfonts-ryumin/PLIST
+++ b/fonts/ghostscript-cidfonts-ryumin/PLIST
@@ -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
+@comment $NetBSD: PLIST,v 1.2 2014/01/09 08:08:55 mef Exp $
+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
diff --git a/fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe b/fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe
index 4c20bc9c6a6..9f70663c101 100644
--- a/fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe
+++ b/fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe
@@ -1,5 +1,5 @@
%!
-% $Id: cidfmap-adobe,v 1.1 2012/10/07 14:22:52 mef Exp $
+% $Id: cidfmap-adobe,v 1.2 2014/01/09 08:08:56 mef Exp $
% This is a sample map file for CIDFont category.
%
@@ -26,6 +26,7 @@
% /ShinGo-Bold /HeiseiKakuGo-W5 ;
% /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
%
+/Ryumin-Light /WadaMin-Regular
/Ryumin-Light-H /WadaMin-Regular
/Ryumin-Light-EUC-H /WadaMin-Regular
/GothicBBB-Medium /WadaMin-Bold