svn commit: r312413 - in head/japanese/kon2-16dot: . files

[TAKATSU Tomonari]

Author: tota
Date: Sun Feb 17 11:49:50 2013
New Revision: 312413
URL: http://svnweb.freebsd.org/changeset/ports/312413

Log:
  - Fix patching
  - Trim Makefile header
  - Replace NOPORTDOCS with PORT_OPTIONS:MDOCS
  - Bump PORTREVISION
  
  PR:		ports/175398
  Submitted by:	Tsurutani Naoki (maintainer)

Modified:
  head/japanese/kon2-16dot/Makefile
  head/japanese/kon2-16dot/files/patch-kon.cfg.FreeBSD

Modified: head/japanese/kon2-16dot/Makefile
==============================================================================
--- head/japanese/kon2-16dot/Makefile	Sun Feb 17 11:36:41 2013	(r312412)
+++ head/japanese/kon2-16dot/Makefile	Sun Feb 17 11:49:50 2013	(r312413)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	kon2 with 16dot font
-# Date created:         11 Apr 1997
-# Whom:                 Makoto Matsushita <matusita at jp.freebsd.org>
-#
+# Created by: Makoto Matsushita <matusita at jp.freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	kon2
 PORTVERSION=	0.3
-PORTREVISION=	6
+PORTREVISION=	7
 # '+=' is for slave ports
 CATEGORIES+=	japanese
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
@@ -43,7 +39,7 @@ KON14FONT=Startup
 	@${FALSE}
 .endif
 
-post-extract:
+post-patch:
 	cd ${WRKSRC} && \
 		${INSTALL_MAN} doc/kon.1 src/kon.1.in && \
 		${INSTALL_DATA} kon.cfg.FreeBSD kon.cfg.FreeBSD.in
@@ -68,7 +64,7 @@ post-configure:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/src/kon.1 ${MANPREFIX}/man/ja/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif

Modified: head/japanese/kon2-16dot/files/patch-kon.cfg.FreeBSD
==============================================================================
--- head/japanese/kon2-16dot/files/patch-kon.cfg.FreeBSD	Sun Feb 17 11:36:41 2013	(r312412)
+++ head/japanese/kon2-16dot/files/patch-kon.cfg.FreeBSD	Sun Feb 17 11:49:50 2013	(r312413)
@@ -1,5 +1,5 @@
 --- kon.cfg.FreeBSD.orig	1997-01-24 02:17:34.000000000 +0900
-+++ kon.cfg.FreeBSD	2012-05-10 00:14:28.042552343 +0900
++++ kon.cfg.FreeBSD	2013-02-17 09:42:05.000000000 +0900
 @@ -114,9 +114,12 @@
  	63 63 63
  
@@ -7,12 +7,12 @@
 -bdf-zcat:Startup
 -	gzip -cd /usr/local/lib/fonts/k14.bdf.gz | /usr/local/bin/fld -t bdf -n
 -	gzip -cd /usr/local/lib/fonts/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n
-+bdf-zcat16:@@KON16FONT@@
-+	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
-+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/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
++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
  minix:
  	/usr/bin/fld.minix -n /usr/share/fonts/publicfont.ank
  	/usr/bin/fld.minix -n /usr/share/fonts/publicfont.k14