From cce3d10b63ebfc530f9c54b81aa51c4c8652098c Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Wed, 8 Dec 2010 06:39:19 +0000 Subject: Fix PREFIX/LOCALBASE confusion. PR: ports/146247 --- japanese/font-migmix/Makefile | 6 +++--- japanese/font-migmix/pkg-plist | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'japanese/font-migmix') 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 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 -- cgit v1.2.3