Index: inputmethod/ja-freewnn-lib/Makefile.common =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/inputmethod/ja-freewnn-lib/Makefile.common,v retrieving revision 1.15 diff -u -r1.15 Makefile.common --- inputmethod/ja-freewnn-lib/Makefile.common 15 Aug 2008 02:43:50 -0000 1.15 +++ inputmethod/ja-freewnn-lib/Makefile.common 13 Dec 2010 03:14:34 -0000 @@ -1,17 +1,8 @@ # $NetBSD: Makefile.common,v 1.15 2008/08/15 02:43:50 obache Exp $ # - -DISTNAME= FreeWnn-1.10 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/11067/} \ - ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/ - -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/11075/} \ - ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/ -PATCHFILES= patch-1.1.0-a01.gz -PATCH_DIST_STRIP= -p2 -DIST_SUBDIR= freewnn - -WRKSRC= ${WRKDIR}/Xsi +DISTNAME= FreeWnn-1.1.1-a021 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/17724/} +EXTRACT_SUFX= .tar.bz2 INSTALL_TARGET= install install.man .include "../../mk/bsd.prefs.mk" @@ -61,10 +52,10 @@ ${SED} -e 's|\(MANPATH = .*\)|\1/ja_JP.EUC|' \ $$file.orig2 > $$file; \ done - @(cd ${WRKSRC}/Wnn/include; \ - ${MV} config.h config.h.orig; \ - ${SED} -e 's|^\(\#define LIBDIR "\)/usr/local/lib\(/wnn"\)|\1${PREFIX}/share\2|' \ - config.h.orig > config.h) +# @(cd ${WRKSRC}/Wnn/include; \ +# ${MV} config.h config.h.orig; \ +# ${SED} -e 's|^\(\#define LIBDIR "\)/usr/local/lib\(/wnn"\)|\1${PREFIX}/share\2|' \ +# config.h.orig > config.h) .if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER") post-build: Index: inputmethod/ja-freewnn-lib/distinfo =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/inputmethod/ja-freewnn-lib/distinfo,v retrieving revision 1.10 diff -u -r1.10 distinfo --- inputmethod/ja-freewnn-lib/distinfo 11 Jul 2010 02:53:24 -0000 1.10 +++ inputmethod/ja-freewnn-lib/distinfo 26 Dec 2010 12:43:29 -0000 @@ -1,20 +1,10 @@ $NetBSD: distinfo,v 1.10 2010/07/11 02:53:24 obache Exp $ -SHA1 (freewnn/FreeWnn-1.10.tar.gz) = 66a0640d4632d82b7012c4aa2239bc1d69d45034 -RMD160 (freewnn/FreeWnn-1.10.tar.gz) = 8644371c258b1f32c36d5f0318032a0a50c5f640 -Size (freewnn/FreeWnn-1.10.tar.gz) = 3468613 bytes -SHA1 (freewnn/patch-1.1.0-a01.gz) = 7aafc2c23af6ba3c195d7b22f743f469adae09e8 -RMD160 (freewnn/patch-1.1.0-a01.gz) = 6807c7f86dbe99ee8027d7c4c5f49fc8557ce0ab -Size (freewnn/patch-1.1.0-a01.gz) = 5706 bytes -SHA1 (patch-aa) = eb37740879d43ab7000ebfd7786d0e75629e1d84 -SHA1 (patch-ab) = 8e5f51132c9f5ba5e05f03ae4b69920634ce7ad8 -SHA1 (patch-ac) = 7de643962ca2155d5bbe69e0684e235d5c61a15e -SHA1 (patch-ad) = b78a1c7c5358a2114fa99249b08a06274d03a187 -SHA1 (patch-ae) = e33833015936ce9c5ef65a97faf3f05f0c464ddc -SHA1 (patch-af) = 26d45af3c65df5af5299c837a123129ec5919bd4 -SHA1 (patch-ag) = 80614674772560336255ff731b7af456122124d2 -SHA1 (patch-ah) = 1795d35ffc0bdbc3d082c46afb86d616bef52d68 -SHA1 (patch-ai) = ecba683c308c4acf69f0e5835ee241dfbab5b71a -SHA1 (patch-aj) = 33420feacb29abd59882672dfeb254527aa99fe6 -SHA1 (patch-ak) = d85b3ebd34e583f935ae517f338d522d21ebb44b -SHA1 (patch-al) = bdfb622211d7fcc9d18ee33a545bec876664f3a4 +SHA1 (FreeWnn-1.1.1-a021.tar.bz2) = 52fe5102674a68385b88c7503ca7c5cc33dfa6b7 +RMD160 (FreeWnn-1.1.1-a021.tar.bz2) = 72d1b0233fd5f0253e9ff3cc42d087ed3c36da14 +Size (FreeWnn-1.1.1-a021.tar.bz2) = 3108905 bytes +SHA1 (patch-ad) = 7167a344555c7aa54c225c5b9008d07d948d1573 +SHA1 (patch-ae) = 0b730f53123c483306c30e49440d8769a9b477e2 +SHA1 (patch-ag) = 5acaed5c4635b900a40037695158a34b51ba7a70 +SHA1 (patch-ah) = f09d7336cf82d08ec4665e2c7f3d31b1adfda639 +SHA1 (patch-ai) = 906f276316cfc7c454b78ff9907cdcbec6a24b6f Index: inputmethod/ja-freewnn-lib/patches/patch-ad =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/inputmethod/ja-freewnn-lib/patches/patch-ad,v retrieving revision 1.5 diff -u -r1.5 patch-ad --- inputmethod/ja-freewnn-lib/patches/patch-ad 2 May 2006 08:00:08 -0000 1.5 +++ inputmethod/ja-freewnn-lib/patches/patch-ad 26 Dec 2010 11:44:55 -0000 @@ -1,23 +1,24 @@ -$NetBSD: patch-ad,v 1.5 2006/05/02 08:00:08 yyamano Exp $ +$NetBSD$ ---- configure.in.orig Tue Apr 6 12:12:19 1999 -+++ configure.in -@@ -54,12 +54,17 @@ - CPP=/lib/cpp - fi +--- configure.in.orig 2005-11-28 02:30:23.000000000 +0900 ++++ configure.in 2010-12-26 20:43:53.000000000 +0900 +@@ -309,6 +309,19 @@ + *-*-aix*) + CCOPTIONS="-DSYSV" ;; --"FreeBSD") -+"FreeBSD" | "OpenBSD") - CCOPTIONS="-DCSRG_BASED" - CDEBUGFLAGS="-O2 -fno-strength-reduce" - if test -x /usr/libexec/cpp; then - CPP=/usr/libexec/cpp - fi -+ ;; -+"NetBSD" | "DragonFly" | "Darwin") -+ CCOPTIONS="-DCSRG_BASED" -+ CDEBUGFLAGS="-O2 -fno-strength-reduce" -+ CPP=/usr/bin/cpp - ;; - "SunOS") - if test $CC = gcc; then ++ ;; ++*-*-freebsd*|*-*-openbsd*) ++ CCOPTIONS="-DCSRG_BASED" ++ CDEBUGFLAGS="-O2 -fno-strength-reduce" ++ if test -x /usr/libexec/cpp; then ++ CPP=/usr/libexec/cpp ++ fi ++ ;; ++*-*-netbsd*|*-*-dragonfly*) ++ CCOPTIONS="-DCSRG_BASED" ++ CDEBUGFLAGS="-O2 -fno-strength-reduce" ++ CPP=/usr/bin/cpp ++ ;; + *) + dnl AC_MSG_WARN("It is not reported if FreeWnn works on this system. But continuing...") + dnl AC_MSG_WARN([(It may or may not work if you set CCOPTIONS properly.)]) Index: inputmethod/ja-freewnn-lib/patches/patch-ae =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/inputmethod/ja-freewnn-lib/patches/patch-ae,v retrieving revision 1.5 diff -u -r1.5 patch-ae --- inputmethod/ja-freewnn-lib/patches/patch-ae 2 May 2006 08:00:08 -0000 1.5 +++ inputmethod/ja-freewnn-lib/patches/patch-ae 26 Dec 2010 11:44:46 -0000 @@ -1,23 +1,36 @@ -$NetBSD: patch-ae,v 1.5 2006/05/02 08:00:08 yyamano Exp $ +$NetBSD$ ---- configure.orig Tue Apr 6 12:12:18 1999 -+++ configure -@@ -704,12 +704,17 @@ - CPP=/lib/cpp - fi +--- configure.orig 2005-11-28 02:30:23.000000000 +0900 ++++ configure 2010-12-26 20:44:29.000000000 +0900 +@@ -2588,8 +2588,20 @@ + CCOPTIONS="-DBEOS -D_POSIX_SOURCE -D_BSD_SOURCE" + ;; + *-*-aix*) +- CCOPTIONS="-DSYSV" +- ;; ++ CCOPTIONS="-DSYSV" ++ ;; ++*-*-freebsd*|*-*-openbsd*) ++ CCOPTIONS="-DCSRG_BASED" ++ CDEBUGFLAGS="-O2 -fno-strength-reduce" ++ if test -x /usr/libexec/cpp; then ++ CPP=/usr/libexec/cpp ++ fi ++ ;; ++*-*-netbsd*|*-*-dragonfly*) ++ CCOPTIONS="-DCSRG_BASED" ++ CDEBUGFLAGS="-O2 -fno-strength-reduce" ++ CPP=/usr/bin/cpp ++ ;; + *) ;; --"FreeBSD") -+"FreeBSD" | "OpenBSD") - CCOPTIONS="-DCSRG_BASED" - CDEBUGFLAGS="-O2 -fno-strength-reduce" - if test -x /usr/libexec/cpp; then - CPP=/usr/libexec/cpp - fi -+ ;; -+"NetBSD" | "DragonFly" | "Darwin") -+ CCOPTIONS="-DCSRG_BASED" -+ CDEBUGFLAGS="-O2 -fno-strength-reduce" -+ CPP=/usr/bin/cpp - ;; - "SunOS") - if test $CC = gcc; then + esac +@@ -20086,6 +20098,8 @@ + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" + exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; + _ACEOF Index: inputmethod/ja-freewnn-lib/patches/patch-ag =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/inputmethod/ja-freewnn-lib/patches/patch-ag,v retrieving revision 1.6 diff -u -r1.6 patch-ag --- inputmethod/ja-freewnn-lib/patches/patch-ag 11 Jul 2010 02:53:25 -0000 1.6 +++ inputmethod/ja-freewnn-lib/patches/patch-ag 26 Dec 2010 11:28:46 -0000 @@ -1,57 +1,12 @@ -$NetBSD: patch-ag,v 1.6 2010/07/11 02:53:25 obache Exp $ +$NetBSD$ ---- Wnn/jlib/js.c.orig 1999-05-17 03:04:45.000000000 +0000 -+++ Wnn/jlib/js.c -@@ -70,9 +70,8 @@ extern Variables - */ - +--- Wnn/jlib/js.c~ 2005-04-11 00:26:37.000000000 +0900 ++++ Wnn/jlib/js.c 2010-12-26 20:26:44.000000000 +0900 +@@ -57,6 +57,7 @@ + #endif --extern char *malloc(); -- #include +#include #include - #ifdef UX386 - #include -@@ -85,7 +84,6 @@ extern char *malloc(); - #endif - #include #include --extern int errno; #include - #include "jd_sock.h" - #include "commonhd.h" -@@ -103,8 +101,6 @@ extern int errno; - #include "../etc/bdic.c" - #include "../etc/pwd.c" - --char *malloc(); -- - #ifdef SYSVR2 - #define bzero(adr,n) memset((adr),0,(n)) - #endif -@@ -220,11 +216,11 @@ register char *lang; - #endif - return -1; - } --#if !(defined(BSD) && (BSD >= 199306)) /* !4.4BSD-Lite */ -- if (connect(sd,(struct sockaddr *)&saddr,strlen(saddr.sun_path)+sizeof(saddr.sun_family)) == ERROR) { --#else /* 4.4BSD-Lite */ -+ -+#if !defined(SUN_LEN) -+# define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) -+#endif - if (connect(sd,(struct sockaddr *)&saddr,SUN_LEN(&saddr)) == ERROR) { --#endif /* 4.4BSD-Lite */ - - #if DEBUG - xerror("jslib:Can't connect socket.\n"); -@@ -2554,7 +2550,7 @@ char *lang; - int cnt; - { - FILE *fp; -- static char s[6][EXPAND_PATH_LENGTH]; -+ static char s[7][EXPAND_PATH_LENGTH]; - char serv_defs[EXPAND_PATH_LENGTH]; - char data[1024]; - int num; Index: inputmethod/ja-freewnn-lib/patches/patch-ah =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/inputmethod/ja-freewnn-lib/patches/patch-ah,v retrieving revision 1.2 diff -u -r1.2 patch-ah --- inputmethod/ja-freewnn-lib/patches/patch-ah 25 Aug 2002 19:22:58 -0000 1.2 +++ inputmethod/ja-freewnn-lib/patches/patch-ah 26 Dec 2010 10:35:38 -0000 @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.2 2002/08/25 19:22:58 jlam Exp $ +$NetBSD$ ---- Wnn/jd/Makefile.in.orig Tue Mar 23 21:11:01 1999 -+++ Wnn/jd/Makefile.in -@@ -624,7 +624,7 @@ +--- Wnn/jd/Makefile.in~ 2010-12-26 19:18:43.000000000 +0900 ++++ Wnn/jd/Makefile.in 2010-12-26 19:35:07.000000000 +0900 +@@ -36,7 +36,7 @@ SUBDIRS = rk rk.vi @@ -11,7 +11,7 @@ HINSILINKS = hinsi.data -@@ -767,6 +767,7 @@ +@@ -179,6 +179,7 @@ clean:: $(RM) cvt_key_tbl.vt @@ -19,9 +19,9 @@ install:: $(SERVERCDS) @if [ -d $(DESTDIR)$(JWNNWNNDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNWNNDIR)); fi -@@ -775,7 +776,9 @@ +@@ -187,7 +188,9 @@ for i in $(SERVERCDS); do \ - (set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$i $(DESTDIR)$(JWNNWNNDIR)); \ + (set -x; $(INSTALL) $(INSTDATFLAGS) $$i $(DESTDIR)$(JWNNWNNDIR)); \ done +.endif @@ -29,11 +29,11 @@ install:: $(CLIENTJDS1) @if [ -d $(DESTDIR)$(JWNNWNNDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNWNNDIR)); fi -@@ -811,6 +814,7 @@ - for i in $(LIBJDS2); do \ - (set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$i $(DESTDIR)$(WNNWNNDIR)); \ +@@ -196,6 +199,7 @@ + for i in $(CLIENTJDS1); do \ + (set -x; $(INSTALL) $(INSTDATFLAGS) $$i $(DESTDIR)$(JWNNWNNDIR)); \ done +.endif - depend:: - + install:: $(CLIENTJDS2) + @if [ -d $(DESTDIR)$(WNNWNNDIR) ]; then set +x; \ Index: inputmethod/ja-freewnn-lib/patches/patch-ai =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/inputmethod/ja-freewnn-lib/patches/patch-ai,v retrieving revision 1.1 diff -u -r1.1 patch-ai --- inputmethod/ja-freewnn-lib/patches/patch-ai 31 Dec 2005 00:51:27 -0000 1.1 +++ inputmethod/ja-freewnn-lib/patches/patch-ai 26 Dec 2010 10:23:57 -0000 @@ -1,13 +1,13 @@ -$NetBSD: patch-ai,v 1.1 2005/12/31 00:51:27 joerg Exp $ +$NetBSD$ ---- Xwnmo/xwnmo/do_socket.c.orig 2005-12-30 21:54:05.000000000 +0000 -+++ Xwnmo/xwnmo/do_socket.c -@@ -590,8 +590,6 @@ wait_for_socket() +--- Xwnmo/xwnmo/do_socket.c~ 2001-06-15 03:16:14.000000000 +0900 ++++ Xwnmo/xwnmo/do_socket.c 2010-12-26 19:21:47.000000000 +0900 +@@ -658,8 +658,6 @@ { - register int i; - int n, ret; -- extern int errno; -- extern int select(); + register int i; + int n, ret; +- extern int errno; +- extern int select (); - /* - * If recv_buf has some data, return with as cur_sock get data + /* + * If recv_buf has some data, return with as cur_sock get data Index: inputmethod/ja-freewnn-server-bin/Makefile =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/inputmethod/ja-freewnn-server-bin/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- inputmethod/ja-freewnn-server-bin/Makefile 11 Jul 2010 02:56:35 -0000 1.17 +++ inputmethod/ja-freewnn-server-bin/Makefile 26 Dec 2010 12:31:43 -0000 @@ -1,8 +1,8 @@ # $NetBSD: Makefile,v 1.17 2010/07/11 02:56:35 obache Exp $ # -PKGNAME= ja-FreeWnn-server-bin-1.10 -PKGREVISION= 6 +PKGNAME= ja-FreeWnn-server-bin-1.1.1-a021 + CATEGORIES= japanese inputmethod MAINTAINER= tech-pkg-ja@jp.NetBSD.org @@ -17,7 +17,6 @@ DISTINFO_FILE= ${.CURDIR}/../ja-freewnn-lib/distinfo PATCHDIR= ${.CURDIR}/../ja-freewnn-lib/patches - RCD_SCRIPTS= ja_freewnn .include "../../mk/bsd.prefs.mk"