aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2010-10-01 03:40:16 +0800
committerhrs <hrs@FreeBSD.org>2010-10-01 03:40:16 +0800
commit2c70230681aaf34879d460a161bcdd190a3de98e (patch)
tree34c036c228b9ea6da6cb118caec3b3441adfdff4
parentee2437cad30643bed1023a3ee474baea422bea73 (diff)
downloadfreebsd-ports-graphics-2c70230681aaf34879d460a161bcdd190a3de98e.tar.gz
freebsd-ports-graphics-2c70230681aaf34879d460a161bcdd190a3de98e.tar.zst
freebsd-ports-graphics-2c70230681aaf34879d460a161bcdd190a3de98e.zip
Fix PREFIX/LOCALBASE confusion.
PR: ports/146247
-rw-r--r--japanese/font-ipa-uigothic/Makefile8
-rw-r--r--japanese/font-ipa-uigothic/pkg-plist6
-rw-r--r--japanese/font-ipa/Makefile8
-rw-r--r--japanese/font-ipa/pkg-plist6
-rw-r--r--japanese/font-ipaex/Makefile8
-rw-r--r--japanese/font-ipaex/pkg-plist6
-rw-r--r--japanese/font-kochi/Makefile10
-rw-r--r--japanese/font-kochi/pkg-plist6
-rw-r--r--japanese/font-mona-ipa/Makefile8
-rw-r--r--japanese/font-mona-ipa/pkg-plist8
-rw-r--r--japanese/font-mplus-ipa/Makefile8
-rw-r--r--japanese/font-mplus-ipa/pkg-plist6
-rw-r--r--japanese/font-mplus/Makefile10
-rw-r--r--japanese/font-mplus/pkg-plist6
-rw-r--r--japanese/font-sazanami/Makefile10
-rw-r--r--japanese/font-sazanami/pkg-plist6
-rw-r--r--japanese/font-shinonome/Makefile4
-rw-r--r--japanese/font-takao/Makefile8
-rw-r--r--japanese/font-takao/pkg-plist6
19 files changed, 60 insertions, 78 deletions
diff --git a/japanese/font-ipa-uigothic/Makefile b/japanese/font-ipa-uigothic/Makefile
index 08fd0395f37..3baa699636d 100644
--- a/japanese/font-ipa-uigothic/Makefile
+++ b/japanese/font-ipa-uigothic/Makefile
@@ -39,11 +39,11 @@ do-install:
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
${LN} -s -f \
${DATADIR}/ipagui.ttf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
${LN} -s -f \
${DATADIR}/ipagui.ttf \
- ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${PREFIX}/${X_FONTSDIR}/TTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-ipa-uigothic.conf \
${FILESDIR}/62-fonts-ipa-uigothic.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -57,7 +57,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-ipa-uigothic/pkg-plist b/japanese/font-ipa-uigothic/pkg-plist
index a037b97a398..9269df2f11d 100644
--- a/japanese/font-ipa-uigothic/pkg-plist
+++ b/japanese/font-ipa-uigothic/pkg-plist
@@ -6,10 +6,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-ipa-uigothic.conf
etc/fonts/conf.avail/62-fonts-ipa-uigothic.conf
-@exec ln -s -f ../conf.avail/20-unhint-ipa-uigothic.conf %D/etc/fonts/conf.d/20-unhint-ipa-uigothic.conf
-@exec ln -s -f ../conf.avail/62-fonts-ipa-uigothic.conf %D/etc/fonts/conf.d/62-fonts-ipa-uigothic.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipa-uigothic.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipa-uigothic.conf
+etc/fonts/conf.d/20-unhint-ipa-uigothic.conf
+etc/fonts/conf.d/62-fonts-ipa-uigothic.conf
%%X_FONTSDIR%%/TTF/ipagui.ttf
@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index b2e5c30be58..b0f6b4039b2 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -40,11 +40,11 @@ do-install:
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/OTF
${LN} -s -f \
${DATADIR}/ipa*.otf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/OTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/OTF
+ ${PREFIX}/${LOCAL_FONTSDIR}/OTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/OTF
${LN} -s -f \
${DATADIR}/ipa*.otf \
- ${LOCALBASE}/${X_FONTSDIR}/OTF/
+ ${PREFIX}/${X_FONTSDIR}/OTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-ipa.conf \
${FILESDIR}/62-fonts-ipa.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -58,7 +58,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/OTF
+ ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/OTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index 7b0900aab9e..acbd1fce01a 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -12,10 +12,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-ipa.conf
etc/fonts/conf.avail/62-fonts-ipa.conf
-@exec ln -s -f ../conf.avail/20-unhint-ipa.conf %D/etc/fonts/conf.d/20-unhint-ipa.conf
-@exec ln -s -f ../conf.avail/62-fonts-ipa.conf %D/etc/fonts/conf.d/62-fonts-ipa.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipa.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipa.conf
+etc/fonts/conf.d/20-unhint-ipa.conf
+etc/fonts/conf.d/62-fonts-ipa.conf
%%X_FONTSDIR%%/OTF/ipag.otf
%%X_FONTSDIR%%/OTF/ipagp.otf
%%X_FONTSDIR%%/OTF/ipam.otf
diff --git a/japanese/font-ipaex/Makefile b/japanese/font-ipaex/Makefile
index 3d90390c13c..4cbdd4960cd 100644
--- a/japanese/font-ipaex/Makefile
+++ b/japanese/font-ipaex/Makefile
@@ -38,11 +38,11 @@ do-install:
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/OTF
${LN} -s -f \
${DATADIR}/ipaex*.otf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/OTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/OTF
+ ${PREFIX}/${LOCAL_FONTSDIR}/OTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/OTF
${LN} -s -f \
${DATADIR}/ipaex*.otf \
- ${LOCALBASE}/${X_FONTSDIR}/OTF/
+ ${PREFIX}/${X_FONTSDIR}/OTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-ipaex.conf \
${FILESDIR}/62-fonts-ipaex.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -56,7 +56,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/OTF
+ ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/OTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-ipaex/pkg-plist b/japanese/font-ipaex/pkg-plist
index 7474fa3a1a0..47da7ba8b5d 100644
--- a/japanese/font-ipaex/pkg-plist
+++ b/japanese/font-ipaex/pkg-plist
@@ -8,10 +8,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-ipaex.conf
etc/fonts/conf.avail/62-fonts-ipaex.conf
-@exec ln -s -f ../conf.avail/20-unhint-ipaex.conf %D/etc/fonts/conf.d/20-unhint-ipaex.conf
-@exec ln -s -f ../conf.avail/62-fonts-ipaex.conf %D/etc/fonts/conf.d/62-fonts-ipaex.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipaex.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipaex.conf
+etc/fonts/conf.d/20-unhint-ipaex.conf
+etc/fonts/conf.d/62-fonts-ipaex.conf
%%X_FONTSDIR%%/OTF/ipaexg.otf
%%X_FONTSDIR%%/OTF/ipaexm.otf
@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/OTF || true
diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index b0e27728b58..47e49739d01 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -36,12 +36,12 @@ PORTDOCS= README.ja COPYING docs
do-install:
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${DATADIR}/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${DATADIR}/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-kochi.conf \
${FILESDIR}/62-fonts-kochi.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -55,7 +55,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-kochi/pkg-plist b/japanese/font-kochi/pkg-plist
index 5bcd6a9bdd4..fe30b5712e5 100644
--- a/japanese/font-kochi/pkg-plist
+++ b/japanese/font-kochi/pkg-plist
@@ -8,10 +8,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-kochi.conf
etc/fonts/conf.avail/62-fonts-kochi.conf
-@exec ln -s -f ../conf.avail/20-unhint-kochi.conf %D/etc/fonts/conf.d/20-unhint-kochi.conf
-@exec ln -s -f ../conf.avail/62-fonts-kochi.conf %D/etc/fonts/conf.d/62-fonts-kochi.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-kochi.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-kochi.conf
+etc/fonts/conf.d/20-unhint-kochi.conf
+etc/fonts/conf.d/62-fonts-kochi.conf
%%X_FONTSDIR%%/TTF/kochi-mincho-subst.ttf
%%X_FONTSDIR%%/TTF/kochi-gothic-subst.ttf
@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
diff --git a/japanese/font-mona-ipa/Makefile b/japanese/font-mona-ipa/Makefile
index 300eef0e665..9abb3718010 100644
--- a/japanese/font-mona-ipa/Makefile
+++ b/japanese/font-mona-ipa/Makefile
@@ -38,11 +38,11 @@ do-install:
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
${LN} -s -f \
${DATADIR}/fonts/ipa*-mona.ttf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
${LN} -s -f \
${DATADIR}/fonts/ipa*-mona.ttf \
- ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${PREFIX}/${X_FONTSDIR}/TTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-mona-ipa.conf \
${FILESDIR}/62-fonts-mona-ipa.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -56,7 +56,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-mona-ipa/pkg-plist b/japanese/font-mona-ipa/pkg-plist
index 815934221b6..222d661f575 100644
--- a/japanese/font-mona-ipa/pkg-plist
+++ b/japanese/font-mona-ipa/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/japanese/font-mona-ipa/pkg-plist,v 1.1 2009-11-29 17:53:18 hrs Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/japanese/font-mona-ipa/pkg-plist,v 1.2 2010-09-30 19:40:16 hrs Exp $
%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_5500.ppd
%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_4600.ppd
%%DATADIR%%/ppd/Makefile.in
@@ -95,10 +95,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-mona-ipa.conf
etc/fonts/conf.avail/62-fonts-mona-ipa.conf
-@exec ln -s -f ../conf.avail/20-unhint-mona-ipa.conf %D/etc/fonts/conf.d/20-unhint-mona-ipa.conf
-@exec ln -s -f ../conf.avail/62-fonts-mona-ipa.conf %D/etc/fonts/conf.d/62-fonts-mona-ipa.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-mona-ipa.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-mona-ipa.conf
+etc/fonts/conf.d/20-unhint-mona-ipa.conf
+etc/fonts/conf.d/62-fonts-mona-ipa.conf
%%X_FONTSDIR%%/TTF/ipag-mona.ttf
%%X_FONTSDIR%%/TTF/ipagp-mona.ttf
%%X_FONTSDIR%%/TTF/ipagui-mona.ttf
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 73b68664d04..385533b3eff 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -41,10 +41,10 @@ do-install:
${DATADIR}
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
${LN} -s -f ${DATADIR}/fonts/M+*.ttf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
${LN} -s -f ${DATADIR}/fonts/M+*.ttf \
- ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${PREFIX}/${X_FONTSDIR}/TTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus-ipa.conf \
${FILESDIR}/62-fonts-mplus-ipa.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -58,7 +58,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index 9e960cc0637..b7d3ed0ed65 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -78,10 +78,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-mplus-ipa.conf
etc/fonts/conf.avail/62-fonts-mplus-ipa.conf
-@exec ln -s -f ../conf.avail/20-unhint-mplus-ipa.conf %D/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
-@exec ln -s -f ../conf.avail/62-fonts-mplus-ipa.conf %D/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
+etc/fonts/conf.d/20-unhint-mplus-ipa.conf
+etc/fonts/conf.d/62-fonts-mplus-ipa.conf
%%X_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
%%X_FONTSDIR%%/TTF/M+2P+IPAG.ttf
%%X_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile
index fb620a30478..89d9eca2a13 100644
--- a/japanese/font-mplus/Makefile
+++ b/japanese/font-mplus/Makefile
@@ -55,16 +55,16 @@ do-install-bitmap:
${SH} ${WRKDIR}/mplus_bitmap_fonts-2.2.4/install_mplus_fonts
${INSTALL_DATA} ${WRKDIR}/fonts.alias ${DATADIR}/bitmap
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/mplus
- ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${LOCALBASE}/${LOCAL_FONTSDIR}/mplus/
+ ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${LOCAL_FONTSDIR}/mplus/
${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc
- ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${LOCALBASE}/${X_FONTSDIR}/misc/
+ ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${X_FONTSDIR}/misc/
do-install-outline:
${INSTALL_DATA} ${WRKDIR}/mplus-TESTFLIGHT-031/*.ttf ${DATADIR}/TTF
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
- ${LN} -s -f ${DATADIR}/TTF/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
- ${LN} -s -f ${DATADIR}/TTF/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${LN} -s -f ${DATADIR}/TTF/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
+ ${LN} -s -f ${DATADIR}/TTF/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus.conf \
${FILESDIR}/62-fonts-mplus.conf \
${PREFIX}/etc/fonts/conf.avail
diff --git a/japanese/font-mplus/pkg-plist b/japanese/font-mplus/pkg-plist
index 5ce6bde6fda..950e84c9447 100644
--- a/japanese/font-mplus/pkg-plist
+++ b/japanese/font-mplus/pkg-plist
@@ -170,10 +170,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-mplus.conf
etc/fonts/conf.avail/62-fonts-mplus.conf
-@exec ln -s -f ../conf.avail/20-unhint-mplus.conf %D/etc/fonts/conf.d/20-unhint-mplust.conf
-@exec ln -s -f ../conf.avail/62-fonts-mplus.conf %D/etc/fonts/conf.d/62-fonts-mplus.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-mplus.conf
+etc/fonts/conf.d/20-unhint-mplus.conf
+etc/fonts/conf.d/62-fonts-mplus.conf
%%X_FONTSDIR%%/misc/mplus_f10b-euro.pcf.gz
%%X_FONTSDIR%%/misc/mplus_f10b.pcf.gz
%%X_FONTSDIR%%/misc/mplus_f10r-euro.pcf.gz
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index eeea628b1b3..770a0c1f7d5 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -34,12 +34,12 @@ X_FONTSDIR= lib/X11/fonts
do-install:
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
- ${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF
+ ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${DATADIR}/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
${LN} -s -f \
- ${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${DATADIR}/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami.conf \
${FILESDIR}/62-fonts-sazanami.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -53,7 +53,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
+ ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist
index f87aefa1b12..767d8a30fe1 100644
--- a/japanese/font-sazanami/pkg-plist
+++ b/japanese/font-sazanami/pkg-plist
@@ -8,10 +8,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-sazanami.conf
etc/fonts/conf.avail/62-fonts-sazanami.conf
-@exec ln -s -f ../conf.avail/20-unhint-sazanami.conf %D/etc/fonts/conf.d/20-unhint-sazanami.conf
-@exec ln -s -f ../conf.avail/62-fonts-sazanami.conf %D/etc/fonts/conf.d/62-fonts-sazanami.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-sazanami.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-sazanami.conf
+etc/fonts/conf.d/20-unhint-sazanami.conf
+etc/fonts/conf.d/62-fonts-sazanami.conf
%%X_FONTSDIR%%/TTF/sazanami-mincho.ttf
%%X_FONTSDIR%%/TTF/sazanami-gothic.ttf
@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index 01fc3864a3d..5da6d410f67 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -65,9 +65,9 @@ do-install:
${MKDIR} ${DATADIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias ${DATADIR}
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/shinonome
- ${LN} -s -f ${DATADIR}/*.pcf.gz ${LOCALBASE}/${LOCAL_FONTSDIR}/shinonome/
+ ${LN} -s -f ${DATADIR}/*.pcf.gz ${PREFIX}/${LOCAL_FONTSDIR}/shinonome/
${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc
- ${LN} -s -f ${DATADIR}/*.pcf.gz ${LOCALBASE}/${X_FONTSDIR}/misc/
+ ${LN} -s -f ${DATADIR}/*.pcf.gz ${PREFIX}/${X_FONTSDIR}/misc/
post-install:
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/japanese/font-takao/Makefile b/japanese/font-takao/Makefile
index 233a4db7b4b..6dd008fe2bc 100644
--- a/japanese/font-takao/Makefile
+++ b/japanese/font-takao/Makefile
@@ -39,11 +39,11 @@ do-install:
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/OTF
${LN} -s -f \
${DATADIR}/Takao*.otf \
- ${LOCALBASE}/${LOCAL_FONTSDIR}/OTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/OTF
+ ${PREFIX}/${LOCAL_FONTSDIR}/OTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/OTF
${LN} -s -f \
${DATADIR}/Takao*.otf \
- ${LOCALBASE}/${X_FONTSDIR}/OTF/
+ ${PREFIX}/${X_FONTSDIR}/OTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-takao.conf \
${FILESDIR}/62-fonts-takao.conf \
${PREFIX}/etc/fonts/conf.avail
@@ -57,7 +57,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/OTF
+ ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/OTF
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/japanese/font-takao/pkg-plist b/japanese/font-takao/pkg-plist
index 7a2daa3bfc3..baa568c7b2f 100644
--- a/japanese/font-takao/pkg-plist
+++ b/japanese/font-takao/pkg-plist
@@ -16,10 +16,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-takao.conf
etc/fonts/conf.avail/62-fonts-takao.conf
-@exec ln -s -f ../conf.avail/20-unhint-ipa.conf %D/etc/fonts/conf.d/20-unhint-takao.conf
-@exec ln -s -f ../conf.avail/62-fonts-ipa.conf %D/etc/fonts/conf.d/62-fonts-takao.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-takao.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-takao.conf
+etc/fonts/conf.d/20-unhint-takao.conf
+etc/fonts/conf.d/62-fonts-takao.conf
%%X_FONTSDIR%%/OTF/TakaoGothic.otf
%%X_FONTSDIR%%/OTF/TakaoPGothic.otf
%%X_FONTSDIR%%/OTF/TakaoExGothic.otf