Update to 2004.06.05

PR:             158499
Submitted by:   KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 28 insertions, 24 deletions

diff --git a/games/tuxpaint-fonts/Makefile b/games/tuxpaint-fonts/Makefile
index 79ae91dcd100..8b042f473952 100644
--- a/games/tuxpaint-fonts/Makefile
+++ b/games/tuxpaint-fonts/Makefile
@@ -6,49 +6,56 @@
 #
 
 PORTNAME=	tuxpaint
-PORTVERSION=	1
-PORTREVISION=	4
+PORTVERSION=	2004.06.05
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-fonts/chinese-2003.0${PORTVERSION}.05
+MASTER_SITES=	#
 PKGNAMESUFFIX=	-fonts
 DISTFILES=	#
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TuxPaint Localized Fonts
 
-RUN_DEPENDS=	tuxpaint:${PORTSDIR}/games/tuxpaint
+RUN_DEPENDS=	tuxpaint>=0.9.21:${PORTSDIR}/games/tuxpaint
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 # Available font languages.
-LANGS=		Chinese Chinese_Simplified Korean
+LANGS=		Chinese_Simplified Korean Vietnamese
 
 # Define distfiles for all languages.
-CHINESE_DISTFILES=		${PORTNAME}-ttf-chinese-2003.01.05
-CHINESE_SIMPLIFIED_DISTFILES=	${PORTNAME}-ttf-chinese-simplified-2004.06.05
-KOREAN_DISTFILES=		${PORTNAME}-ttf-korean-2002.12.05
+CHINESE_SIMPLIFIED_DISTNAME=	chinese-simplified-2004.06.05
+KOREAN_DISTNAME=		korean-2002.12.05
+VIETNAMESE_DISTNAME=		vietnamese-2004.04.15
 
 # Define language codes.
-CHINESE_CODE=			zh
 CHINESE_SIMPLIFIED_CODE=	zh_cn
 KOREAN_CODE=			ko
+VIETNAMESE_CODE=		vi
 
 # Generate options menu.
 .for l in ${LANGS}
 OPTIONS+=	${l:U} "${l:S/_/ /} fonts" on
 .endfor
 
+# Set MASTER_SITES
+.for l in ${LANGS}
+MASTER_SITES+=	SF/${PORTNAME}/${PORTNAME}-fonts/${${l:U}_DISTNAME}:${l:U}
+.endfor
+
 # Do not use the same OPTIONS directory as "games/tuxpaint".
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.pre.mk>
 
 # Set DISTFILES and PLIST_FILES according to OPTIONS.
-.for l in ${LANGS:U}
-.	if !defined(WITHOUT_${l})
-DISTFILES+=	${${l}_DISTFILES}${EXTRACT_SUFX}
-PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l}_CODE}.ttf
+.for l in ${LANGS}
+.	if !defined(WITHOUT_${l:U})
+DISTFILES+=	${PORTNAME}-ttf-${${l:U}_DISTNAME}${EXTRACT_SUFX}:${l:U}
+PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}.ttf
+PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}_docs/COPYING.txt
+PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}_docs/README.txt
+PLIST_DIRS+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}_docs
 .	endif
 .endfor
 
@@ -58,8 +65,12 @@ do-install:
 .for l in ${LANGS}
 .	if defined(WITH_${l:U})
 		${INSTALL_DATA} \
-			${WRKSRC}/${${l:U}_DISTFILES}/${${l:U}_CODE}.ttf \
+			${WRKSRC}/${PORTNAME}-ttf-${${l:U}_DISTNAME}/${${l:U}_CODE}.ttf \
 			${DATADIR}/fonts/locale
+		${MKDIR} ${DATADIR}/fonts/locale/${${l:U}_CODE}_docs
+		${INSTALL_DATA} \
+			${WRKSRC}/${PORTNAME}-ttf-${${l:U}_DISTNAME}/*.txt \
+			${DATADIR}/fonts/locale/${${l:U}_CODE}_docs
 .	endif
 .endfor
 
diff --git a/games/tuxpaint-fonts/distinfo b/games/tuxpaint-fonts/distinfo
index f55018956325..7e39fd854757 100644
--- a/games/tuxpaint-fonts/distinfo
+++ b/games/tuxpaint-fonts/distinfo
@@ -1,10 +1,6 @@
-SHA256 (tuxpaint-ttf-chinese-2003.01.05.tar.gz) = d83ca54fb96e2f06634cb4dfcd356267862857242e41dd8b532fa88083c55a37
-SIZE (tuxpaint-ttf-chinese-2003.01.05.tar.gz) = 2347359
 SHA256 (tuxpaint-ttf-chinese-simplified-2004.06.05.tar.gz) = 8edf162505ee510fa58342390cbf6ad34540c57bf4abe9cd5ec7043f5a82459d
 SIZE (tuxpaint-ttf-chinese-simplified-2004.06.05.tar.gz) = 2347401
-SHA256 (tuxpaint-ttf-georgian-2005.03.24.tar.gz) = c7334a5f2c0c8052455e6423411e9d6cba2aa2c1357e4126337cd438b844f674
-SIZE (tuxpaint-ttf-georgian-2005.03.24.tar.gz) = 36967
-SHA256 (tuxpaint-ttf-japanese-2003.01.24.tar.gz) = 31e25c3e9195d1660f1ccf855a1cac010fe3eb17028f34488e53c41bda8e46f7
-SIZE (tuxpaint-ttf-japanese-2003.01.24.tar.gz) = 2562537
 SHA256 (tuxpaint-ttf-korean-2002.12.05.tar.gz) = b361dd17c5456d17e18addb29e6625ec9f3fc912acd37392050edc5548160159
 SIZE (tuxpaint-ttf-korean-2002.12.05.tar.gz) = 4343670
+SHA256 (tuxpaint-ttf-vietnamese-2004.04.15.tar.gz) = e240d2b546f4fd5e574312e94bdd6cdb26e8edddbc827d0b756286eee1d5157e
+SIZE (tuxpaint-ttf-vietnamese-2004.04.15.tar.gz) = 31752
diff --git a/games/tuxpaint-fonts/pkg-descr b/games/tuxpaint-fonts/pkg-descr
index 78c035df03fd..b58e8904f6f7 100644
--- a/games/tuxpaint-fonts/pkg-descr
+++ b/games/tuxpaint-fonts/pkg-descr
@@ -4,7 +4,4 @@ encouraging cartoon mascot who helps guide children as they use the program.
 It provides a blank canvas and a variety of drawing tools to help your child
 be creative.
 
-WWW: http://www.newbreedsoftware.com/tuxpaint/
-
-- Alejandro Pulver
-alejandro@varnet.biz
+WWW: http://www.tuxpaint.org/