Update to version 2.0.

PR:		16366
Submitted by:	maintainer

3 files changed, 59 insertions, 62 deletions

diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index 253363e50c28..6e022da154cf 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -6,16 +6,15 @@
 # $FreeBSD$
 #
 
-DISTNAME=       baekmuk-1.1
-PKGNAME=	ko-baekmukfonts-bdf-1.1
+DISTNAME=       baekmuk-2.0
+PKGNAME=	ko-baekmukfonts-bdf-2.0
 CATEGORIES=	korean x11-fonts
-MASTER_SITES=	ftp://ftp.mizi.co.kr/pub/baekmuk/ \
-		http://www.FreeBSD.org/~sada/distfiles/
-DISTFILES=	baekmuk-1.1.tar.gz gulim12-19990903.bdf.gz
-EXTRACT_ONLY=	baekmuk-1.1.tar.gz
+MASTER_SITES=	ftp://ftp.mizi.co.kr/pub/baekmuk/
 
 MAINTAINER=	cjh@kr.freebsd.org
 
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86
+
 USE_X_PREFIX=	yes
 
 FONTLIST=	batang10 batang10b batang12 batang12b batang14 batang14b \
@@ -28,25 +27,25 @@ FONTLIST=	batang10 batang10b batang12 batang12b batang14 batang14b \
 
 BDFTOPCF=	${PREFIX}/bin/bdftopcf
 MKFONTDIR=	${PREFIX}/bin/mkfontdir
+CHARSETSUB=	s/ksx1001.1997/ksc5601.1987/g
+FONTSDIR=	lib/X11/fonts/local
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
+# change charset to ksc5601.1987...
 do-build:
-	${GUNZIP_CMD} -c ${_DISTDIR}/gulim12-19990903.bdf.gz \
-		> ${WRKDIR}/gulim12.bdf
 .for FONTNAME in ${FONTLIST}
+	perl -pi -e ${CHARSETSUB} ${WRKDIR}/${FONTNAME}.bdf
 	${BDFTOPCF} ${WRKDIR}/${FONTNAME}.bdf | ${GZIP_CMD} -c \
 		> ${WRKDIR}/${FONTNAME}.pcf.gz
 .endfor
 
 do-install:
-	-mkdir -p ${PREFIX}/lib/X11/fonts/baekmuk
+	-mkdir -p ${PREFIX}/${FONTSDIR}
 .for FONTNAME in ${FONTLIST}
 	${INSTALL_DATA} ${WRKDIR}/${FONTNAME}.pcf.gz \
-			${PREFIX}/lib/X11/fonts/baekmuk
+			${PREFIX}/${FONTSDIR}
 .endfor
-	${INSTALL_DATA} ${WRKDIR}/fonts.alias ${PREFIX}/lib/X11/fonts/baekmuk
-	${MKFONTDIR} ${PREFIX}/lib/X11/fonts/baekmuk
-
-post-install:
-	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@(cd ${PREFIX}/${FONTSDIR} && mkfontdir .)
 
 .include <bsd.port.mk>
diff --git a/korean/baekmukfonts-bdf/distinfo b/korean/baekmukfonts-bdf/distinfo
index bd8fb10e8c86..a8c3cc71b7a0 100644
--- a/korean/baekmukfonts-bdf/distinfo
+++ b/korean/baekmukfonts-bdf/distinfo
@@ -1,2 +1 @@
-MD5 (baekmuk-1.1.tar.gz) = afcaec896106903ee627fac6e1b3c1eb
-MD5 (gulim12-19990903.bdf.gz) = 0277603d2cddb1442579afd3fd05e853
+MD5 (baekmuk-2.0.tar.gz) = d40c31eec54172bdc80d42827066d9db
diff --git a/korean/baekmukfonts-bdf/pkg-plist b/korean/baekmukfonts-bdf/pkg-plist
index 87e696a0094d..a668e937a57c 100644
--- a/korean/baekmukfonts-bdf/pkg-plist
+++ b/korean/baekmukfonts-bdf/pkg-plist
@@ -1,45 +1,44 @@
-lib/X11/fonts/baekmuk/batang10.pcf.gz
-lib/X11/fonts/baekmuk/batang10b.pcf.gz
-lib/X11/fonts/baekmuk/batang12.pcf.gz
-lib/X11/fonts/baekmuk/batang12b.pcf.gz
-lib/X11/fonts/baekmuk/batang14.pcf.gz
-lib/X11/fonts/baekmuk/batang14b.pcf.gz
-lib/X11/fonts/baekmuk/batang16.pcf.gz
-lib/X11/fonts/baekmuk/batang16b.pcf.gz
-lib/X11/fonts/baekmuk/batang18.pcf.gz
-lib/X11/fonts/baekmuk/batang18b.pcf.gz
-lib/X11/fonts/baekmuk/batang20.pcf.gz
-lib/X11/fonts/baekmuk/batang20b.pcf.gz
-lib/X11/fonts/baekmuk/batang24.pcf.gz
-lib/X11/fonts/baekmuk/batang24b.pcf.gz
-lib/X11/fonts/baekmuk/dotum10.pcf.gz
-lib/X11/fonts/baekmuk/dotum12.pcf.gz
-lib/X11/fonts/baekmuk/dotum14.pcf.gz
-lib/X11/fonts/baekmuk/dotum16.pcf.gz
-lib/X11/fonts/baekmuk/dotum18.pcf.gz
-lib/X11/fonts/baekmuk/dotum20.pcf.gz
-lib/X11/fonts/baekmuk/dotum24.pcf.gz
-lib/X11/fonts/baekmuk/fonts.alias
-lib/X11/fonts/baekmuk/gulim10.pcf.gz
-lib/X11/fonts/baekmuk/gulim10b.pcf.gz
-lib/X11/fonts/baekmuk/gulim12.pcf.gz
-lib/X11/fonts/baekmuk/gulim12b.pcf.gz
-lib/X11/fonts/baekmuk/gulim14.pcf.gz
-lib/X11/fonts/baekmuk/gulim14b.pcf.gz
-lib/X11/fonts/baekmuk/gulim16.pcf.gz
-lib/X11/fonts/baekmuk/gulim16b.pcf.gz
-lib/X11/fonts/baekmuk/gulim18.pcf.gz
-lib/X11/fonts/baekmuk/gulim18b.pcf.gz
-lib/X11/fonts/baekmuk/gulim20.pcf.gz
-lib/X11/fonts/baekmuk/gulim20b.pcf.gz
-lib/X11/fonts/baekmuk/gulim24.pcf.gz
-lib/X11/fonts/baekmuk/gulim24b.pcf.gz
-lib/X11/fonts/baekmuk/hline10.pcf.gz
-lib/X11/fonts/baekmuk/hline12.pcf.gz
-lib/X11/fonts/baekmuk/hline14.pcf.gz
-lib/X11/fonts/baekmuk/hline16.pcf.gz
-lib/X11/fonts/baekmuk/hline18.pcf.gz
-lib/X11/fonts/baekmuk/hline20.pcf.gz
-lib/X11/fonts/baekmuk/hline24.pcf.gz
-@exec cd %D/lib/X11/fonts/baekmuk ; %D/bin/mkfontdir
-@unexec cd %D/lib/X11/fonts/baekmuk ; %D/bin/mkfontdir
+%%FONTSDIR%%/batang10.pcf.gz
+%%FONTSDIR%%/batang10b.pcf.gz
+%%FONTSDIR%%/batang12.pcf.gz
+%%FONTSDIR%%/batang12b.pcf.gz
+%%FONTSDIR%%/batang14.pcf.gz
+%%FONTSDIR%%/batang14b.pcf.gz
+%%FONTSDIR%%/batang16.pcf.gz
+%%FONTSDIR%%/batang16b.pcf.gz
+%%FONTSDIR%%/batang18.pcf.gz
+%%FONTSDIR%%/batang18b.pcf.gz
+%%FONTSDIR%%/batang20.pcf.gz
+%%FONTSDIR%%/batang20b.pcf.gz
+%%FONTSDIR%%/batang24.pcf.gz
+%%FONTSDIR%%/batang24b.pcf.gz
+%%FONTSDIR%%/dotum10.pcf.gz
+%%FONTSDIR%%/dotum12.pcf.gz
+%%FONTSDIR%%/dotum14.pcf.gz
+%%FONTSDIR%%/dotum16.pcf.gz
+%%FONTSDIR%%/dotum18.pcf.gz
+%%FONTSDIR%%/dotum20.pcf.gz
+%%FONTSDIR%%/dotum24.pcf.gz
+%%FONTSDIR%%/gulim10.pcf.gz
+%%FONTSDIR%%/gulim10b.pcf.gz
+%%FONTSDIR%%/gulim12.pcf.gz
+%%FONTSDIR%%/gulim12b.pcf.gz
+%%FONTSDIR%%/gulim14.pcf.gz
+%%FONTSDIR%%/gulim14b.pcf.gz
+%%FONTSDIR%%/gulim16.pcf.gz
+%%FONTSDIR%%/gulim16b.pcf.gz
+%%FONTSDIR%%/gulim18.pcf.gz
+%%FONTSDIR%%/gulim18b.pcf.gz
+%%FONTSDIR%%/gulim20.pcf.gz
+%%FONTSDIR%%/gulim20b.pcf.gz
+%%FONTSDIR%%/gulim24.pcf.gz
+%%FONTSDIR%%/gulim24b.pcf.gz
+%%FONTSDIR%%/hline10.pcf.gz
+%%FONTSDIR%%/hline12.pcf.gz
+%%FONTSDIR%%/hline14.pcf.gz
+%%FONTSDIR%%/hline16.pcf.gz
+%%FONTSDIR%%/hline18.pcf.gz
+%%FONTSDIR%%/hline20.pcf.gz
+%%FONTSDIR%%/hline24.pcf.gz
+@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir