Date: Sat, 30 Jan 2010 18:29:59 +0900 (JST) From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: turutani@scphys.kyoto-u.ac.jp Subject: ports/143364: update japanese/nkf Message-ID: <201001300929.o0U9Tx1P006630@h120.65.226.10.32118.vlan.kuins.net> Resent-Message-ID: <201001300940.o0U9e2VN088098@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143364
>Category: ports
>Synopsis: update japanese/nkf
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 30 09:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Tsurutani Naoki
>Release: FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 7.2-STABLE FreeBSD 7.2-STABLE #21: Thu Jan 21 09:16:25 JST 2010 turutani@h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386
>Description:
nkf-2.1.0 is available.
>How-To-Repeat:
>Fix:
here is a patch to ports tree:
--- Makefile.orig 2009-05-01 06:53:45.000000000 +0900
+++ Makefile 2010-01-30 18:13:51.000000000 +0900
@@ -6,12 +6,11 @@
#
PORTNAME= nkf
-PORTVERSION= 2.0.9
-PORTREVISION= 20090221
+PORTVERSION= 2.1.0
PORTEPOCH= 1
CATEGORIES?= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/37177
+MASTER_SITE_SUBDIR= ${PORTNAME}/44486
PKGNAMEPREFIX?= ja-
MAINTAINER= nork@FreeBSD.org
--- distinfo.orig 2009-04-14 18:40:19.000000000 +0900
+++ distinfo 2010-01-30 18:14:48.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (nkf-2.0.9.tar.gz) = 0dadcf178785c87874822a2ff8da9f19
-SHA256 (nkf-2.0.9.tar.gz) = 3b2a972437e425c2c1e2786f20d74deaaf06bb7386eaa2925dfd5a772198f81f
-SIZE (nkf-2.0.9.tar.gz) = 157686
+MD5 (nkf-2.1.0.tar.gz) = 1d3fd56ccd2f60768e59dde44ccf095c
+SHA256 (nkf-2.1.0.tar.gz) = a6e59bf0ebb9a1dbb3e9fc62302d0b19aefc6f5ccee0321b33fb47483ce636e8
+SIZE (nkf-2.1.0.tar.gz) = 156716
--- files/patch-aa.orig 2009-04-14 18:40:19.000000000 +0900
+++ files/patch-aa 2010-01-30 18:25:28.000000000 +0900
@@ -1,10 +1,10 @@
--- Makefile.orig 2009-01-20 18:49:31.000000000 +0900
+++ Makefile 2009-04-12 22:30:54.667420352 +0900
-@@ -1,15 +1,19 @@
+@@ -1,18 +1,22 @@
-CC = cc
--CFLAGS = -O -Wall -pedantic
+-CFLAGS = -g -O2 -Wall -pedantic
+CC?= cc
-+CFLAGS?= -O -Wall -pedantic
++CFLAGS?= -g -O2 -Wall -pedantic
# CFLAGS = -O3
SHAR = shar
# SHAR = shar -T
@@ -12,23 +12,26 @@
-RM = rm -rf
+PERL?= perl
+RM?= rm -rf
- VERSION = 2.0.9
+ VERSION = 2.1.0
+ MKDIR = mkdir
-prefix = /usr/local
+PREFIX?= /usr/local
+INSTALL?= /usr/bin/install
+BSD_INSTALL_PROGRAM?= ${INSTALL} -s -o root -g wheel -m 555
+BSD_INSTALL_MAN?= ${INSTALL} -o root -g wheel -m 444
+ .PHONY: clean install test tar shar
+
nkf : nkf.o utf8tbl.o
$(CC) $(CFLAGS) -o nkf nkf.o utf8tbl.o
+ ./nkf -e nkf.1j > nkf.1j.euc
nkf.o : nkf.c nkf.h utf8tbl.h config.h
$(CC) $(CFLAGS) -c nkf.c
-@@ -31,9 +35,9 @@
- make test )
-
- install:
+@@ -39,9 +43,9 @@
+ -$(MKDIR) $(prefix)/man/man1
+ -$(MKDIR) $(prefix)/man/ja
+ -$(MKDIR) $(prefix)/man/ja/man1
- cp nkf $(prefix)/bin/
- cp nkf.1 $(prefix)/man/man1/
- cp nkf.1j $(prefix)/man/ja/man1/nkf.1
--- files/patch-nkf.c.orig 2009-04-27 22:50:06.000000000 +0900
+++ files/patch-nkf.c 2010-01-30 18:11:51.000000000 +0900
@@ -1,46 +0,0 @@
---- nkf.c.orig 2009-01-20 18:49:31.000000000 +0900
-+++ nkf.c 2009-04-27 22:44:46.124911367 +0900
-@@ -21,7 +21,7 @@
- * 3. This notice may not be removed or altered from any source distribution.
- */
- #define NKF_VERSION "2.0.9"
--#define NKF_RELEASE_DATE "2009-01-20"
-+#define NKF_RELEASE_DATE "2009-02-21"
- #define COPY_RIGHT \
- "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
- "Copyright (C) 1996-2009, The nkf Project."
-@@ -468,6 +468,8 @@
- {"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0},
- #ifdef UTF8_INPUT_ENABLE
- {"UTF-8", 0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0},
-+ {"UTF-16", 0, 0, 0, {0, 0, 0}, NULL, w_iconv16, 0},
-+ {"UTF-32", 0, 0, 0, {0, 0, 0}, NULL, w_iconv32, 0},
- #endif
- {0}
- };
-@@ -1426,6 +1428,7 @@
- output_endian = ENDIAN_LITTLE;
- output_bom_f = TRUE;
- break;
-+ case UTF_32:
- case UTF_32BE_BOM:
- output_bom_f = TRUE;
- break;
-@@ -6159,9 +6162,6 @@
- output_endian = ENDIAN_LITTLE;
- } else if (cp[0] == 'B') {
- cp++;
-- } else {
-- output_encoding = nkf_enc_from_index(enc_idx);
-- continue;
- }
- if (cp[0] == '0'){
- cp++;
-@@ -6232,6 +6232,7 @@
- while ('0'<= *cp && *cp <='9') {
- alpha_f |= 1 << (*cp++ - '0');
- }
-+ if (alpha_f & ((1 << 2) | (1 << 3))) alpha_f |= 1;
- if (!alpha_f) alpha_f = 1;
- continue;
- case 'x': /* Convert X0201 kana to X0208 or X0201 Conversion */
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001300929.o0U9Tx1P006630>