Date: Mon, 3 Jul 2006 17:10:13 +0900 (JST) From: Yoshisato YANAGISAWA <yanagisawa@csg.is.titech.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/99737: Failed to compile japanese/p5-nkf after an update of nkf 2.07. Message-ID: <200607030810.k638AD6e075722@frodo.csg.is.titech.ac.jp> Resent-Message-ID: <200607030810.k638AL0F058034@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99737
>Category: ports
>Synopsis: Failed to compile japanese/p5-nkf after an update of nkf 2.07.
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 03 08:10:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Yoshisato YANAGISAWA
>Release: FreeBSD 6.1-RELEASE-p1 i386
>Organization:
Tokyo Institute of Technology.
>Environment:
System: FreeBSD frodo.csg.is.titech.ac.jp 6.1-RELEASE-p1 FreeBSD 6.1-RELEASE-p1 #90: Fri Jun 2 20:33:54 JST 2006 yanagisawa@frodo.csg.is.titech.ac.jp:/usr/obj/usr/src/sys/FRODO i386
>Description:
Since japanese/p5-nkf is a slave port of japanese/nkf, japanese/p5-nkf
is very much depend on japanese/nkf.
Applying a patch for nkf.c and a perl module source fails after an
update for nkf 2.07. That is because nkf.c and a name of a directory
where perl module sources exist are changed.
>How-To-Repeat:
Just install japanese/p5-nkf.
>Fix:
A following patch will fix the problem. The patch correct the name
where perl module sources exist and remove a patch for nkf.c.
diff -ruN p5-nkf.bak/Makefile p5-nkf/Makefile
--- p5-nkf.bak/Makefile Mon Jul 3 16:37:46 2006
+++ p5-nkf/Makefile Mon Jul 3 16:38:31 2006
@@ -14,7 +14,7 @@
PLIST= ${.CURDIR}/pkg-plist
PERL_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//:S/./-/}/NKF.mod
+WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//:S/.//}/NKF.mod
PATCHDIR= ${.CURDIR}/files
MAN3= NKF.3
diff -ruN p5-nkf.bak/files/patch-nkf.c p5-nkf/files/patch-nkf.c
--- p5-nkf.bak/files/patch-nkf.c Mon Jul 3 16:37:46 2006
+++ p5-nkf/files/patch-nkf.c Thu Jan 1 09:00:00 1970
@@ -1,43 +0,0 @@
---- ../nkf.c.orig Mon Mar 27 21:46:58 2006
-+++ ../nkf.c Sun May 7 22:37:16 2006
-@@ -3323,9 +3323,9 @@
- void (*f)PROTO((int c2,int c1));
- int c;
- {
-+ int shift = 20;
- const char *hex = "0123456789ABCDEF";
- c &= 0x00FFFFFF;
-- int shift = 20;
- while(shift >= 0){
- if(c >= 1<<shift){
- while(shift >= 0){
-@@ -3417,6 +3417,7 @@
- c = unicode_subchar;
- (*oconv)((c>>8)&0xFF, c&0xFF);
- return;
-+#if 0
- int shift = 16;
- while(shift >= 0){
- if(c >= 1<<shift){
-@@ -3429,10 +3430,13 @@
- }
- }
- return;
-+#endif
- }
- #endif
-
- #ifdef UTF8_OUTPUT_ENABLE
-+extern const unsigned short *const x0212_to_utf8_2bytes[];
-+
- int
- e2w_conv(c2, c1)
- int c2, c1;
-@@ -3449,7 +3453,6 @@
- if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == 0x8F22 && c1 == 0x43){
- return 0xA6;
- }
-- extern const unsigned short *const x0212_to_utf8_2bytes[];
- c2 = (c2&0x7f) - 0x21;
- if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
- p = x0212_to_utf8_2bytes[c2];
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607030810.k638AD6e075722>