diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2010-09-30 19:40:16 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2010-09-30 19:40:16 +0000 |
commit | 81cd33b2839a329ac06b3639c7726351b0030d72 (patch) | |
tree | 7637c41a90b27847decf299cb3f87958c6d43fea /japanese/font-ipa | |
parent | 933717f6b8016e9addd9d2c98e4f081c58e550dd (diff) | |
download | ports-81cd33b2839a329ac06b3639c7726351b0030d72.tar.gz ports-81cd33b2839a329ac06b3639c7726351b0030d72.zip |
Fix PREFIX/LOCALBASE confusion.
PR: ports/146247
Notes
Notes:
svn path=/head/; revision=262206
Diffstat (limited to 'japanese/font-ipa')
-rw-r--r-- | japanese/font-ipa/Makefile | 8 | ||||
-rw-r--r-- | japanese/font-ipa/pkg-plist | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile index b2e5c30be58b..b0f6b4039b28 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 7b0900aab9ef..acbd1fce01a5 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 |