Date: Mon, 10 Dec 2007 03:28:10 GMT From: Yoshihiro Ota <ota@j.email.ne.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/118526: [patch] unbroke japanese/onew-freewnn Message-ID: <200712100328.lBA3SAvn033898@www.freebsd.org> Resent-Message-ID: <200712100330.lBA3U1ai057260@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118526
>Category: ports
>Synopsis: [patch] unbroke japanese/onew-freewnn
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 10 03:30:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Yoshihiro Ota
>Release: 7.0-BETA4
>Organization:
>Environment:
% uname -a
FreeBSD example.com 7.0-BETA4 FreeBSD 7.0-BETA4 #362: Sun Dec 9 21:18:28 EST 2007 root@example.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Some ports doesn't compile due to gcc 4.2 upgrade.
There are some ports include from japanese/onew-freewnn.
>How-To-Repeat:
cd /usr/ports/japanese/onew-freewnn && make
>Fix:
Patch is attached.
The patch adds PORTSREVISION to the Makefile and creates a patch file under files.
Patch attached with submission follows:
diff -urN onew-freewnn.orig/Makefile onew-freewnn/Makefile
--- onew-freewnn.orig/Makefile 2007-11-07 22:18:15.000000000 -0500
+++ onew-freewnn/Makefile 2007-11-07 22:18:27.000000000 -0500
@@ -61,10 +61,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 700042
-BROKEN= Broken with gcc 4.2
-.endif
-
post-patch:
${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \
-e 's,%X11BASE%,${X11BASE},g' \
diff -urN onew-freewnn.orig/files/patch-gcc42 onew-freewnn/files/patch-gcc42
--- onew-freewnn.orig/files/patch-gcc42 1969-12-31 19:00:00.000000000 -0500
+++ onew-freewnn/files/patch-gcc42 2007-11-14 11:12:02.000000000 -0500
@@ -0,0 +1,50 @@
+--- engine.orig/Canna.c 1995-06-28 11:13:26.000000000 -0500
++++ engine/Canna.c 2007-11-12 21:30:29.000000000 -0500
+@@ -33,6 +33,7 @@
+ static int ready;
+ static int CID;
+ static int nbunsetsu;
++static disp_kanji_buf();
+ int ONEW_CannarcDone;
+
+ static ONEWkanakan_ready()
+@@ -102,7 +103,6 @@
+ int comch;
+ int rcode;
+ char yomibuf[1024];
+- static disp_kanji_buf();
+
+ Onew_setupYomistr(startch,yomi,yomibuf);
+ yomi = yomibuf;
+--- onewlib.c.orig 1995-07-02 02:55:41.000000000 -0500
++++ onewlib.c 2007-11-12 21:28:01.000000000 -0500
+@@ -50,6 +50,11 @@
+ int ONEW_I_SYNC_CHAR = 0xFF;
+ int ONEW_KK_OPDICT = 'x';
+
++static definedKanamode();
++static romkan_modesw();
++static thru_char1();
++static Onew_kakuteiInRomkan();
++
+ #define MODE_SWITCHER ONEW_MODE_SWITCHER
+ #define ZENKAKU_TOGGLE ONEW_ZENKAKU_TOGGLE
+ #define KANA_TOGGLE ONEW_KANA_TOGGLE
+@@ -116,9 +121,6 @@
+ }
+ ONEW_getch1(){
+ int ch;
+- static definedKanamode();
+- static romkan_modesw();
+- static thru_char1();
+
+ for(;;){
+ ch = ONEW_getch0(ONEW_getch_asis);
+@@ -313,7 +315,6 @@
+
+ kget_char1(){
+ unsigned int kc;
+- static Onew_kakuteiInRomkan();
+
+ if( !Onew_RK_init() ){
+ kc = OnewGetchar();
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712100328.lBA3SAvn033898>