ports/175398: fix patches in japanese/kon2-16dot

Tsurutani Naoki turutani at scphys.kyoto-u.ac.jp
Fri Jan 18 09:10:01 UTC 2013 

>Number:         175398
>Category:       ports
>Synopsis:       fix patches in japanese/kon2-16dot
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 18 09:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Tsurutani Naoki
>Release:        FreeBSD 8.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #25: Mon Jan 24 10:37:18 JST 2011 turutani at h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386


	
>Description:
	japanese/kon2-16dot installs some unexpected (unpatched) files;
	kon.cfg and kon.1 are ill mentioned.
	This bug is introduced by SVN rev. 298424.
	
>How-To-Repeat:
	
>Fix:
	here is a patch:

diff -urN kon2-16dot.orig/Makefile kon2-16dot/Makefile
--- kon2-16dot.orig/Makefile	2012-11-17 14:58:36.000000000 +0900
+++ kon2-16dot/Makefile	2013-01-18 17:35:17.000000000 +0900
@@ -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: ports/japanese/kon2-16dot/Makefile,v 1.44 2012/11/17 05:58:36 svnexp Exp $
-#
 
 PORTNAME=	kon2
 PORTVERSION=	0.3
-PORTREVISION=	6
+PORTREVISION=	7
 # '+=' is for slave ports
 CATEGORIES+=	japanese
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
diff -urN kon2-16dot.orig/files/patch-doc_kon.1 kon2-16dot/files/patch-doc_kon.1
--- kon2-16dot.orig/files/patch-doc_kon.1	2012-05-10 04:28:24.000000000 +0900
+++ kon2-16dot/files/patch-doc_kon.1	1970-01-01 09:00:00.000000000 +0900
@@ -1,49 +0,0 @@
---- doc/kon.1.orig	1996-09-05 09:13:47.000000000 +0900
-+++ doc/kon.1	2012-05-10 00:17:11.688553415 +0900
-@@ -11,6 +11,18 @@
- .B -capability
- value ...
- ]
-+.br
-+.B kon
-+[
-+.B -s
-+]
-+[
-+.B -e
-+command argument ...
-+]
-+[
-+.B -u
-+]
- .SH ¡Ú³µÍסÛ
- \fIKON\fP ¤Ï \fILinux\fP, \fIFreeBSD\fP ¤Î¥³¥ó¥½¡¼¥ë²èÌ̾å¤Ç´Á»ú¤òɽ¼¨
- ¤¹¤ë¤¿¤á¤Î¥×¥í¥°¥é¥à¤Ç¤¹¡£\fIKON\fP ¤Ç¤Ï¡¢
-@@ -36,6 +48,15 @@
- 
- ¤È¤¹¤ì¤Ð \fICursorInterval\fP ¤ÎÃͤò 10 ¤Ë¤·¤Æµ¯Æ°¤·¤Þ¤¹¡£
- 
-+.B -s
-+¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ç»ÈÍѤ·¤Þ¤¹¡£
-+
-+.B -e
-+¥³¥Þ¥ó¥É¤òµ¯Æ°¤¹¤ë¤È¤­¡¢»ÈÍѤ·¤Þ¤¹¡£¤³¤Î°ú¿ô°Ê¹ß¤Ï¡¢¥³¥Þ¥ó¥É̾¤È¤½¤Î°ú¿ô¤È
-+¸«¤Ê¤µ¤ì¤Þ¤¹¡£
-+
-+.B -u
-+TERM ´Ä¶­ÊÑ¿ô¤ò vt100 ¤ËÀßÄꤷ¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢vt100 ¤ËÀßÄꤷ¤Þ¤¹¡£
- .PP
- .SH ¡Ú´Ä¶­ÀßÄê¡Û
- ɽ¼¨¤¹¤ë¥Ó¥Ç¥ª¥É¥é¥¤¥Ð¤ä¥Ñ¥ì¥Ã¥È¤Ê¤É¤Î´Ä¶­¤Ï \fIkon.cfg\fP ¥Õ¥¡¥¤¥ë¤ÇÀßÄꤹ¤ë
-@@ -267,9 +288,9 @@
- .SH ¡Ú¥Õ¥¡¥¤¥ë¡Û
- .if n .ta 2.5i
- .if t .ta 1.8i
--/usr/local/lib/kon.cfg	´Ä¶­ÀßÄê¥Õ¥¡¥¤¥ë
-+@@PREFIX@@/etc/kon.cfg	´Ä¶­ÀßÄê¥Õ¥¡¥¤¥ë
- .br
--/usr/lib/font/*		¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë
-+@@PREFIX@@/share/fonts/bdf/*		¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë
- .SH ¡Ú´ØÏ¢¹àÌÜ¡Û
- swkon(1), fld(1)
- .SH ¡ÚÃí°Õ»ö¹à¡Û
diff -urN kon2-16dot.orig/files/patch-doc_kon.1.in kon2-16dot/files/patch-doc_kon.1.in
--- kon2-16dot.orig/files/patch-doc_kon.1.in	1970-01-01 09:00:00.000000000 +0900
+++ kon2-16dot/files/patch-doc_kon.1.in	2013-01-18 11:22:22.000000000 +0900
@@ -0,0 +1,49 @@
+--- src/kon.1.in.orig	1996-09-05 09:13:47.000000000 +0900
++++ src/kon.1.in	2012-05-10 00:17:11.688553415 +0900
+@@ -11,6 +11,18 @@
+ .B -capability
+ value ...
+ ]
++.br
++.B kon
++[
++.B -s
++]
++[
++.B -e
++command argument ...
++]
++[
++.B -u
++]
+ .SH ¡Ú³µÍסÛ
+ \fIKON\fP ¤Ï \fILinux\fP, \fIFreeBSD\fP ¤Î¥³¥ó¥½¡¼¥ë²èÌ̾å¤Ç´Á»ú¤òɽ¼¨
+ ¤¹¤ë¤¿¤á¤Î¥×¥í¥°¥é¥à¤Ç¤¹¡£\fIKON\fP ¤Ç¤Ï¡¢
+@@ -36,6 +48,15 @@
+ 
+ ¤È¤¹¤ì¤Ð \fICursorInterval\fP ¤ÎÃͤò 10 ¤Ë¤·¤Æµ¯Æ°¤·¤Þ¤¹¡£
+ 
++.B -s
++¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ç»ÈÍѤ·¤Þ¤¹¡£
++
++.B -e
++¥³¥Þ¥ó¥É¤òµ¯Æ°¤¹¤ë¤È¤­¡¢»ÈÍѤ·¤Þ¤¹¡£¤³¤Î°ú¿ô°Ê¹ß¤Ï¡¢¥³¥Þ¥ó¥É̾¤È¤½¤Î°ú¿ô¤È
++¸«¤Ê¤µ¤ì¤Þ¤¹¡£
++
++.B -u
++TERM ´Ä¶­ÊÑ¿ô¤ò vt100 ¤ËÀßÄꤷ¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢vt100 ¤ËÀßÄꤷ¤Þ¤¹¡£
+ .PP
+ .SH ¡Ú´Ä¶­ÀßÄê¡Û
+ ɽ¼¨¤¹¤ë¥Ó¥Ç¥ª¥É¥é¥¤¥Ð¤ä¥Ñ¥ì¥Ã¥È¤Ê¤É¤Î´Ä¶­¤Ï \fIkon.cfg\fP ¥Õ¥¡¥¤¥ë¤ÇÀßÄꤹ¤ë
+@@ -267,9 +288,9 @@
+ .SH ¡Ú¥Õ¥¡¥¤¥ë¡Û
+ .if n .ta 2.5i
+ .if t .ta 1.8i
+-/usr/local/lib/kon.cfg	´Ä¶­ÀßÄê¥Õ¥¡¥¤¥ë
++%%PREFIX%%/etc/kon.cfg	´Ä¶­ÀßÄê¥Õ¥¡¥¤¥ë
+ .br
+-/usr/lib/font/*		¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë
++%%PREFIX%%/share/fonts/bdf/*		¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë
+ .SH ¡Ú´ØÏ¢¹àÌÜ¡Û
+ swkon(1), fld(1)
+ .SH ¡ÚÃí°Õ»ö¹à¡Û
diff -urN kon2-16dot.orig/files/patch-kon.cfg.FreeBSD kon2-16dot/files/patch-kon.cfg.FreeBSD
--- kon2-16dot.orig/files/patch-kon.cfg.FreeBSD	2012-05-10 04:28:24.000000000 +0900
+++ kon2-16dot/files/patch-kon.cfg.FreeBSD	1970-01-01 09:00:00.000000000 +0900
@@ -1,34 +0,0 @@
---- kon.cfg.FreeBSD.orig	1997-01-24 02:17:34.000000000 +0900
-+++ kon.cfg.FreeBSD	2012-05-10 00:14:28.042552343 +0900
-@@ -114,9 +114,12 @@
- 	63 63 63
- 
- # Startup command definition (usually font loading commands are specified)
--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
- minix:
- 	/usr/bin/fld.minix -n /usr/share/fonts/publicfont.ank
- 	/usr/bin/fld.minix -n /usr/share/fonts/publicfont.k14
-@@ -143,13 +146,13 @@
- # Mouse type definition.  Choose one of: Microsoft,
- # MouseSystems, BusMouse, MMSeries, Logitech, or None.
- Mouse:
--	None
-+	MouseSystems
- # Mouse baud rate
- MouseBaud:
- 	1200
- # Mouse device file name
- MouseDev:
--	/dev/mouse
-+	/dev/sysmouse
- 
- # Use hard scroll
- HardScroll:
diff -urN kon2-16dot.orig/files/patch-kon.cfg.FreeBSD.in kon2-16dot/files/patch-kon.cfg.FreeBSD.in
--- kon2-16dot.orig/files/patch-kon.cfg.FreeBSD.in	1970-01-01 09:00:00.000000000 +0900
+++ kon2-16dot/files/patch-kon.cfg.FreeBSD.in	2013-01-18 11:21:43.000000000 +0900
@@ -0,0 +1,34 @@
+--- kon.cfg.FreeBSD.in.orig	1997-01-24 02:17:34.000000000 +0900
++++ kon.cfg.FreeBSD.in	2012-05-10 00:14:28.042552343 +0900
+@@ -114,9 +114,12 @@
+ 	63 63 63
+ 
+ # Startup command definition (usually font loading commands are specified)
+-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
+ minix:
+ 	/usr/bin/fld.minix -n /usr/share/fonts/publicfont.ank
+ 	/usr/bin/fld.minix -n /usr/share/fonts/publicfont.k14
+@@ -143,13 +146,13 @@
+ # Mouse type definition.  Choose one of: Microsoft,
+ # MouseSystems, BusMouse, MMSeries, Logitech, or None.
+ Mouse:
+-	None
++	MouseSystems
+ # Mouse baud rate
+ MouseBaud:
+ 	1200
+ # Mouse device file name
+ MouseDev:
+-	/dev/mouse
++	/dev/sysmouse
+ 
+ # Use hard scroll
+ HardScroll:
	


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list