From 2c70230681aaf34879d460a161bcdd190a3de98e Mon Sep 17 00:00:00 2001
From: hrs <hrs@FreeBSD.org>
Date: Thu, 30 Sep 2010 19:40:16 +0000
Subject: Fix PREFIX/LOCALBASE confusion.

PR:	ports/146247
---
 japanese/font-mona-ipa/Makefile  | 8 ++++----
 japanese/font-mona-ipa/pkg-plist | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'japanese/font-mona-ipa')

diff --git a/japanese/font-mona-ipa/Makefile b/japanese/font-mona-ipa/Makefile
index 300eef0e6657..9abb37180109 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 815934221b6b..222d661f5756 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
-- 
cgit