summaryrefslogtreecommitdiff
path: root/japanese/font-sazanami
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2005-03-07 19:02:40 +0000
committerHiroki Sato <hrs@FreeBSD.org>2005-03-07 19:02:40 +0000
commit0a69cf7076e03fdc91fe55641b285b8e821161ee (patch)
tree72c009dbf6ee653d265fe5f591c86d4241f12b32 /japanese/font-sazanami
parentupdate to DAT 4441 (diff)
Fix pkg-plist.
Notes
Notes: svn path=/head/; revision=130551
Diffstat (limited to 'japanese/font-sazanami')
-rw-r--r--japanese/font-sazanami/Makefile8
-rw-r--r--japanese/font-sazanami/pkg-plist11
2 files changed, 10 insertions, 9 deletions
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index ac26b51baa4c..ea27738f5ccc 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
NO_BUILD= yes
FONTSDIR= lib/X11/fonts/TrueType
-LOCALFONTSDIR= share/fonts/TrueType
+LOCALFONTSDIR= share/fonts
MAKE_ENV= FONTSDIR=${FONTSDIR}
PLIST_SUB= FONTSDIR=${FONTSDIR} \
LOCALFONTSDIR=${LOCALBASE}/${LOCALFONTSDIR}
@@ -45,13 +45,13 @@ do-install:
${FILESDIR}/fonts.dir.sazanami \
${FILESDIR}/fonts.alias.sazanami \
${PREFIX}/${FONTSDIR}
- ${MKDIR} ${LOCALBASE}/${LOCALFONTSDIR}
+ ${MKDIR} ${LOCALBASE}/${LOCALFONTSDIR}/TrueType
${LN} -s -f \
${PREFIX}/${FONTSDIR}/sazanami-gothic.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/sazanami-gothic.ttf
+ ${LOCALBASE}/${LOCALFONTSDIR}/TrueType/sazanami-gothic.ttf
${LN} -s -f \
${PREFIX}/${FONTSDIR}/sazanami-mincho.ttf \
- ${LOCALBASE}/${LOCALFONTSDIR}/sazanami-mincho.ttf
+ ${LOCALBASE}/${LOCALFONTSDIR}/TrueType/sazanami-mincho.ttf
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for F in ${DOC_FILES:Mdoc/*}
diff --git a/japanese/font-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist
index 1d66c758fec0..6f003acacd39 100644
--- a/japanese/font-sazanami/pkg-plist
+++ b/japanese/font-sazanami/pkg-plist
@@ -17,9 +17,10 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ayu
%%PORTDOCS%%@dirrm %%DOCSDIR%%/kappa
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec mkdir -p %%LOCALFONTSDIR%%
-@exec ln -s -f %D/%%FONTSDIR%%/sazanami-mincho.ttf %%LOCALFONTSDIR%%/sazanami-mincho.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/sazanami-gothic.ttf %%LOCALFONTSDIR%%/sazanami-gothic.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/sazanami-mincho.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/sazanami-gothic.ttf
+@exec mkdir -p %%LOCALFONTSDIR%%/TrueType
+@exec ln -s -f %D/%%FONTSDIR%%/sazanami-mincho.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf
+@exec ln -s -f %D/%%FONTSDIR%%/sazanami-gothic.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf
+@unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf
+@unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf
+@unexec rmdir %%LOCALFONTSDIR%%/TrueType 2> /dev/null || true
@unexec rmdir %%LOCALFONTSDIR%% 2> /dev/null || true