svn commit: r315808 - in head/chinese/kon2: . files

[Bryan Drewery]

Author: bdrewery
Date: Mon Apr 15 20:25:58 2013
New Revision: 315808
URL: http://svnweb.freebsd.org/changeset/ports/315808

Log:
  - Followup to r312413: fix patching
  - Trim header
  - pet portlint: cat->${CAT}
  
  Approved by:	portmgr (implicit)

Modified:
  head/chinese/kon2/Makefile
  head/chinese/kon2/files/patch-kon.cfg.FreeBSD

Modified: head/chinese/kon2/Makefile
==============================================================================
--- head/chinese/kon2/Makefile	Mon Apr 15 19:28:45 2013	(r315807)
+++ head/chinese/kon2/Makefile	Mon Apr 15 20:25:58 2013	(r315808)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	kon2 with 16dot font
-# Date created:         31 March 2003
-# Whom:                 Chen Chuan-Hsing <statue at freebsd.sinica.edu.tw>
-#
+# Created by: Chen Chuan-Hsing <statue at freebsd.sinica.edu.tw>
 # $FreeBSD$
-#
 
 PORTREVISION=	3
 
@@ -37,7 +33,7 @@ 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
-	cd ${CCE_WRKSRC} && cat fonts/gb16fs.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/gb16fs.bdf.gz
-	cd ${CCE_WRKSRC} && cat fonts/8x16.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/8x16.bdf.gz
+	cd ${CCE_WRKSRC} && ${CAT} fonts/gb16fs.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/gb16fs.bdf.gz
+	cd ${CCE_WRKSRC} && ${CAT} fonts/8x16.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/8x16.bdf.gz
 
 .include "${MASTERDIR}/Makefile"

Modified: head/chinese/kon2/files/patch-kon.cfg.FreeBSD
==============================================================================
--- head/chinese/kon2/files/patch-kon.cfg.FreeBSD	Mon Apr 15 19:28:45 2013	(r315807)
+++ head/chinese/kon2/files/patch-kon.cfg.FreeBSD	Mon Apr 15 20:25:58 2013	(r315808)
@@ -3,15 +3,15 @@
 @@ -115,8 +115,10 @@
  
  # Startup command definition (usually font loading commands are specified)
- bdf-zcat16:@@KON16FONT@@
-+	gzip -cd @@PREFIX@@/share/fonts/bdf/8x16.bdf.gz | /usr/local/bin/fld -t bdf -n
- 	gzip -cd @@PREFIX@@/share/fonts/bdf/jiskan16.bdf.gz | /usr/local/bin/fld -t bdf -n
--	gzip -cd @@PREFIX@@/share/fonts/bdf/8x16rk.bdf.gz | /usr/local/bin/fld -t bdf -n
-+	gzip -cd @@PREFIX@@/share/fonts/bdf/kc15f.bdf.gz | /usr/local/bin/fld -t bdf -n
-+	gzip -cd @@PREFIX@@/share/fonts/bdf/gb16fs.bdf.gz | /usr/local/bin/fld -t bdf -n
- bdf-zcat14:@@KON14FONT@@
- 	gzip -cd @@PREFIX@@/share/fonts/bdf/k14.bdf.gz | /usr/local/bin/fld -t bdf -n
- 	gzip -cd @@PREFIX@@/share/fonts/bdf/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n
+ bdf-zcat16:%%KON16FONT%%
++	gzip -cd %%PREFIX%%/share/fonts/bdf/8x16.bdf.gz | /usr/local/bin/fld -t bdf -n
+ 	gzip -cd %%PREFIX%%/share/fonts/bdf/jiskan16.bdf.gz | /usr/local/bin/fld -t bdf -n
+-	gzip -cd %%PREFIX%%/share/fonts/bdf/8x16rk.bdf.gz | /usr/local/bin/fld -t bdf -n
++	gzip -cd %%PREFIX%%/share/fonts/bdf/kc15f.bdf.gz | /usr/local/bin/fld -t bdf -n
++	gzip -cd %%PREFIX%%/share/fonts/bdf/gb16fs.bdf.gz | /usr/local/bin/fld -t bdf -n
+ bdf-zcat14:%%KON14FONT%%
+ 	gzip -cd %%PREFIX%%/share/fonts/bdf/k14.bdf.gz | /usr/local/bin/fld -t bdf -n
+ 	gzip -cd %%PREFIX%%/share/fonts/bdf/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n
 @@ -199,16 +201,16 @@
  #   BIG5.HKU-0, GB2312.1980-1, JISX0208.1983-0, KSC5601.1987-0
  #   EUC, SJIS