From 959e6a2b59e90b2a59329716e064c00b5165e86f Mon Sep 17 00:00:00 2001
From: Yen-Ming Lee <leeym@FreeBSD.org>
Date: Sat, 5 Mar 2005 18:30:20 +0000
Subject: - utilize PORTDOCS in japanese/kon2-16dot (master) - utilize
 PLIST_FILES in chinese/kon2 (slave) - change target in chinese/kon2 (slave)
 to avoid conflicts - remove extra directory in japanese/kon2-16dot (master) -
 some minor fixes

---
 chinese/kon2/Makefile  | 26 ++++++++++++++++----------
 chinese/kon2/pkg-plist | 12 ------------
 2 files changed, 16 insertions(+), 22 deletions(-)
 delete mode 100644 chinese/kon2/pkg-plist

(limited to 'chinese')

diff --git a/chinese/kon2/Makefile b/chinese/kon2/Makefile
index 88a6de463e1d..fa63ed557b6f 100644
--- a/chinese/kon2/Makefile
+++ b/chinese/kon2/Makefile
@@ -13,29 +13,35 @@ CATEGORIES=	chinese
 
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/fonts/bdf/kc15f.bdf.gz:${PORTSDIR}/chinese/kcfonts:patch
+BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/chinese/kcfonts:patch
 
 USE_REINPLACE=	yes
-PLIST=		pkg-plist
 KCFONTS_WRKSRC=	`cd ${PORTSDIR}/chinese/kcfonts; make -V WRKSRC`
 
-post-patch:
-	${REINPLACE_CMD} -e "s;jiskan16.bdf.gz;kc15f.bdf.gz;g" \
+PLIST_FILES=	share/fonts/bdf/kc15f.bdf.gz
+
+post-patch: post-patch-zhkon2
+post-patch-zhkon2:
+	@${REINPLACE_CMD} -e "s;jiskan16.bdf.gz;kc15f.bdf.gz;g" \
 		-e "s;ja_JP.ujis:Coding;ja_JP.ujis:;g" \
 		-e "s;zh_TW.big5:;zh_TW.big5:Coding;g" \
 		-e "s;BIG5.HKU-0;BIG5-0;g" \
 		-e "s,GB2312.1980,GBK,g" \
 		${WRKSRC}/kon.cfg.FreeBSD
-	${REINPLACE_CMD} -e "s;BIG5.HKU-0;BIG5-0;g" \
+	@${REINPLACE_CMD} -e "s;BIG5.HKU-0;BIG5-0;g" \
 		-e "s;BIG5,      0;BIG5, 0xfefe;g" \
 		-e "s,GB2312.1980,GBK,g" \
 		${WRKSRC}/lib/coding.c
-	${REINPLACE_CMD} -e 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/term.c \
+	@${REINPLACE_CMD} -e 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/term.c \
 		${WRKSRC}/src/display/vga.c
 
-pre-install:
-	${MKDIR} ${PREFIX}/share/fonts/bdf
-	cd ${KCFONTS_WRKSRC} && gcc -O -pipe -o kc15f tran.c kc15f.c && \
-		./kc15f | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/kc15f.bdf.gz
+post-build: post-build-zhkon2
+post-build-zhkon2:
+	@cd ${KCFONTS_WRKSRC} && ${MAKE} kc15f
+
+post-install: post-install-zhkon2
+post-install-zhkon2:
+	@${MKDIR} ${PREFIX}/share/fonts/bdf
+	cd ${KCFONTS_WRKSRC} && ./kc15f | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/kc15f.bdf.gz
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/kon2/pkg-plist b/chinese/kon2/pkg-plist
deleted file mode 100644
index b0322221178d..000000000000
--- a/chinese/kon2/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/fld
-bin/kon
-etc/kon.cfg
-share/fonts/bdf/7x14rk.bdf.gz
-share/fonts/bdf/k14.bdf.gz
-share/fonts/bdf/8x16rk.bdf.gz
-share/fonts/bdf/jiskan16.bdf.gz
-share/fonts/bdf/kc15f.bdf.gz
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.FreeBSD
-@dirrm %%DOCSDIR%%
-@dirrm share/fonts/bdf
-- 
cgit v1.2.3