From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 18 09:10:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9812298E for ; Fri, 18 Jan 2013 09:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 77AF883C for ; Fri, 18 Jan 2013 09:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0I9A1fN090168 for ; Fri, 18 Jan 2013 09:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0I9A1IU090167; Fri, 18 Jan 2013 09:10:01 GMT (envelope-from gnats) Resent-Date: Fri, 18 Jan 2013 09:10:01 GMT Resent-Message-Id: <201301180910.r0I9A1IU090167@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Tsurutani Naoki Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C4DF8761 for ; Fri, 18 Jan 2013 09:06:09 +0000 (UTC) (envelope-from turutani@scphys.kyoto-u.ac.jp) Received: from smtp-auth.kuins.kyoto-u.ac.jp (smtp-auth.kuins.kyoto-u.ac.jp [133.3.248.237]) by mx1.freebsd.org (Postfix) with ESMTP id 573917FE for ; Fri, 18 Jan 2013 09:06:08 +0000 (UTC) Received: from smtp-auth.kuins.kyoto-u.ac.jp (smtp-auth.kuins.kyoto-u.ac.jp [127.0.0.1]) by postfix.imss70 (Postfix) with ESMTP id 46FDD2EC003; Fri, 18 Jan 2013 17:47:50 +0900 (JST) Received: from h120.65.226.10.32118.vlan.kuins.net (p1099-ipngn100408kyoto.kyoto.ocn.ne.jp [153.185.47.99]) by smtp-auth.kuins.kyoto-u.ac.jp (Postfix) with ESMTP id 2F2992EC001; Fri, 18 Jan 2013 17:47:50 +0900 (JST) Received: from h120.65.226.10.32118.vlan.kuins.net (localhost [127.0.0.1]) by h120.65.226.10.32118.vlan.kuins.net (8.14.4/8.14.4/20071004-1) with ESMTP id r0I8lk1a051191; Fri, 18 Jan 2013 17:47:46 +0900 (JST) (envelope-from turutani@h120.65.226.10.32118.vlan.kuins.net) Received: (from turutani@localhost) by h120.65.226.10.32118.vlan.kuins.net (8.14.4/8.14.4/Submit) id r0I8lk0w051190; Fri, 18 Jan 2013 17:47:46 +0900 (JST) (envelope-from turutani) Message-Id: <201301180847.r0I8lk0w051190@h120.65.226.10.32118.vlan.kuins.net> Date: Fri, 18 Jan 2013 17:47:46 +0900 (JST) From: Tsurutani Naoki To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/175398: fix patches in japanese/kon2-16dot Cc: turutani@scphys.kyoto-u.ac.jp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Tsurutani Naoki List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 09:10:01 -0000 >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@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 -# +# Created by: Makoto Matsushita # $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: