diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2010-12-08 06:39:19 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2010-12-08 06:39:19 +0000 |
| commit | cce3d10b63ebfc530f9c54b81aa51c4c8652098c (patch) | |
| tree | a920a02b297882b6ff4159c9c99afe73013f41c9 /japanese/font-ume | |
| parent | ad548da6c99378ffbb20479d174024afa837f9a2 (diff) | |
| download | ports-cce3d10b63ebfc530f9c54b81aa51c4c8652098c.tar.gz ports-cce3d10b63ebfc530f9c54b81aa51c4c8652098c.zip | |
Fix PREFIX/LOCALBASE confusion.
PR: ports/146247
Notes
Notes:
svn path=/head/; revision=265834
Diffstat (limited to 'japanese/font-ume')
| -rw-r--r-- | japanese/font-ume/Makefile | 10 | ||||
| -rw-r--r-- | japanese/font-ume/pkg-plist | 6 |
2 files changed, 7 insertions, 9 deletions
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 |