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-kochi | |
| 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-kochi')
| -rw-r--r-- | japanese/font-kochi/Makefile | 10 | ||||
| -rw-r--r-- | japanese/font-kochi/pkg-plist | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile index b0e27728b581..47e49739d013 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 5bcd6a9bdd4c..fe30b5712e52 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 |