diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2007-01-18 03:28:38 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2007-01-18 03:28:38 +0000 |
commit | 70827e93bbd23b00aa5824eb4f1a79d1bf87d830 (patch) | |
tree | 7d316afd4cde9253b3452718d21500e9dcb101ef /japanese/ipa-ttfonts | |
parent | Remove databases/grass-i18n. The i18n extension has already been (diff) |
Fix pkg-plist.
Spotted by: kris
Notes
Notes:
svn path=/head/; revision=182686
Diffstat (limited to 'japanese/ipa-ttfonts')
-rw-r--r-- | japanese/ipa-ttfonts/Makefile | 18 | ||||
-rw-r--r-- | japanese/ipa-ttfonts/pkg-plist | 56 |
2 files changed, 38 insertions, 36 deletions
diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile index 9266b5598dbc..97db34b95d31 100644 --- a/japanese/ipa-ttfonts/Makefile +++ b/japanese/ipa-ttfonts/Makefile @@ -28,8 +28,8 @@ PKGDEINSTALL= ${WRKDIR}/pkg-install SUB_FILES= pkg-install SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} -LOCAL_FONTSDIR= share/fonts/TrueType -X_FONTSDIR= lib/X11/fonts/TrueType +LOCAL_FONTSDIR= share/fonts +X_FONTSDIR= lib/X11/fonts DATADIR= ${LOCALBASE}/share/${PORTNAME} USE_X_PREFIX= yes @@ -47,20 +47,20 @@ do-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC} ${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \ ${DATADIR} - ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/ + ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf \ - ${LOCALBASE}/${LOCAL_FONTSDIR}/ + ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ ${LN} -s -f \ ${DATADIR}/fonts/M+*.ttf \ - ${LOCALBASE}/${LOCAL_FONTSDIR}/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR} + ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ + ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TrueType ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf \ - ${PREFIX}/${X_FONTSDIR}/ + ${PREFIX}/${X_FONTSDIR}/TrueType/ ${LN} -s -f \ ${DATADIR}/fonts/M+*.ttf \ - ${PREFIX}/${X_FONTSDIR}/ + ${PREFIX}/${X_FONTSDIR}/TrueType/ ${MKDIR} ${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \ ${PREFIX}/etc/fonts/conf.d @@ -70,7 +70,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR} + ${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TrueType ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/ipa-ttfonts/pkg-plist b/japanese/ipa-ttfonts/pkg-plist index 06347bbbd399..65819fa03c92 100644 --- a/japanese/ipa-ttfonts/pkg-plist +++ b/japanese/ipa-ttfonts/pkg-plist @@ -68,33 +68,35 @@ @dirrm %%DATADIR%%/libopvp @dirrm %%DATADIR%%/fonts @dirrm %%DATADIR%%/doc -%%LOCAL_FONTSDIR%%/ipag.ttf -%%LOCAL_FONTSDIR%%/ipagp.ttf -%%LOCAL_FONTSDIR%%/ipagui.ttf -%%LOCAL_FONTSDIR%%/ipam.ttf -%%LOCAL_FONTSDIR%%/ipamp.ttf -%%LOCAL_FONTSDIR%%/M+2VM+IPAG-circle.ttf -%%LOCAL_FONTSDIR%%/M+2P+IPAG.ttf -%%LOCAL_FONTSDIR%%/M+2P+IPAG-circle.ttf -%%LOCAL_FONTSDIR%%/M+1VM+IPAG-circle.ttf -%%LOCAL_FONTSDIR%%/M+1P+IPAG.ttf -%%LOCAL_FONTSDIR%%/M+1P+IPAG-circle.ttf +@dirrm %%DATADIR%% +%%LOCAL_FONTSDIR%%/TrueType/ipag.ttf +%%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf +%%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf +%%LOCAL_FONTSDIR%%/TrueType/ipam.ttf +%%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf +%%LOCAL_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf +%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG.ttf +%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf +%%LOCAL_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf +%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG.ttf +%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf +@dirrmtry %%LOCAL_FONTSDIR%%/TrueType @dirrmtry %%LOCAL_FONTSDIR%% @cwd %%X11BASE%% etc/fonts/conf.d/2.ipa-ttfonts.conf -%%X_FONTSDIR%%/ipag.ttf -%%X_FONTSDIR%%/ipagp.ttf -%%X_FONTSDIR%%/ipagui.ttf -%%X_FONTSDIR%%/ipam.ttf -%%X_FONTSDIR%%/ipamp.ttf -%%X_FONTSDIR%%/M+2VM+IPAG-circle.ttf -%%X_FONTSDIR%%/M+2P+IPAG.ttf -%%X_FONTSDIR%%/M+2P+IPAG-circle.ttf -%%X_FONTSDIR%%/M+1VM+IPAG-circle.ttf -%%X_FONTSDIR%%/M+1P+IPAG.ttf -%%X_FONTSDIR%%/M+1P+IPAG-circle.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true -@unexec rm -f %D/%%X_FONTSDIR%%/fonts.cache-1 -@dirrmtry %%X_FONTSDIR%% -@unexec if [ -d %D/%%X_FONTSDIR%% ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true; fi +%%X_FONTSDIR%%/TrueType/ipag.ttf +%%X_FONTSDIR%%/TrueType/ipagp.ttf +%%X_FONTSDIR%%/TrueType/ipagui.ttf +%%X_FONTSDIR%%/TrueType/ipam.ttf +%%X_FONTSDIR%%/TrueType/ipamp.ttf +%%X_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf +%%X_FONTSDIR%%/TrueType/M+2P+IPAG.ttf +%%X_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf +%%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf +%%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf +%%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf +@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1 +@dirrmtry %%X_FONTSDIR%%/TrueType +@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi |