From 1440403cfbd5598b94cf4272a7a3619f52fb1934 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 29 Mar 2008 23:38:32 +0000
Subject: [PATCH] - Update to 20080327

PR:		122076
Submitted by:	Ports Fury
---
 japanese/font-vlgothic/Makefile | 27 ++++++++++++++++-----------
 japanese/font-vlgothic/distinfo |  6 +++---
 japanese/vlgothic/Makefile      | 27 ++++++++++++++++-----------
 japanese/vlgothic/distinfo      |  6 +++---
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index 0b9ebd300387..3bad2c361356 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vlgothic
-PORTVERSION=	20071015
+PORTVERSION=	20080327
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://vinelinux.org/~daisuke/vlgothic/
 DISTNAME=	VLGothic-${PORTVERSION}
@@ -17,31 +17,36 @@ COMMENT=	Free Japanese TrueType fonts named 'VLGothic'
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+WRKSRC=		${WRKDIR}/VLGothic
+
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-FONTSDIR=	lib/X11/fonts/vlgothic
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR="${FONTSDIR_REL}"
 
-WRKSRC=		${WRKDIR}/VLGothic
+FONTSDIR=	${PREFIX}/lib/X11/fonts/vlgothic
+FONTSDIR_REL=	${FONTSDIR:S,${PREFIX}/,,}
 
+TTF_FILES=	VL-PGothic-Regular.ttf VL-Gothic-Regular.ttf
 DOC_FILES=	Changelog LICENSE LICENSE.en LICENSE_E.mplus LICENSE_J.mplus \
 		README README.sazanami README_J.mplus
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA}	${WRKSRC}/VL-PGothic-Regular.ttf \
-			${WRKSRC}/VL-Gothic-Regular.ttf \
-			${PREFIX}/${FONTSDIR}
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
+	@${MKDIR} ${FONTSDIR}
+.for file in ${TTF_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${FONTSDIR}
+.endfor
+	@${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/63-vlgothic.conf \
 			${PREFIX}/etc/fonts/conf.d
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA}	${DOC_FILES:S,^,${WRKSRC}/,} ${DOCSDIR}
+.for file in ${DOC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 post-install:
-	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
+	${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/font-vlgothic/distinfo b/japanese/font-vlgothic/distinfo
index f6444b4e6354..303e7565d43a 100644
--- a/japanese/font-vlgothic/distinfo
+++ b/japanese/font-vlgothic/distinfo
@@ -1,3 +1,3 @@
-MD5 (VLGothic-20071015.tar.bz2) = a914a2b47e2a55cc7c1601a590adc23f
-SHA256 (VLGothic-20071015.tar.bz2) = bb1e966d361a0d212280a0fdf09901bd331c76f9e99cba75aa23edb5b3eecf09
-SIZE (VLGothic-20071015.tar.bz2) = 4557422
+MD5 (VLGothic-20080327.tar.bz2) = 82188d16fc29588f4236a49b60489878
+SHA256 (VLGothic-20080327.tar.bz2) = 3339282146caec3b56ce82e8382fb7d35e166e0ddc051e4607c2331c2db187ca
+SIZE (VLGothic-20080327.tar.bz2) = 4561165
diff --git a/japanese/vlgothic/Makefile b/japanese/vlgothic/Makefile
index 0b9ebd300387..3bad2c361356 100644
--- a/japanese/vlgothic/Makefile
+++ b/japanese/vlgothic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vlgothic
-PORTVERSION=	20071015
+PORTVERSION=	20080327
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://vinelinux.org/~daisuke/vlgothic/
 DISTNAME=	VLGothic-${PORTVERSION}
@@ -17,31 +17,36 @@ COMMENT=	Free Japanese TrueType fonts named 'VLGothic'
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+WRKSRC=		${WRKDIR}/VLGothic
+
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-FONTSDIR=	lib/X11/fonts/vlgothic
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR="${FONTSDIR_REL}"
 
-WRKSRC=		${WRKDIR}/VLGothic
+FONTSDIR=	${PREFIX}/lib/X11/fonts/vlgothic
+FONTSDIR_REL=	${FONTSDIR:S,${PREFIX}/,,}
 
+TTF_FILES=	VL-PGothic-Regular.ttf VL-Gothic-Regular.ttf
 DOC_FILES=	Changelog LICENSE LICENSE.en LICENSE_E.mplus LICENSE_J.mplus \
 		README README.sazanami README_J.mplus
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA}	${WRKSRC}/VL-PGothic-Regular.ttf \
-			${WRKSRC}/VL-Gothic-Regular.ttf \
-			${PREFIX}/${FONTSDIR}
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
+	@${MKDIR} ${FONTSDIR}
+.for file in ${TTF_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${FONTSDIR}
+.endfor
+	@${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/63-vlgothic.conf \
 			${PREFIX}/etc/fonts/conf.d
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA}	${DOC_FILES:S,^,${WRKSRC}/,} ${DOCSDIR}
+.for file in ${DOC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 post-install:
-	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
+	${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/vlgothic/distinfo b/japanese/vlgothic/distinfo
index f6444b4e6354..303e7565d43a 100644
--- a/japanese/vlgothic/distinfo
+++ b/japanese/vlgothic/distinfo
@@ -1,3 +1,3 @@
-MD5 (VLGothic-20071015.tar.bz2) = a914a2b47e2a55cc7c1601a590adc23f
-SHA256 (VLGothic-20071015.tar.bz2) = bb1e966d361a0d212280a0fdf09901bd331c76f9e99cba75aa23edb5b3eecf09
-SIZE (VLGothic-20071015.tar.bz2) = 4557422
+MD5 (VLGothic-20080327.tar.bz2) = 82188d16fc29588f4236a49b60489878
+SHA256 (VLGothic-20080327.tar.bz2) = 3339282146caec3b56ce82e8382fb7d35e166e0ddc051e4607c2331c2db187ca
+SIZE (VLGothic-20080327.tar.bz2) = 4561165