Fix PREFIX/LOCALBASE confusion.

PR:	ports/146247

6 files changed, 18 insertions, 24 deletions

diff --git a/japanese/font-migmix/Makefile b/japanese/font-migmix/Makefile
index 5a14832d41ce..ceb2bab04830 100644
--- a/japanese/font-migmix/Makefile
+++ b/japanese/font-migmix/Makefile
@@ -45,9 +45,9 @@ do-install:
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/MigMix*.ttf \
 		${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
-	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/MigMix*.ttf \
-		${LOCALBASE}/${X_FONTSDIR}/TTF/
+		${PREFIX}/${X_FONTSDIR}/TTF/
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-migmix.conf \
 		${FILESDIR}/62-fonts-migmix.conf \
 		${PREFIX}/etc/fonts/conf.avail
@@ -61,7 +61,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-migmix/pkg-plist b/japanese/font-migmix/pkg-plist
index e1935b307982..08491c76c487 100644
--- a/japanese/font-migmix/pkg-plist
+++ b/japanese/font-migmix/pkg-plist
@@ -20,10 +20,8 @@
 @dirrmtry %%LOCAL_FONTSDIR%%
 etc/fonts/conf.avail/20-unhint-migmix.conf
 etc/fonts/conf.avail/62-fonts-migmix.conf
-@exec ln -s -f ../conf.avail/20-unhint-migmix.conf %D/etc/fonts/conf.d/20-unhint-migmix.conf
-@exec ln -s -f ../conf.avail/62-fonts-migmix.conf %D/etc/fonts/conf.d/62-fonts-migmix.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-migmix.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-migmix.conf
+etc/fonts/conf.d/20-unhint-migmix.conf
+etc/fonts/conf.d/62-fonts-migmix.conf
 %%X_FONTSDIR%%/TTF/MigMix-1M-Bold.ttf
 %%X_FONTSDIR%%/TTF/MigMix-1M-Regular.ttf
 %%X_FONTSDIR%%/TTF/MigMix-1P-Bold.ttf
diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index bfb96875308f..9762384f1004 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/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-ume.conf \
 		${FILESDIR}/62-fonts-ume.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-ume/pkg-plist b/japanese/font-ume/pkg-plist
index fc8f6ece53e6..a02aa87d1ed9 100644
--- a/japanese/font-ume/pkg-plist
+++ b/japanese/font-ume/pkg-plist
@@ -40,10 +40,8 @@
 @dirrmtry %%LOCAL_FONTSDIR%%
 etc/fonts/conf.avail/20-unhint-ume.conf
 etc/fonts/conf.avail/62-fonts-ume.conf
-@exec ln -s -f ../conf.avail/20-unhint-ume.conf %D/etc/fonts/conf.d/20-unhint-ume.conf
-@exec ln -s -f ../conf.avail/62-fonts-ume.conf %D/etc/fonts/conf.d/62-fonts-ume.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ume.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ume.conf
+etc/fonts/conf.d/20-unhint-ume.conf
+etc/fonts/conf.d/62-fonts-ume.conf
 %%X_FONTSDIR%%/TTF/ume-pgc4.ttf
 %%X_FONTSDIR%%/TTF/ume-pgc5.ttf
 %%X_FONTSDIR%%/TTF/ume-pgo4.ttf
diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index c74c0aa8878b..f22c731cef2a 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -37,10 +37,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/*.ttf \
-		${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
-	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+		${PREFIX}/${LOCAL_FONTSDIR}/TTF/
+	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/*.ttf \
-		${LOCALBASE}/${X_FONTSDIR}/TTF/
+		${PREFIX}/${X_FONTSDIR}/TTF/
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-vlgothic.conf \
 		${FILESDIR}/62-fonts-vlgothic.conf \
 		${PREFIX}/etc/fonts/conf.avail
@@ -54,7 +54,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-vlgothic/pkg-plist b/japanese/font-vlgothic/pkg-plist
index 52c587d869ee..50ae557cedb3 100644
--- a/japanese/font-vlgothic/pkg-plist
+++ b/japanese/font-vlgothic/pkg-plist
@@ -8,10 +8,8 @@
 @dirrmtry %%LOCAL_FONTSDIR%%
 etc/fonts/conf.avail/20-unhint-vlgothic.conf
 etc/fonts/conf.avail/62-fonts-vlgothic.conf
-@exec ln -s -f ../conf.avail/20-unhint-vlgothic.conf %D/etc/fonts/conf.d/20-unhint-vlgothic.conf
-@exec ln -s -f ../conf.avail/62-fonts-vlgothic.conf %D/etc/fonts/conf.d/62-fonts-vlgothic.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-vlgothic.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-vlgothic.conf
+etc/fonts/conf.d/20-unhint-vlgothic.conf
+etc/fonts/conf.d/62-fonts-vlgothic.conf
 %%X_FONTSDIR%%/TTF/VL-PGothic-Regular.ttf
 %%X_FONTSDIR%%/TTF/VL-Gothic-Regular.ttf
 @exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true