4 files changed, 23 insertions, 24 deletions

diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index fc519838fd5e..ef5630b6a522 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	vlgothic
-PORTVERSION=	20090204
+PORTNAME=	font-vlgothic
+PORTVERSION=	20090422
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP
-MASTER_SITE_SUBDIR=	vlgothic/37455
+MASTER_SITE_SUBDIR=	vlgothic/38942
 DISTNAME=	VLGothic-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Free Japanese TrueType fonts named 'VLGothic'
+COMMENT=	VLGothic Japanese TrueType fonts
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
@@ -34,14 +34,13 @@ X_FONTSDIR=	lib/X11/fonts
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/*.ttf \
-		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
-	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+		${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/*.ttf \
-		${LOCALBASE}/${X_FONTSDIR}/TrueType/
+		${LOCALBASE}/${X_FONTSDIR}/TTF/
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-vlgothic.conf \
 		${FILESDIR}/62-fonts-vlgothic.conf \
 		${PREFIX}/etc/fonts/conf.avail
@@ -55,7 +54,7 @@ do-install:
 .endif
 
 post-install:
-	${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+	${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/font-vlgothic/distinfo b/japanese/font-vlgothic/distinfo
index abfe6963890b..a913d08da98c 100644
--- a/japanese/font-vlgothic/distinfo
+++ b/japanese/font-vlgothic/distinfo
@@ -1,3 +1,3 @@
-MD5 (VLGothic-20090204.tar.bz2) = 54298db27daf7b3ec92aff5cfab72f02
-SHA256 (VLGothic-20090204.tar.bz2) = 6e1adb064ef968f0d60e3a4934d1fdf05c37579ecb138e1876b1af1fefb62aec
-SIZE (VLGothic-20090204.tar.bz2) = 4662317
+MD5 (VLGothic-20090422.tar.bz2) = dcc9a788a47554344a47926211208473
+SHA256 (VLGothic-20090422.tar.bz2) = 3b61dfc15875626edb258574826de469753138ad1448bbb5fe6b9efe61433aa5
+SIZE (VLGothic-20090422.tar.bz2) = 4728873
diff --git a/japanese/font-vlgothic/files/pkg-install.in b/japanese/font-vlgothic/files/pkg-install.in
index 1a3298463a08..40a459d2bfbc 100644
--- a/japanese/font-vlgothic/files/pkg-install.in
+++ b/japanese/font-vlgothic/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
 
 catfontsdir ()
 {
diff --git a/japanese/font-vlgothic/pkg-plist b/japanese/font-vlgothic/pkg-plist
index 0274e6aa12cf..52c587d869ee 100644
--- a/japanese/font-vlgothic/pkg-plist
+++ b/japanese/font-vlgothic/pkg-plist
@@ -2,9 +2,9 @@
 %%DATADIR%%/VL-PGothic-Regular.ttf
 %%DATADIR%%/VL-Gothic-Regular.ttf
 @dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/VL-PGothic-Regular.ttf
-%%LOCAL_FONTSDIR%%/TrueType/VL-Gothic-Regular.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/VL-PGothic-Regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/VL-Gothic-Regular.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
 @dirrmtry %%LOCAL_FONTSDIR%%
 etc/fonts/conf.avail/20-unhint-vlgothic.conf
 etc/fonts/conf.avail/62-fonts-vlgothic.conf
@@ -12,10 +12,10 @@ etc/fonts/conf.avail/62-fonts-vlgothic.conf
 @exec ln -s -f ../conf.avail/62-fonts-vlgothic.conf %D/etc/fonts/conf.d/62-fonts-vlgothic.conf
 @unexec rm -f %D/etc/fonts/conf.d/20-unhint-vlgothic.conf
 @unexec rm -f %D/etc/fonts/conf.d/62-fonts-vlgothic.conf
-%%X_FONTSDIR%%/TrueType/VL-PGothic-Regular.ttf
-%%X_FONTSDIR%%/TrueType/VL-Gothic-Regular.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
-@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
-@dirrmtry %%X_FONTSDIR%%/TrueType
-@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
+%%X_FONTSDIR%%/TTF/VL-PGothic-Regular.ttf
+%%X_FONTSDIR%%/TTF/VL-Gothic-Regular.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true; fi