From owner-ports-jp@jp.freebsd.org  Fri Sep  8 17:20:38 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id RAA73736;
	Fri, 8 Sep 2000 17:20:38 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from diana.infonets.hiroshima-u.ac.jp (diana.infonets.hiroshima-u.ac.jp [133.41.33.53])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id RAA73729
	for <ports-jp@jp.freebsd.org>; Fri, 8 Sep 2000 17:20:38 +0900 (JST)
	(envelope-from taoka@infonets.hiroshima-u.ac.jp)
Received: from peg.infonets.hiroshima-u.ac.jp (peg.infonets.hiroshima-u.ac.jp [133.41.33.64])
	by diana.infonets.hiroshima-u.ac.jp (8.9.3/3.7W) with ESMTP id RAA87051
	for <ports-jp@jp.freebsd.org>; Fri, 8 Sep 2000 17:19:30 +0900 (JST)
Received: from localhost (localhost.infonets.hiroshima-u.ac.jp [127.0.0.1]) by peg.infonets.hiroshima-u.ac.jp (8.9.3/3.6W) with ESMTP
	id RAA10808 for <ports-jp@jp.freebsd.org>; Fri, 8 Sep 2000 17:21:07 +0900 (JST)
To: ports-jp@jp.freebsd.org
From: TAOKA Satoshi <taoka@infonets.hiroshima-u.ac.jp>
In-Reply-To: <20000908164123B.taoka@infonets.hiroshima-u.ac.jp>
References: <20000908112430Z.taoka@infonets.hiroshima-u.ac.jp>
	<20000908150638Y.taoka@infonets.hiroshima-u.ac.jp>
	<20000908164123B.taoka@infonets.hiroshima-u.ac.jp>
X-Mailer: Mew version 1.94.2 on XEmacs 21.1 (Canyonlands)
X-Prom-Mew: Prom-Mew 1.93.4 (procmail reader for Mew)
X-URL: http://www.infonets.hiroshima-u.ac.jp/~taoka/
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000908172107Q.taoka@infonets.hiroshima-u.ac.jp>
Date: Fri, 08 Sep 2000 17:21:07 +0900
X-Dispatcher: imput version 20000228(IM140)
Lines: 178
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 10001
Subject: [ports-jp 10001] Re: Wnn6-lib v.s. FreeWnn && XEmacs (Re:
 FreeWnn-lib, FreeWnn-server)
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: taoka@infonets.hiroshima-u.ac.jp


$BED2,$G$9!#(B

> 
> Cc: $B2H1J$5$s!"$7$F$$$^$9(B

Cc: ienaga@jsys.co.jp $B$G=P$7$F$?$N$G$9$,!":#$O;H$o$l$F$J$$$h$&$G$9!#(B
$B$=$N8e!"(Bkazz@imasy.or.jp $B$K:FAw$7$^$7$?!#(B

$B7k6I!"(BWnn6-lib$B$NJQ99$K4X$9$k=$@5$OE:IU$N%Q%C%A$N$h$&$K$J$j$^$9!#(B
$B$3$l$K$O!"(BXEmacs$B$G!"(BWnn6-lib$B$b(Bshared lib$B$r;H$&$h$&$KJQ99!"$=$7$F(B
USE_AUTOCONF=	yes$B$r;H$&$h$&JQ99$7$F$"$j$^$9!#(B
$B6M;3$5$s!"J!Eg$5$s!"$h$m$7$$$G$9$+!#(B


$B$"$H!"(Bgj@FreeBSD.org$B$K$bO"Mm<h$i$J$$$H$$$1$J$$!#!#!#(B

Index: japanese/kinput2-freewnn/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/kinput2-freewnn/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- japanese/kinput2-freewnn/Makefile	2000/09/08 04:34:29	1.7
+++ japanese/kinput2-freewnn/Makefile	2000/09/08 08:12:20
@@ -48,7 +48,7 @@
 .elif defined(WNN6)
 INPUT_METHOD+=		wnn6
 LIB_INPUT_METHOD+=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
-KINPUT2_DEF+=		-DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn \
+KINPUT2_DEF+=		-DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn6/wnn \
 			-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt"
 .endif
 #
Index: editors/xemacs21/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/xemacs21/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- editors/xemacs21/Makefile	2000/08/09 17:45:08	1.51
+++ editors/xemacs21/Makefile	2000/09/08 08:12:29
@@ -31,7 +31,7 @@
 USE_XPM=	yes
 USE_GMAKE=	yes
 STRIP=
-HAS_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
 
 CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \
Index: editors/xemacs21/patches/patch-af
===================================================================
RCS file: /home/ncvs/ports/editors/xemacs21/patches/patch-af,v
retrieving revision 1.12
diff -u -r1.12 patch-af
--- editors/xemacs21/patches/patch-af	2000/08/09 17:45:18	1.12
+++ editors/xemacs21/patches/patch-af	2000/09/08 08:12:29
@@ -1,19 +1,53 @@
---- configure.orig	Fri Aug  4 11:49:54 2000
-+++ configure	Mon Aug  7 22:38:52 2000
-@@ -1042,6 +1042,7 @@
- 
+--- configure.in.orig	Fri Aug  4 11:49:59 2000
++++ configure.in	Fri Sep  8 16:12:55 2000
+@@ -1053,6 +1053,7 @@
+ dnl Straightforward OS determination
  case "$canonical" in
    *-*-linux*    ) opsys=linux ;;
 +  *-*-freebsd* ) opsys=freebsd ;;
    *-*-netbsd*   ) opsys=netbsd ;;
    *-*-openbsd*	) opsys=openbsd ;;
    *-*-nextstep* ) opsys=nextstep ;;
-@@ -11407,7 +11408,7 @@
+@@ -3052,21 +3053,24 @@
+     test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
+   fi
+   dnl Back to our regularly scheduled wnn hunting
+-  if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
+-    AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
+-      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
+-	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
+-	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
++  if test "$with_wnn6" = "yes"; then
++    AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
++      AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
++	AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
++  else
++    if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
++      AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
++	AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
++	  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
++	    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
++    fi
+   fi
+   test -z "$with_wnn" && with_wnn=yes
+   if test "$with_wnn" = "yes"; then
+     AC_DEFINE(HAVE_WNN)
+     XE_PREPEND(-l$libwnn, libs_x)
+     XE_ADD_OBJS(mule-wnnfns.o)
+-    if test "$with_wnn6" != "no"; then
+-      AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
+-      test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
+-    fi
++    test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
+   fi
+ 
+   dnl Autodetect canna
+@@ -3579,7 +3583,7 @@
+ dnl Check for Berkeley DB.
  if test "$with_database_berkdb" != "no"; then
-   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
- echo "configure:11410: checking for Berkeley db.h" >&5
+   AC_MSG_CHECKING(for Berkeley db.h)
 -  for path in "db/db.h" "db.h"; do
 +  for path in "/usr/include/db.h" "db/db.h" "db.h"; do
-     cat > conftest.$ac_ext <<EOF
- #line 11413 "configure"
- #include "confdefs.h"
+     AC_TRY_COMPILE([
+ #include <stdlib.h>
+ #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
Index: japanese/xemacs21-canna/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/xemacs21-canna/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- japanese/xemacs21-canna/Makefile	2000/09/08 04:34:52	1.15
+++ japanese/xemacs21-canna/Makefile	2000/09/08 08:12:29
@@ -31,27 +31,27 @@
 DESCR_TMPL=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/files/DESCR.tmpl
 .if defined(CANNA) && defined(FREEWNN)
 PKGNAMESUFFIX=		-canna+freewnn
-SITE_INCLUDES=		${LOCALBASE}/include/wnn
 WITH_INPUT_METHOD=	--with-canna --with-wnn --with-wnn6=no
 LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna \
 			wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and FreeWnn support
 .elif defined(CANNA) && defined(WNN6)
 PKGNAMESUFFIX=		-canna+wnn6
+SITE_INCLUDES=		${LOCALBASE}/include/wnn6
 WITH_INPUT_METHOD=	--with-canna --with-wnn6
-LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
-BUILD_INPUT_METHOD=	${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna \
+			wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
 COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support
 .elif defined(FREEWNN)
 PKGNAMESUFFIX=		-freewnn
-SITE_INCLUDES=		${LOCALBASE}/include/wnn
 WITH_INPUT_METHOD=	--with-wnn --with-canna=no --with-wnn6=no
 LIB_INPUT_METHOD=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and FreeWnn support
 .elif defined(WNN6)
 PKGNAMESUFFIX=		-wnn6
+SITE_INCLUDES=		${LOCALBASE}/include/wnn6
 WITH_INPUT_METHOD=	--with-wnn6 --with-canna=no
-BUILD_INPUT_METHOD=	${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
+LIB_INPUT_METHOD=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
 COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Wnn6 support
 .else
 PKGNAMESUFFIX=		-canna
Index: japanese/emacs20-dl-wnn6/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-dl-wnn6/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- japanese/emacs20-dl-wnn6/Makefile	2000/08/21 00:56:58	1.17
+++ japanese/emacs20-dl-wnn6/Makefile	2000/09/08 08:12:32
@@ -22,7 +22,7 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wnn6 \
-		--with-wnn-includes=${PREFIX}/include/wnn \
+		--with-wnn-includes=${PREFIX}/include/wnn6/wnn \
 		--with-wnn-libraries=${PREFIX}/lib \
 		--with-emacs-src=${EMACSDL_SRCDIR}
 CONFIGURE_ENV=	EMACS=${PREFIX}/bin/emacs-dl-${EMACS_VER}


