diff options
Diffstat (limited to 'japanese/nkf')
| -rw-r--r-- | japanese/nkf/Makefile | 6 | ||||
| -rw-r--r-- | japanese/nkf/distinfo | 6 | ||||
| -rw-r--r-- | japanese/nkf/files/patch-aa | 23 | ||||
| -rw-r--r-- | japanese/nkf/files/patch-nkf.c | 46 |
4 files changed, 19 insertions, 62 deletions
diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile index 93a4eca6036a..f117b79f7652 100644 --- a/japanese/nkf/Makefile +++ b/japanese/nkf/Makefile @@ -6,12 +6,12 @@ # PORTNAME= nkf -PORTVERSION= 2.0.9 -PORTREVISION= 20090221 +PORTVERSION= 2.1.0 +PORTREVISION= 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 diff --git a/japanese/nkf/distinfo b/japanese/nkf/distinfo index 84b4809d45ba..894b2b4edf8e 100644 --- a/japanese/nkf/distinfo +++ b/japanese/nkf/distinfo @@ -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 diff --git a/japanese/nkf/files/patch-aa b/japanese/nkf/files/patch-aa index 61bac49764a5..57996fe0b9b4 100644 --- a/japanese/nkf/files/patch-aa +++ b/japanese/nkf/files/patch-aa @@ -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 @@ +--- Makefile.orig 2009-11-17 09:33:04.000000000 +0900 ++++ Makefile 2010-02-15 22:45:33.396131542 +0900 +@@ -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 diff --git a/japanese/nkf/files/patch-nkf.c b/japanese/nkf/files/patch-nkf.c deleted file mode 100644 index 2b0c1215190a..000000000000 --- a/japanese/nkf/files/patch-nkf.c +++ /dev/null @@ -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 */ |