Thu Jan 9 08:08:56 2014 UTC ()
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.


(mef)
diff -r1.10 -r1.11 pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile
diff -r1.1 -r1.2 pkgsrc/fonts/ghostscript-cidfonts-ryumin/PLIST
diff -r1.1 -r1.2 pkgsrc/fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe
cvs diff -r1.10 -r1.11 pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile 2013/06/04 22:16:03 1.10
+++ pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile 2014/01/09 08:08:55 1.11
@@ -1,64 +1,84 @@ @@ -1,64 +1,84 @@
1# $NetBSD: Makefile,v 1.10 2013/06/04 22:16:03 tron Exp $ 1# $NetBSD: Makefile,v 1.11 2014/01/09 08:08:55 mef Exp $
2 2
3DISTNAME= ghostscript-cidfonts-ryumin-${GS_VERSION} 3DISTNAME= ghostscript-cidfonts-ryumin-${GS_VERSION}
4DISTFILES= # empty 4DISTFILES= # empty
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= fonts 6CATEGORIES= fonts
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= makoto@ki.nu
9COMMENT= Enable Ryumin-Light and GothicBBB for ghostscript 9COMMENT= Enable Ryumin-Light and GothicBBB for ghostscript
10LICENSE= generic-nonlicense 10LICENSE= 2-clause-bsd
11 11
12.include "../../print/ghostscript-gpl/Makefile.common" 12# in PLIST, just use PKGVERSION_NOREV for the same value
13 13GS_RESOURCEDIR= share/ghostscript/${GS_VERSION}/Resource
14GS_RESOURCEDIR= share/ghostscript/${PKGVERSION}/Resource 
15WRKSRC= ${WRKDIR}/gcr 14WRKSRC= ${WRKDIR}/gcr
16INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Font 15INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Font
17INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Init 16INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Init
18 17
19DEPENDS+= ghostscript-gpl>=9.05:../../print/ghostscript-gpl 18DEPENDS+= ghostscript>=9.05:../../print/ghostscript
20DEPENDS+= ghostscript-cidfonts>=20000901nb3:../../fonts/ghostscript-cidfonts 19DEPENDS+= ghostscript-cidfonts>=20000901nb3:../../fonts/ghostscript-cidfonts
21BUILD_DEFS+= GS_CIDFMAP 20BUILD_DEFS+= GS_CIDFMAP
22# used in options.mk to switch adobe or ttf 21# used in options.mk to switch adobe or ttf
23SUBST_VARS= GCR_INSTALL_TYPE 22SUBST_VARS= GCR_INSTALL_TYPE
 23PLIST_SUBST= PKGVERSION_NOREV=${PKGVERSION_NOREV}
24 24
 25# Set following two variables and buildlink appropriate fonts
 26# GS_CIDFMAP
 27# GCR_INSTALL_TYPE
25.include "options.mk" 28.include "options.mk"
26 29
27.if !empty(GS_CIDFMAP) 30.if !empty(GS_CIDFMAP)
28SUBST_CLASSES+= ttf_path 31SUBST_CLASSES+= ttf_path
29SUBST_STAGE.ttf_path= post-build 32SUBST_STAGE.ttf_path= post-build
30SUBST_MESSAGE.ttf_path=Fixing ttf install directory in cidfmap 33SUBST_MESSAGE.ttf_path=Fixing ttf install directory in cidfmap
31SUBST_FILES.ttf_path= ${GS_CIDFMAP} 34SUBST_FILES.ttf_path= ${GS_CIDFMAP}
32SUBST_SED.ttf_path= -e 's|%%PREFIX%%|${PREFIX}|' 35SUBST_SED.ttf_path= -e 's|%%PREFIX%%|${PREFIX}|'
33.endif 36.endif
34 37
35# To edit %%PREFIX%% in cidfmap before installation by SUBST, 38# To edit %%PREFIX%% in cidfmap before installation by SUBST,
36do-build: 39do-build:
37.if !empty(GS_CIDFMAP) 40.if !empty(GS_CIDFMAP)
38 ${MKDIR} ${WRKSRC} 41 ${MKDIR} ${WRKSRC}
39 ${CP} files/${GS_CIDFMAP} ${WRKSRC} 42 ${CP} files/${GS_CIDFMAP} ${WRKSRC}
40.endif 43.endif
41 44
42do-install: 45do-install:
43.if !empty(GS_CIDFMAP) 46.if !empty(GS_CIDFMAP)
44 ${INSTALL_DATA} ${WRKSRC}/${GS_CIDFMAP} ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Init/cidfmap 47 ${INSTALL_DATA} ${WRKSRC}/${GS_CIDFMAP} ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Init/cidfmap
45.endif 48.endif
46 # mainly Ryumin and GothicBBB 49# mainly Ryumin and GothicBBB
47 ${INSTALL_DATA} files/${GCR_INSTALL_TYPE}/[GR]* ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Font 50 ${INSTALL_DATA} files/${GCR_INSTALL_TYPE}/[GR]* ${DESTDIR}${PREFIX}/${GS_RESOURCEDIR}/Font
48 51
49# no need to edit cidfmap 52# no need to edit cidfmap
50.if empty(GS_CIDFMAP) 53.if empty(GS_CIDFMAP)
51NO_BUILD= yes 54NO_BUILD= yes
52.endif 55.endif
53 56
54NO_CHECKSUM= yes 57NO_CHECKSUM= yes
55NO_CONFIGURE= yes 58NO_CONFIGURE= yes
56 59
57.include "../../print/ghostscript-gpl/buildlink3.mk" 60# Set options for ghostscript in case the package are not built yet:
58 61# But for pbulk, it will override default binary package with this option (?)
59.if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits) 62# No. Probably fails because build already done, and stops with FAIL_REASON being checked below.
60PKG_FAIL_REASON+= 'You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.' 63## PKGSRC_MAKE_ENV+= PKG_OPTIONS.ghostscript+=disable-compile-inits
 64## PKG_OPTIONS.ghostscript+= disable-compile-inits
 65# Either above gives no effect, you need set manually on /etc/mk.conf or so.
 66# You may check if this option is enabled or not, by looking the string
 67# 'Initialization file are compiled into the executable.' when 'gs --help |grep Init'
 68# (String above shown means option is NOT selected).
 69.include "../../print/ghostscript/buildlink3.mk"
 70
 71# Following logic is flaky, for looking at PKG_OPTIONS.gs_type now NOT at build time
 72.if !empty(PKG_OPTIONS.gs_type:Mghostscript-agpl)
 73. include "../../print/ghostscript-agpl/Makefile.common"
 74. if empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mdisable-compile-inits)
 75PKG_FAIL_REASON+= '(agpl) You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
 76. endif
 77.else
 78. include "../../print/ghostscript-gpl/Makefile.common"
 79. if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits)
 80PKG_FAIL_REASON+= '(gpl) You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
 81. endif
61.endif 82.endif
62 83
63#.include "../../fonts/adobe-cidfonts/buildlink3.mk" 
64.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/fonts/ghostscript-cidfonts-ryumin/PLIST (expand / switch to unified diff)

--- pkgsrc/fonts/ghostscript-cidfonts-ryumin/PLIST 2012/10/07 14:22:52 1.1
+++ pkgsrc/fonts/ghostscript-cidfonts-ryumin/PLIST 2014/01/09 08:08:55 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1@comment $NetBSD: PLIST,v 1.1 2012/10/07 14:22:52 mef Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/01/09 08:08:55 mef Exp $
2share/ghostscript/${PKGVERSION}/Resource/Font/GothicBBB-Medium-H 2share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/GothicBBB-Medium-H
3share/ghostscript/${PKGVERSION}/Resource/Font/GothicBBB-Medium-EUC-H 3share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/GothicBBB-Medium-EUC-H
4share/ghostscript/${PKGVERSION}/Resource/Font/Ryumin-Light-EUC-H 4share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/Ryumin-Light-EUC-H
5share/ghostscript/${PKGVERSION}/Resource/Font/Ryumin-Light-H 5share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/Ryumin-Light-H
6share/ghostscript/${PKGVERSION}/Resource/Font/Ryumin-Light-Identity-H 6share/ghostscript/${PKGVERSION_NOREV}/Resource/Font/Ryumin-Light-Identity-H
7share/ghostscript/${PKGVERSION}/Resource/Init/cidfmap 7share/ghostscript/${PKGVERSION_NOREV}/Resource/Init/cidfmap
cvs diff -r1.1 -r1.2 pkgsrc/fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe (expand / switch to unified diff)

--- pkgsrc/fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe 2012/10/07 14:22:52 1.1
+++ pkgsrc/fonts/ghostscript-cidfonts-ryumin/files/cidfmap-adobe 2014/01/09 08:08:56 1.2
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1%! 1%!
2% $Id: cidfmap-adobe,v 1.1 2012/10/07 14:22:52 mef Exp $ 2% $Id: cidfmap-adobe,v 1.2 2014/01/09 08:08:56 mef Exp $
3% This is a sample map file for CIDFont category. 3% This is a sample map file for CIDFont category.
4 4
5% 5%
6% The map is a set of records, which must use one of the two formats : 6% The map is a set of records, which must use one of the two formats :
7% 7%
8% 1. A substutution of a CIF font with another CID font : 8% 1. A substutution of a CIF font with another CID font :
9% 9%
10% /substituted /original ; 10% /substituted /original ;
11% 11%
12% Where 'substituted' is a name being used in a document, 12% Where 'substituted' is a name being used in a document,
13% 'original' is a name of an available resource. 13% 'original' is a name of an available resource.
14% 14%
15% 2. A substutution of a CIF font with a True Type font : 15% 2. A substutution of a CIF font with a True Type font :
16% 16%
17% /substituted << /FileType /TrueType /Path (path) /SunfontID 1 /CSI [(ordering) supplement] >> ; 17% /substituted << /FileType /TrueType /Path (path) /SunfontID 1 /CSI [(ordering) supplement] >> ;
18% 18%
19% Where 'substituted' is a name being used in a document, 19% Where 'substituted' is a name being used in a document,
20% 'path' is a path to a True Type font file, 20% 'path' is a path to a True Type font file,
21% 'ordering' is a value of Ordering required for CIDSystemInfo dictionary, 21% 'ordering' is a value of Ordering required for CIDSystemInfo dictionary,
22% 'supplement' is a value of Supplement required for CIDSystemInfo dictionary. 22% 'supplement' is a value of Supplement required for CIDSystemInfo dictionary.
23% 23%
24% Examples : 24% Examples :
25%  25%
26% /ShinGo-Bold /HeiseiKakuGo-W5 ; 26% /ShinGo-Bold /HeiseiKakuGo-W5 ;
27% /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ; 27% /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
28% 28%
 29/Ryumin-Light /WadaMin-Regular
29/Ryumin-Light-H /WadaMin-Regular 30/Ryumin-Light-H /WadaMin-Regular
30/Ryumin-Light-EUC-H /WadaMin-Regular 31/Ryumin-Light-EUC-H /WadaMin-Regular
31/GothicBBB-Medium /WadaMin-Bold 32/GothicBBB-Medium /WadaMin-Bold