Fix pkg-plist.

10 files changed, 65 insertions, 60 deletions

diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index 3a125fcb3634..8ca31e1a0f3d 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -22,7 +22,7 @@ NO_WRKSUBDIR=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
-LOCAL_FONTSDIR=	share/fonts/TrueType
+LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts/TrueType
 GRASS_FONTSDIR=	grass5/fonts
 
@@ -39,11 +39,11 @@ pre-install:
 	${CHMOD} +x ${WRKDIR}/pkg-install
 
 do-install:
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType
 	${MKDIR} ${X11BASE}/${X_FONTSDIR}
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${PREFIX}/${LOCAL_FONTSDIR}/
+		${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
 		${X11BASE}/${X_FONTSDIR}/
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index c59b506e5b15..7571cf34c224 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -1,21 +1,22 @@
 @comment $FreeBSD$
-@exec mkdir -p %%LOCAL_FONTSDIR%%
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/ipamp.ttf
+@exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @exec mkdir -p %%X_FONTSDIR%%
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipag.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipagp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipagui.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipam.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipamp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
+@unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
 @unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
 @unexec rm -f %%X_FONTSDIR%%/ipag.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 3a125fcb3634..8ca31e1a0f3d 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -22,7 +22,7 @@ NO_WRKSUBDIR=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
-LOCAL_FONTSDIR=	share/fonts/TrueType
+LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts/TrueType
 GRASS_FONTSDIR=	grass5/fonts
 
@@ -39,11 +39,11 @@ pre-install:
 	${CHMOD} +x ${WRKDIR}/pkg-install
 
 do-install:
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType
 	${MKDIR} ${X11BASE}/${X_FONTSDIR}
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${PREFIX}/${LOCAL_FONTSDIR}/
+		${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
 		${X11BASE}/${X_FONTSDIR}/
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index c59b506e5b15..7571cf34c224 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -1,21 +1,22 @@
 @comment $FreeBSD$
-@exec mkdir -p %%LOCAL_FONTSDIR%%
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/ipamp.ttf
+@exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @exec mkdir -p %%X_FONTSDIR%%
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipag.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipagp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipagui.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipam.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipamp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
+@unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
 @unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
 @unexec rm -f %%X_FONTSDIR%%/ipag.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
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
diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile
index 3a125fcb3634..8ca31e1a0f3d 100644
--- a/japanese/ipa-ttfonts/Makefile
+++ b/japanese/ipa-ttfonts/Makefile
@@ -22,7 +22,7 @@ NO_WRKSUBDIR=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
-LOCAL_FONTSDIR=	share/fonts/TrueType
+LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts/TrueType
 GRASS_FONTSDIR=	grass5/fonts
 
@@ -39,11 +39,11 @@ pre-install:
 	${CHMOD} +x ${WRKDIR}/pkg-install
 
 do-install:
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType
 	${MKDIR} ${X11BASE}/${X_FONTSDIR}
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${PREFIX}/${LOCAL_FONTSDIR}/
+		${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
 		${X11BASE}/${X_FONTSDIR}/
diff --git a/japanese/ipa-ttfonts/pkg-plist b/japanese/ipa-ttfonts/pkg-plist
index c59b506e5b15..7571cf34c224 100644
--- a/japanese/ipa-ttfonts/pkg-plist
+++ b/japanese/ipa-ttfonts/pkg-plist
@@ -1,21 +1,22 @@
 @comment $FreeBSD$
-@exec mkdir -p %%LOCAL_FONTSDIR%%
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/ipamp.ttf
+@exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
+@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @exec mkdir -p %%X_FONTSDIR%%
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipag.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipagp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipagui.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipam.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/ipamp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
+@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
+@unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
 @unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
 @unexec rm -f %%X_FONTSDIR%%/ipag.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
diff --git a/japanese/sazanami-ttf/Makefile b/japanese/sazanami-ttf/Makefile
index ac26b51baa4c..ea27738f5ccc 100644
--- a/japanese/sazanami-ttf/Makefile
+++ b/japanese/sazanami-ttf/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/sazanami-ttf/pkg-plist b/japanese/sazanami-ttf/pkg-plist
index 1d66c758fec0..6f003acacd39 100644
--- a/japanese/sazanami-ttf/pkg-plist
+++ b/japanese/sazanami-ttf/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