[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: canna-lib (pkg/16150)



多分これで直ったと思います。
手元では Kinput2 で入力できるところまで確認しました。
(昨日は確認の前に寝てしまいました。)

上林
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	canna-lib
#	canna-lib/Makefile
#	canna-lib/DESCR
#	canna-lib/distinfo
#	canna-lib/PLIST
#	canna-lib/files
#	canna-lib/files/canna
#	canna-lib/patches
#	canna-lib/patches/patch-af
#	canna-lib/patches/patch-aa
#	canna-lib/patches/patch-ab
#	canna-lib/patches/patch-ac
#	canna-lib/patches/patch-ad
#	canna-lib/patches/patch-ae
#
echo c - canna-lib
mkdir -p canna-lib > /dev/null 2>&1
echo x - canna-lib/Makefile
sed 's/^X//' >canna-lib/Makefile << 'END-of-canna-lib/Makefile'
X# $NetBSD: Makefile,v 1.8 2002/04/02 16:29:22 uebayasi Exp $
X#
X
XDISTNAME=	Canna35b2
XPKGNAME=	Canna-lib-3.5b2
XPKGREVISION=	1
XCATEGORIES=	japanese
XMASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
X
XPATCH_SITES=	http://www.jaist.ac.jp/~fujieda/canna/
XPATCHFILES=	Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \
X		Canna35b2-hack1.patch.gz
XPATCH_DIST_STRIP=	-p1
X
XMAINTAINER=	tech-pkg-ja@jp.netbsd.org
XHOMEPAGE=	http://www.nec.co.jp/japanese/product/computer/soft/canna/
XCOMMENT=	Kana-Kanji conversion system (library)
X
XINSTALL_TARGET=	install install.man
X
XUSE_IMAKE=	# defined
XBUILD_DEFS+=	USE_INET6
X
X.include "../../mk/bsd.prefs.mk"
X.if 0	# ${USE_INET6} == "YES"
XINET6=		-DINET6
X.else
XINET6=		# empty
X.endif
XCANNAOWNER?=    daemon
XCANNAGROUP?=    daemon
XDICT_DIR?=	${DISTDIR}/var/dict
XMAKE_ENV+=      CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
X		DICT_DIR=${DICT_DIR} INET6=${INET6}
XPLIST_SUBST=	CANNAOWNER=${CANNAOWNER}	\
X		CANNAGROUP=${CANNAGROUP}	\
X		DICT_DIR=${DICT_DIR}		\
X		PREFIX=${PREFIX}
X
Xpost-patch:
X	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
X	@${SED}	-e 's|\(SUBDIRS = lib canna\).*\( misc\)|\1 cmd/forcpp cmd/kpdic dic/phono\2|' \
X		-e 's|\(SGSDIR = \).*|\1 lib canna dic/phono misc doc|'	\
X		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
X.for f in forcpp kpdic
X	@${MV} ${WRKSRC}/cmd/${f}/Imakefile ${WRKSRC}/cmd/${f}/Imakefile.orig
X	@${SED} -e '/InstallProgram/d' ${WRKSRC}/cmd/${f}/Imakefile.orig \
X		> ${WRKSRC}/cmd/${f}/Imakefile
X.endfor
X
X# We need to pass ${MAKE_ENV} to ${XMKMF}
Xdo-configure:
X	@cd ${WRKSRC} && \
X	    ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${MAKE_ENV} ${XMKMF}
X
Xpost-configure:
X	@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
X
Xpost-install:
X	@${LN} -s ${DICT_DIR}/canna ${PREFIX}/share/canna/dic
X	@${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${DICT_DIR}/canna
X
X.include "../../mk/bsd.pkg.mk"
END-of-canna-lib/Makefile
echo x - canna-lib/DESCR
sed 's/^X//' >canna-lib/DESCR << 'END-of-canna-lib/DESCR'
XCanna is a Kana-Kanji conversion server.
XSupport Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
Xcannum front end and some others.
X
X  To use from Mule (CANNA version), in .emacs file:
X
X     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
X        (progn
X         (load-library "canna")
X         (canna) ))
X
X  Then kana-kanji conversion begin to `C-o' key. Show more detail
XInfo, and/or documents.
END-of-canna-lib/DESCR
echo x - canna-lib/distinfo
sed 's/^X//' >canna-lib/distinfo << 'END-of-canna-lib/distinfo'
X$NetBSD: distinfo,v 1.3 2002/04/02 16:29:23 uebayasi Exp $
X
XSHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2
XSize (Canna35b2.tar.gz) = 1333329 bytes
XSHA1 (Canna35b2-unoff1.patch.gz) = 19579591190f7ace7d3ec5f61a7d01ca3bc576c1
XSize (Canna35b2-unoff1.patch.gz) = 21443 bytes
XSHA1 (Canna35b2-unoff2.patch.gz) = 16d578ed0558a632832194fffad8fcf24c9181fb
XSize (Canna35b2-unoff2.patch.gz) = 11375 bytes
XSHA1 (Canna35b2-hack1.patch.gz) = 24ab2baf104ef9748f92bd5315d4100a7ee961ab
XSize (Canna35b2-hack1.patch.gz) = 8384 bytes
XSHA1 (patch-aa) = d74119cb2c37a3db1c5d5417c1e35362b1eac655
XSHA1 (patch-ab) = b224a611de298a1c029350e1f734571f7bf657d1
XSHA1 (patch-ac) = 8f910e59d71ef09434a40abde698d730ed7fc1c5
XSHA1 (patch-ad) = dd2eb94e75dc4789e298aa1601280d32fbe5ec96
XSHA1 (patch-ae) = e44c60ddf1e042ab5df1457b6723071c38baae02
XSHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10
END-of-canna-lib/distinfo
echo x - canna-lib/PLIST
sed 's/^X//' >canna-lib/PLIST << 'END-of-canna-lib/PLIST'
X@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:45 skrll Exp $
X@cwd ${DICT_DIR}
X@cwd ${DICT_DIR}
Xcanna/default.cbp
Xcanna/english.cbp
Xcanna/jdaemon.cbp
Xcanna/just.cbp
Xcanna/kaisoku.cbp
Xcanna/kana.cbp
Xcanna/lan5.cbp
Xcanna/matsu.cbp
Xcanna/newjis.cbp
Xcanna/romaji.cbp
Xcanna/sokuon.cbp
Xcanna/tut.cbp
Xcanna/vje.cbp
Xcanna/wx2+.cbp
X@cwd ${PREFIX}
Xinclude/canna/RK.h
Xinclude/canna/jrkanji.h
Xinclude/canna/keydef.h
Xinclude/canna/mfdef.h
Xlib/libRKC.a
Xlib/libRKC.so
Xlib/libRKC.so.1
Xlib/libRKC.so.1.0
Xlib/libRKC16.a
Xlib/libRKC16.so
Xlib/libRKC16.so.1
Xlib/libRKC16.so.1.0
Xlib/libcanna.a
Xlib/libcanna.so
Xlib/libcanna.so.1
Xlib/libcanna.so.1.0
Xlib/libcanna16.a
Xlib/libcanna16.so
Xlib/libcanna16.so.1
Xlib/libcanna16.so.1.0
Xman/ja_JP.EUC/man3/RkCloseRoma.3
Xman/ja_JP.EUC/man3/RkCvtEuc.3
Xman/ja_JP.EUC/man3/RkCvtHan.3
Xman/ja_JP.EUC/man3/RkCvtHira.3
Xman/ja_JP.EUC/man3/RkCvtKana.3
Xman/ja_JP.EUC/man3/RkCvtRoma.3
Xman/ja_JP.EUC/man3/RkCvtZen.3
Xman/ja_JP.EUC/man3/RkDefineDic.3
Xman/ja_JP.EUC/man3/RkDeleteDic.3
Xman/ja_JP.EUC/man3/RkEndBun.3
Xman/ja_JP.EUC/man3/RkEnlarge.3
Xman/ja_JP.EUC/man3/RkFinalize.3
Xman/ja_JP.EUC/man3/RkGetDicList.3
Xman/ja_JP.EUC/man3/RkGetKanji.3
Xman/ja_JP.EUC/man3/RkGetLex.3
Xman/ja_JP.EUC/man3/RkGetStat.3
Xman/ja_JP.EUC/man3/RkGetYomi.3
Xman/ja_JP.EUC/man3/RkGoto.3
Xman/ja_JP.EUC/man3/RkInitialize.3
Xman/ja_JP.EUC/man3/RkIntro.3
Xman/ja_JP.EUC/man3/RkLeft.3
Xman/ja_JP.EUC/man3/RkMapPhonogram.3
Xman/ja_JP.EUC/man3/RkMapRoma.3
Xman/ja_JP.EUC/man3/RkMountD.3
Xman/ja_JP.EUC/man3/RkNext.3
Xman/ja_JP.EUC/man3/RkNfer.3
Xman/ja_JP.EUC/man3/RkOpenRoma.3
Xman/ja_JP.EUC/man3/RkPrev.3
Xman/ja_JP.EUC/man3/RkRemountDic.3
Xman/ja_JP.EUC/man3/RkResize.3
Xman/ja_JP.EUC/man3/RkRgnBun.3
Xman/ja_JP.EUC/man3/RkRight.3
Xman/ja_JP.EUC/man3/RkShorten.3
Xman/ja_JP.EUC/man3/RkStoreYomi.3
Xman/ja_JP.EUC/man3/RkUnmountDic.3
Xman/ja_JP.EUC/man3/RkXfer.3
Xman/ja_JP.EUC/man3/XKanjiControl.3
Xman/ja_JP.EUC/man3/XLookupKanjiString.3
Xman/ja_JP.EUC/man3/cannalib.3
Xman/ja_JP.EUC/man3/jrKanjiControl.3
Xman/ja_JP.EUC/man3/jrKanjiString.3
Xman/ja_JP.EUC/man3/uilib.3
Xshare/canna/default.canna
Xshare/canna/engine.cf
Xshare/canna/sample/1.1.canna
Xshare/canna/sample/1.2.canna
Xshare/canna/sample/default.canna
Xshare/canna/sample/fixer.canna
Xshare/canna/sample/jdemon.canna
Xshare/canna/sample/just.canna
Xshare/canna/sample/lan5.canna
Xshare/canna/sample/matsu.canna
Xshare/canna/sample/modes.canna
Xshare/canna/sample/sample.canna
Xshare/canna/sample/skk.canna
Xshare/canna/sample/src/Makefile
Xshare/canna/sample/src/is.c
Xshare/canna/sample/src/default.ctd
Xshare/canna/sample/src/english.ctd
Xshare/canna/sample/src/jdaemon.ctd
Xshare/canna/sample/src/just.ctd
Xshare/canna/sample/src/kaisoku.ctd
Xshare/canna/sample/src/kana.ctd
Xshare/canna/sample/src/lan5.ctd
Xshare/canna/sample/src/matsu.ctd
Xshare/canna/sample/src/newjis.ctd
Xshare/canna/sample/src/romaji.ctd
Xshare/canna/sample/src/sokuon.ctd
Xshare/canna/sample/src/tut.ctd
Xshare/canna/sample/src/vje.ctd
Xshare/canna/sample/src/wx2+.ctd
Xshare/canna/sample/tut.canna
Xshare/canna/sample/unix.canna
Xshare/canna/sample/vje.canna
Xshare/canna/sample/wx2+.canna
X@exec ln -s ${DICT_DIR}/canna ${PREFIX}/share/canna/dic
X@exec ${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${DICT_DIR}/canna
X@unexec ${RM} ${PREFIX}/share/canna/dic
X@dirrm share/canna/sample/src
X@dirrm share/canna/sample
X@dirrm share/canna
X@dirrm include/canna
X@unexec ${RMDIR} ${DICT_DIR}/canna
END-of-canna-lib/PLIST
echo c - canna-lib/files
mkdir -p canna-lib/files > /dev/null 2>&1
echo x - canna-lib/files/canna
sed 's/^X//' >canna-lib/files/canna << 'END-of-canna-lib/files/canna'
X#! /bin/sh
X#
X# $NetBSD: canna,v 1.1 2001/03/16 18:16:38 wiz Exp $
X#
X# PROVIDE: canna
X# REQUIRE: DAEMON
X
Xname="canna"
Xcommand_start="@PREFIX@/sbin/cannaserver"
Xpidfile=""
X
Xcmd=${1:-start}
X
Xcase ${cmd} in
Xstart)
X    if [ -x ${command_start} ]; then
X        echo "Starting ${name}."
X        ${command_start} >/dev/null 2>&1
X    fi
X    ;;
X*)
X    :
X    ;;
Xesac
Xexit 0
END-of-canna-lib/files/canna
echo c - canna-lib/patches
mkdir -p canna-lib/patches > /dev/null 2>&1
echo x - canna-lib/patches/patch-af
sed 's/^X//' >canna-lib/patches/patch-af << 'END-of-canna-lib/patches/patch-af'
X$NetBSD$
X
X--- lib/RKC/convert.c.orig	Wed May 22 22:02:57 1996
X+++ lib/RKC/convert.c
X@@ -32,7 +32,7 @@
X #ifndef WIN
X #include "sglobal.h"
X #endif
X-#include "IRproto.h"
X+#include "../server/IRproto.h"
X 
X #include <errno.h>
X #include <sys/types.h>
END-of-canna-lib/patches/patch-af
echo x - canna-lib/patches/patch-aa
sed 's/^X//' >canna-lib/patches/patch-aa << 'END-of-canna-lib/patches/patch-aa'
X$NetBSD: patch-aa,v 1.4 2000/11/30 15:48:10 itojun Exp $
X
X--- Canna.conf-	Fri Dec  1 00:31:14 2000
X+++ Canna.conf	Fri Dec  1 00:31:36 2000
X@@ -130,10 +130,14 @@
X 
X-cannaBinDir = /usr/local/canna/bin
X-cannaSrvDir = /usr/local/canna/bin
X-cannaLibDir = /usr/local/canna/lib
X-cannaManDir = /usr/local/canna/man
X-cannaIncDir = /usr/local/canna/include/canna
X-libCannaDir = /usr/lib
X-
X-ErrDir  = /usr/spool/canna
X+cannaBinDir = ${PREFIX}/bin
X+cannaSrvDir = ${PREFIX}/sbin
X+cannaLibDir = ${PREFIX}/share/canna
X+cannaManDir = ${PREFIX}/man/ja_JP.EUC
X+cannaIncDir = ${PREFIX}/include/canna
X+libCannaDir = ${PREFIX}/lib
X+
X+ErrDir  = ${CANNA_SPOOL}
X+
X+/* INET6 related stuff */
X+INET6_DEFS = ${INET6}
X+INET6_LIBS = #-L/usr/local/v6/lib -linet6
X 
X@@ -141,6 +145,6 @@
X Wlib =
X-JapaneseLocale = japanese
X+JapaneseLocale = ja_JP.eucJP
X 
X-cannaOwner = bin
X-cannaGroup = bin
X+cannaOwner = ${CANNAOWNER}
X+cannaGroup = ${CANNAGROUP}
X 
X@@ -150,3 +154,3 @@
X 
X-cannaDsoRev = 1
X+cannaDsoRev = 1.0
X     /* SunOS 4.x をお使いの方で shared object を利用する場合には
X@@ -203,6 +207,5 @@
X  */
X-/* #define UseInstalledLibCanna YES */
X-#define UseInstalledLibCanna NO
X+#define UseInstalledLibCanna YES
X 
X-DicDir   = $(cannaLibDir)/dic
X+DicDir   = ${DICT_DIR}/canna
X 
X@@ -241,14 +244,14 @@
X # endif
X-       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
X+       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
X #else /* ! UseInstalledLibCanna */
X # if DoSharedLib
X-    DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension)
X+    DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension)
X # else
X #ifdef __EMX__
X-    DEPCANNALIB = $(CANNASRC)/canna.a
X+    DEPCANNALIB = $(libCannaDir)/canna.a
X #else
X-    DEPCANNALIB = $(CANNASRC)/libcanna.a
X+    DEPCANNALIB = $(libCannaDir)/libcanna.a
X #endif
X # endif
X-       CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
X+       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
X #endif /* UseInstalledLibCanna */
X@@ -261,10 +264,10 @@
X # endif
X-       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
X+       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
X #else /* ! UseInstalledLibCanna */
X # if DoSharedLib
X-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension)
X+    DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension)
X # else
X-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
X+    DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
X # endif
X-       CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
X+       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
X #endif /* UseInstalledLibCanna */
END-of-canna-lib/patches/patch-aa
echo x - canna-lib/patches/patch-ab
sed 's/^X//' >canna-lib/patches/patch-ab << 'END-of-canna-lib/patches/patch-ab'
X$NetBSD: patch-ab,v 1.2 2002/04/02 16:29:23 uebayasi Exp $
X
X--- Imakefile.orig	Wed Apr  3 01:19:05 2002
X+++ Imakefile
X@@ -4,7 +4,7 @@
X #define IHaveSubdirs
X #define PassCDebugFlags
X       WORLDOPTS = -k
X-        SUBDIRS = lib canna server cmd dic misc doc
X+        SUBDIRS = lib canna cmd/forcpp cmd/kpdic dic/phono misc doc
X         INCLUDE = ./include/canna
X AllTarget(cannaconf.h)
X MakeSubdirs($(SUBDIRS))
X@@ -22,7 +22,7 @@
X CANNAROOT = .
X SERVERDIR = server dic/phono dic/ideo
X CLIENTDIR = cmd dic/phono misc
X-SGSDIR = canna lib
X+SGSDIR =  lib canna dic/phono misc doc
X 
X install:: mkbindir mklibdir mkdicdir mkerrdir
X instserver:: mkdicdir mkerrdir
X@@ -39,7 +39,15 @@
X MakeDirectoriesLong(mkerrdir, $(ErrDir), $(cannaOwner), $(cannaGroup))
X #endif
X 
X-LinkFileList(includes,cannaconf.h,$(CANNAROOT)/include,..)
X+/* XXX The definition of LinkFileList macro changes in XFree86 4.2.0,
X+       which leads a ciritical compilation error.  So we expand the macro
X+       with the prior definition. */
X+/* LinkFileList(includes,cannaconf.h,$(CANNAROOT)/include,..) */
X+includes:: cannaconf.h
X+	@for flag in ${MAKEFLAGS} ''; do \
X+	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
X+	echo "  cd" $(CANNAROOT)/include; cd $(CANNAROOT)/include && \
X+	for i in cannaconf.h; do (set -x; $(RM) $$i; $(LN) ../$$i .); done
X 
X canna:: 
X 	@echo ""
END-of-canna-lib/patches/patch-ab
echo x - canna-lib/patches/patch-ac
sed 's/^X//' >canna-lib/patches/patch-ac << 'END-of-canna-lib/patches/patch-ac'
X$NetBSD: patch-ac,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
X
X--- dic/phono/Imakefile.orig	Wed Nov 27 16:15:14 1996
X+++ dic/phono/Imakefile	Fri Jul 30 19:57:02 1999
X@@ -27,7 +27,7 @@
X 
X        ROMAJI_DIC_DEF = -DSHIFT
X 
X-               DICDIR = $(cannaLibDir)/dic
X+               DICDIR = $(DicDir)
X             SAMPLEDIR = $(cannaLibDir)/sample
X          SAMPLESRCDIR = $(cannaLibDir)/sample/src
X 
END-of-canna-lib/patches/patch-ac
echo x - canna-lib/patches/patch-ad
sed 's/^X//' >canna-lib/patches/patch-ad << 'END-of-canna-lib/patches/patch-ad'
X$NetBSD: patch-ad,v 1.2 2000/07/28 05:34:35 itojun Exp $
X--- server/misc.c~	Fri Jul 29 12:03:54 1994
X+++ server/misc.c	Fri Jun 30 10:16:39 2000
X@@ -788,12 +788,19 @@
X 
X     if (client->username && client->username[0]) {
X       if (client->groupname && client->groupname[0]) {
X+	if (strlen(DDUSER) + strlen(client->username) +
X+	    strlen(DDGROUP) + strlen(client->groupname) +
X+	    strlen(DDPATH) + 4 >= 256)
X+	  return ( -1 );
X 	sprintf(dichome, "%s/%s:%s/%s:%s",
X 		DDUSER, client->username,
X 		DDGROUP, client->groupname,
X 		DDPATH);
X       }
X       else {
X+	if (strlen(DDUSER) + strlen(client->username) +
X+	    strlen(DDPATH) + 2 >= 256)
X+	  return ( -1 );
X 	sprintf(dichome, "%s/%s:%s",
X 		DDUSER, client->username,
X 		DDPATH);
END-of-canna-lib/patches/patch-ad
echo x - canna-lib/patches/patch-ae
sed 's/^X//' >canna-lib/patches/patch-ae << 'END-of-canna-lib/patches/patch-ae'
X$NetBSD: patch-ae,v 1.3 2000/12/01 03:15:34 itojun Exp $
X
XPATCH_SITES+=	http://apps.v6.linux.or.jp/pub/Linux/IPv6-2/canna/
XPATCHFILES+=	Canna35b2-v6-20000602.diff.gz
XPATCH_DIST_STRIP=	-p1
X(copied here for as the above patch does not apply cleanly
X
Xdiff -ru lib/RKC/Imakefile lib/RKC/Imakefile
X--- lib/RKC/Imakefile	Tue Oct 22 21:26:34 1996
X+++ lib/RKC/Imakefile	Fri Jun  2 15:11:31 2000
X@@ -11,7 +11,7 @@
X          LINTLIBS = ../RK/llib-lRK.ln
X          INCLUDES = -I$(CANNAROOT)/include
X 
X-           DEFINES = $(SIGNAL_DEFINES) $(RKC_DEFINES) $(ENGINE_DEFS)
X+           DEFINES = $(SIGNAL_DEFINES) $(RKC_DEFINES) $(ENGINE_DEFS) $(INET6_DEFS)
X 
X            HEADER = rkc.h rkcw.h
X              OBJS = rkc.o convert.o wconvert.o wutil.o
Xdiff -ru lib/RKC/wconvert.c lib/RKC/wconvert.c
X--- lib/RKC/wconvert.c	Wed Nov 27 16:22:30 1996
X+++ lib/RKC/wconvert.c	Fri Jun  2 15:01:34 2000
X@@ -368,13 +368,46 @@
X int number ;
X char *hostname ;
X {
X+#ifdef INET6
X+    struct addrinfo hints, *res0, *res;
X+    struct servent *sp ;
X+    char servbuf[NI_MAXSERV];
X+#else
X     struct sockaddr_in inaddr;	    /* INET socket address. */
X     unsigned long hostinetaddr;     /* result of inet_addr of arpa addr */
X     struct hostent *host_ptr, workhostbuf ;
X     struct servent *sp ;
X     int addrlen ;		 
X     char *h_addr_ptr;
X+#endif
X 
X+#ifdef INET6
X+    sp = getservbyname( IR_SERVICE_NAME, "tcp");
X+    sprintf(servbuf, "%u", (sp ? ntohs(sp->s_port) : IR_DEFAULT_PORT) + number);
X+    memset( &hints, 0, sizeof( hints ) );
X+    hints.ai_family = PF_UNSPEC;
X+    hints.ai_socktype = SOCK_STREAM;
X+    if ( getaddrinfo( hostname, servbuf, &hints, &res0 ) ){
X+	errno = EINVAL;
X+	return( -1 );
X+    }
X+    for( res = res0 ; res ; res = res->ai_next ){
X+	if( res->ai_family != PF_INET && res->ai_family != PF_INET6 )
X+	    continue;
X+	if( (ServerFD = socket( res->ai_family, res->ai_socktype, res->ai_protocol )) < 0 )
X+	    continue;
X+	errno = 0;
X+	if( connect( ServerFD, res->ai_addr, res->ai_addrlen ) ){
X+#ifdef nodef
X+	    perror("connect");
X+#endif
X+	    close( ServerFD ) ;
X+	    ServerFD = -1;
X+	    continue;
X+	}
X+    }
X+    freeaddrinfo( res0 );
X+#else /* INET6 / !INET6 */
X     /* インターネットドメインで接続する。 */
X     if( (host_ptr = gethostbyname( hostname ) )
X 	                                 == (struct hostent *)NULL) {
X@@ -423,8 +456,10 @@
X 	perror("connect") ;
X #endif
X 	close( ServerFD ) ;
X+	ServerFD = -1;
X 	return( -1 ) ;
X     }
X+#endif /* !INET6 */
X     return( ServerFD ) ;
X }
X #endif
Xdiff -ru server/Imakefile server/Imakefile
X--- server/Imakefile	Wed Nov 27 16:25:24 1996
X+++ server/Imakefile	Fri Jun  2 14:52:47 2000
X@@ -5,12 +5,12 @@
X      INSTUGIDFLAGS = -m 6555 $(cannaOwnerGroup)
X #ifdef __EMX__
X          INSTFLAGS = $(INSTUGIDFLAGS)
X-   LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/RK.a
X+   LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/RK.a $(INET6_LIBS)
X #else
X          INSTFLAGS = -s $(INSTUGIDFLAGS)
X-   LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/libRK.a
X+   LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/libRK.a $(INET6_LIBS)
X #endif
X-           DEFINES = $(CANNASERVER_DEFINES)
X+           DEFINES = $(CANNASERVER_DEFINES) $(INET6_DEFS)
X           INCLUDES = -I$(CANNAROOT)/include
X 
X             IRSRCS = $(SRCS) $(HEADER)
Xdiff -ru server/connection.c server/connection.c
X--- server/connection.c	Wed Nov 27 16:26:10 1996
X+++ server/connection.c	Fri Dec  1 11:52:10 2000
X@@ -133,2 +133,63 @@
X #ifdef USE_INET_SOCKET  /* INETドメインの作成 */
X+#ifdef INET6
X+static int open_inet6_socket ()
X+{
X+  extern int PortNumberPlus;
X+  struct sockaddr_in6 in6sock;
X+  struct servent *sp;
X+  int retry, request;
X+  
X+  /* /etc/servicesからポート番号を取得する */
X+  if( (sp = getservbyname(IR_SERVICE_NAME ,"tcp")) == NULL )
X+  {
X+    ir_debug( Dmsg(5,"Warning: Port number not find on '/etc/services'.\n");)
X+    ir_debug( Dmsg(5,"         Use %d as default.\n", IR_DEFAULT_PORT);)
X+  }
X+  
X+  if ((request = socket (AF_INET6, SOCK_STREAM, 0)) < 0)
X+  {
X+    ir_debug( Dmsg(5,"Warning: INET socket for server failed.\n");)
X+  }
X+  else
X+  {
X+#ifdef SO_REUSEADDR
X+    {
X+      int one = 1;
X+      setsockopt(request, SOL_SOCKET, SO_REUSEADDR,
X+		 (char *)&one, sizeof(int));
X+    }
X+#endif
X+    bzero ((char *)&in6sock, sizeof (in6sock));
X+    in6sock.sin6_family = AF_INET6;
X+    in6sock.sin6_port =
X+    (sp ? ntohs(sp->s_port) : IR_DEFAULT_PORT) + PortNumberPlus;
X+    
X+    ir_debug( Dmsg(5, "ポート番号:[%d]\n",htons(in6sock.sin6_port));)
X+    
X+    in6sock.sin6_port = htons(in6sock.sin6_port);
X+    in6sock.sin6_addr = in6addr_any;
X+    
X+    retry = 0;
X+    while ( bind(request, (struct sockaddr *)&in6sock, sizeof(in6sock)) < 0 ) 
X+    { 
X+      ir_debug( Dmsg(5, "bind トライ回数[%d]\n",retry);)	
X+      if (++retry == 5){
X+	ir_debug( Dmsg(5,"Warning: Server could not bind.\n");)
X+	close(request);
X+	request = -1; /* bind 失敗  */
X+	break;
X+      }
X+      sleep (1);
X+    }
X+    if( retry != 5 ) {
X+      if (listen (request, 5)){
X+	ir_debug( Dmsg(5,"Warning: Server could not listen.\n");)
X+	close(request); 
X+	request = -1; /* listen 失敗  */
X+      }
X+    }
X+  }
X+  return request;
X+}
X+#endif
X static int open_inet_socket ()
X@@ -200,2 +261,5 @@
X   int request;
X+#if defined(USE_INET_SOCKET) && defined(INET6)
X+  int inet6_ok = 0;
X+#endif
X   
X@@ -222,2 +286,14 @@
X #ifdef USE_INET_SOCKET  /* INETドメイン */    
X+#ifdef INET6
X+  if ((request = open_inet6_socket ()) != -1)
X+  {
X+    inet6_ok++;
X+    WellKnownConnections |= (1L << request);
X+    ir_debug( Dmsg(3,"INET6 domain socket is created\n"); )
X+  }
X+  else
X+  {
X+    ir_debug( Dmsg(5,"Warning: INET6 domain not created.\n");)
X+  }
X+#endif
X   if ((request = open_inet_socket ()) != -1)
X@@ -229,3 +305,9 @@
X     ir_debug( Dmsg(5,"Warning: INET domain not created.\n");)
X+#ifdef INET6
X+    if ( !inet6_ok ){
X+      return 0; /* 作成に失敗 */
X+    }
X+#else
X     return 0; /* 作成に失敗 */
X+#endif
X   }
X@@ -609,6 +691,11 @@
X {
X+#ifdef INET6
X+    struct sockaddr_storage from;
X+#else
X     struct sockaddr_in	from;
X     struct hostent	*hp;
X-    char		buf[MAXDATA], *inet_ntoa();
X-    int 		fromlen = sizeof( struct sockaddr_in ) ;
X+    char		*inet_ntoa();
X+#endif
X+    char		buf[MAXDATA];
X+    int 		fromlen = sizeof(from);
X 
X@@ -622,2 +709,15 @@
X 
X+#ifdef INET6
X+#ifdef AF_UNIX
X+    if (from.ss_family != AF_UNIX)
X+#else
X+    if (from.ss_family != AF_LOCAL)
X+#endif
X+    {
X+	if (getnameinfo((struct sockaddr *)&from, fromlen, buf, sizeof(buf),
X+	    NULL, 0, 0) != 0) {
X+	    strcpy(buf, "invalid");
X+	}
X+    }
X+#else
X     if( from.sin_family == AF_INET ) {
X@@ -630,3 +730,5 @@
X 	    strncpy( buf, inet_ntoa( from.sin_addr ), MAXDATA-1 ) ;
X-    } else {
X+    }
X+#endif
X+    else {
X         client->hostaddr = IR_UNIX_ADDRESS;
END-of-canna-lib/patches/patch-ae
exit
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	canna-server
#	canna-server/INSTALL
#	canna-server/DESCR
#	canna-server/Makefile
#	canna-server/PLIST
#	canna-server/distinfo
#
echo c - canna-server
mkdir -p canna-server > /dev/null 2>&1
echo x - canna-server/INSTALL
sed 's/^X//' >canna-server/INSTALL << 'END-of-canna-server/INSTALL'
X#!/bin/sh
Xif [ "$2" != "POST-INSTALL" ]; then exit 0; fi
X(grep -v ^# /etc/services | grep 'canna.*5680' >/dev/null) ||	\
X	(echo "" >> /etc/services;			\
X	 echo "# canna package" >> /etc/services;	\
X	 echo "canna		5680/tcp" >> /etc/services;	\
X	 )
END-of-canna-server/INSTALL
echo x - canna-server/DESCR
sed 's/^X//' >canna-server/DESCR << 'END-of-canna-server/DESCR'
XCanna is a Kana-Kanji conversion server.
XSupport Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
Xcannum front end and some others.
X
X  To use from Mule (CANNA version), in .emacs file:
X
X     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
X        (progn
X         (load-library "canna")
X         (canna) ))
X
X  Then kana-kanji conversion begin to `C-o' key. Show more detail
XInfo, and/or documents.
END-of-canna-server/DESCR
echo x - canna-server/Makefile
sed 's/^X//' >canna-server/Makefile << 'END-of-canna-server/Makefile'
X# $NetBSD: Makefile,v 1.12 2002/02/28 13:26:03 wiz Exp $
X
XDISTNAME=	Canna35b2
XPKGNAME=	Canna-server-3.5b2
XCATEGORIES=	japanese
XMASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
X
XPATCH_SITES=	http://www.jaist.ac.jp/~fujieda/canna/
XPATCHFILES=	Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \
X		Canna35b2-hack1.patch.gz
XPATCH_DIST_STRIP=	-p1
X
XMAINTAINER=	tech-pkg-ja@jp.netbsd.org
XHOMEPAGE=	http://www.nec.co.jp/japanese/product/computer/soft/canna/
XCOMMENT=	Kana-Kanji conversion system (server)
X
X#USE_IMAKE=	# defined
X
XDEPENDS+=	Canna-lib>=3.5:../../japanese/canna-lib
X
XFILESDIR=	${.CURDIR}/../../japanese/canna-lib/files
XPATCHDIR=	${.CURDIR}/../../japanese/canna-lib/patches
X
XBUILD_DEFS+=	USE_INET6
X
X.include "../../mk/bsd.prefs.mk"
X.if 0	# ${USE_INET6} == "YES"
XINET6=		-DINET6
X.else
XINET6=		# empty
X.endif
XCANNAOWNER?=	daemon
XCANNAGROUP?=	daemon
XCANNA_SPOOL=	${DESTDIR}/var/spool/canna
XCANNA_MODE=	0755
XDICT_DIR?=	${DESTDIR}/var/dict
XMAKE_ENV+=	CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
X		CANNA_SPOOL=${CANNA_SPOOL} DICT_DIR=${DICT_DIR} INET6=${INET6}
XPLIST_SUBST=	CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
X		CANNA_SPOOL=${CANNA_SPOOL} CANNA_MODE=${CANNA_MODE} \
X		DICT_DIR=${DICT_DIR} PREFIX=${PREFIX}
X
XINSTALL_TARGET=	instserver instclient
X
Xpost-patch:
X	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
X	@${SED} -e 's|\(SUBDIRS = .*\) misc\(.*\)|\1\2 cmd dic/ideo server|' \
X		-e 's|\(SERVERDIR = .*\) dic/phono\(.*\)|\1\2|' \
X		-e 's|\(CLIENTDIR = .*\) dic/phono misc|\1|' \
X		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
X
X# We need to pass ${MAKE_ENV} to ${XMKMF}
Xdo-configure:
X	@cd ${WRKSRC} && \
X	    ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${MAKE_ENV} ${XMKMF}
X
Xpost-build:
X	@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/canna \
X		> ${WRKDIR}/canna
X
Xpost-install:
X	@for d in ${WRKSRC}/cmd ${WRKSRC}/server; do \
X		cd $$d && \
X		    ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install.man; \
X	done
X	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
X	@${INSTALL_SCRIPT} ${WRKDIR}/canna ${PREFIX}/etc/rc.d/canna
X	@${INSTALL_DATA_DIR} ${CANNA_SPOOL}
X	@${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
X	@${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}
X
X.include "../../mk/bsd.pkg.mk"
END-of-canna-server/Makefile
echo x - canna-server/PLIST
sed 's/^X//' >canna-server/PLIST << 'END-of-canna-server/PLIST'
X@comment $NetBSD: PLIST,v 1.4 2002/02/18 01:02:51 hubertf Exp $
X@cwd ${DICT_DIR}
X@cwd ${DICT_DIR}
Xcanna/canna/bushu.cld
Xcanna/canna/chimei.ctd
Xcanna/canna/dics.dir
Xcanna/canna/fuzokugo.cbd
Xcanna/canna/fuzokugo.cld
Xcanna/canna/hojomwd.ctd
Xcanna/canna/hojoswd.ctd
Xcanna/canna/iroha.cbd
Xcanna/canna/iroha.cld
Xcanna/canna/kanasmpl.ctd
Xcanna/canna/katakana.ctd
Xcanna/canna/keishiki.ctd
Xcanna/canna/necgaiji.ctd
Xcanna/canna/number.ctd
Xcanna/canna/software.ctd
Xcanna/canna/suffix.ctd
X@cwd ${PREFIX}
Xbin/canlisp
Xbin/cannacheck
Xbin/cannakill
Xbin/cannastat
Xbin/catdic
Xbin/crfreq
Xbin/crxdic
Xbin/crxgram
Xbin/cshost
Xbin/ctow
Xbin/dicar
Xbin/dpbindic
Xbin/dpromdic
Xbin/dpxdic
Xbin/forcpp
Xbin/forsort
Xbin/kpdic
Xbin/mergeword
Xbin/mkbindic
Xbin/mkromdic
Xbin/splitword
Xbin/wtoc
Xetc/rc.d/canna
Xman/ja_JP.EUC/man1/addwords.1
Xman/ja_JP.EUC/man1/cannacheck.1
Xman/ja_JP.EUC/man1/cannakill.1
Xman/ja_JP.EUC/man1/cannaserver.1
Xman/ja_JP.EUC/man1/cannastat.1
Xman/ja_JP.EUC/man1/catdic.1
Xman/ja_JP.EUC/man1/cpdic.1
Xman/ja_JP.EUC/man1/cshost.1
Xman/ja_JP.EUC/man1/ctow.1
Xman/ja_JP.EUC/man1/delwords.1
Xman/ja_JP.EUC/man1/dicar.1
Xman/ja_JP.EUC/man1/dpbindic.1
Xman/ja_JP.EUC/man1/dpromdic.1
Xman/ja_JP.EUC/man1/lsdic.1
Xman/ja_JP.EUC/man1/mkbindic.1
Xman/ja_JP.EUC/man1/mkdic.1
Xman/ja_JP.EUC/man1/mkromdic.1
Xman/ja_JP.EUC/man1/mvdic.1
Xman/ja_JP.EUC/man1/rmdic.1
Xman/ja_JP.EUC/man1/splitword.1
Xman/ja_JP.EUC/man1/wtoc.1
Xsbin/cannaserver
X@exec ${MKDIR} ${CANNA_SPOOL}
X@exec ${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}
X@exec ${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
X@unexec ${RMDIR} ${DICT_DIR}/canna/canna
X@unexec ${RMDIR} ${CANNA_SPOOL}
END-of-canna-server/PLIST
echo x - canna-server/distinfo
sed 's/^X//' >canna-server/distinfo << 'END-of-canna-server/distinfo'
X$NetBSD: distinfo,v 1.2 2001/04/21 10:13:31 wiz Exp $
X
XSHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2
XSize (Canna35b2.tar.gz) = 1333329 bytes
XSHA1 (Canna35b2-unoff1.patch.gz) = 19579591190f7ace7d3ec5f61a7d01ca3bc576c1
XSize (Canna35b2-unoff1.patch.gz) = 21443 bytes
XSHA1 (Canna35b2-unoff2.patch.gz) = 16d578ed0558a632832194fffad8fcf24c9181fb
XSize (Canna35b2-unoff2.patch.gz) = 11375 bytes
XSHA1 (Canna35b2-hack1.patch.gz) = 24ab2baf104ef9748f92bd5315d4100a7ee961ab
XSize (Canna35b2-hack1.patch.gz) = 8384 bytes
XSHA1 (patch-aa) = d74119cb2c37a3db1c5d5417c1e35362b1eac655
XSHA1 (patch-ab) = b224a611de298a1c029350e1f734571f7bf657d1
XSHA1 (patch-ac) = 8f910e59d71ef09434a40abde698d730ed7fc1c5
XSHA1 (patch-ad) = dd2eb94e75dc4789e298aa1601280d32fbe5ec96
XSHA1 (patch-ae) = e44c60ddf1e042ab5df1457b6723071c38baae02
XSHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10
END-of-canna-server/distinfo
exit

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	kinput2
#	kinput2/MESSAGE
#	kinput2/DESCR
#	kinput2/files
#	kinput2/files/Kinput2.conf
#	kinput2/Makefile
#	kinput2/PLIST-common
#	kinput2/PLIST-freewnn
#	kinput2/PLIST-sj3
#	kinput2/distinfo
#	kinput2/patches
#	kinput2/patches/patch-aa
#
echo c - kinput2
mkdir -p kinput2 > /dev/null 2>&1
echo x - kinput2/MESSAGE
sed 's/^X//' >kinput2/MESSAGE << 'END-of-kinput2/MESSAGE'
X======================================================================
X$NetBSD: MESSAGE,v 1.1 2001/10/31 23:29:17 zuntum Exp $
X
XIf you want to use Egg key binding on kinput2, then
Xyou should run
X
Xkinput2 -ccdef ccdef.kinput2.egg
X
X======================================================================
END-of-kinput2/MESSAGE
echo x - kinput2/DESCR
sed 's/^X//' >kinput2/DESCR << 'END-of-kinput2/DESCR'
XKinput2 is an input server for X11 applications that want Japanese
Xtext input.
X
XA client that wants kana-kanji conversion service for Japanese text
Xsends a request to kinput2.  Kinput2 receives the request, does
Xkana-kanji conversion, and sends the converted text back to the
Xclient.
X
XThe port supports Wnn4.  Egg key binding is avairable,
Xif you run
X
Xkinput2 -ccdef ccdef.kinput2.egg
END-of-kinput2/DESCR
echo c - kinput2/files
mkdir -p kinput2/files > /dev/null 2>&1
echo x - kinput2/files/Kinput2.conf
sed 's/^X//' >kinput2/files/Kinput2.conf << 'END-of-kinput2/files/Kinput2.conf'
XXCOMM Each parameter in this file is explained in the original
XXCOMM  Kinput2.conf (probably Kinput2.conf.org)
X
XXCOMM Redefine $(IMAKE_CMD) for FreeBSD ports (by S. Taoka)
X
XIMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(PORT_IMAKE_DEFINES)
X
XCCDEF_DIR = $(LIBDIR)/ccdef
X
XWNNSRC		= port_WNNSRC
XWNNINCDIR	= port_WNNINCDIR
XWNNLIB		= port_WNNLIB
X
XCANNAINSTDIR = port_CANNAINSTDIR
XCANNASRC = port_CANNASRC
XCANNALIB = port_CANNALIB
X
XSJ3DEF_DIR = $(LIBDIR)/sj3def
XSJ3SRC		= port_SJ3SRC
XSJ3LIB		= port_SJ3LIB
X
XTRANSPORTDEFS = 
END-of-kinput2/files/Kinput2.conf
echo x - kinput2/Makefile
sed 's/^X//' >kinput2/Makefile << 'END-of-kinput2/Makefile'
X# $NetBSD: Makefile,v 1.8 2001/02/16 15:25:20 wiz Exp $
X# FreeBSD Id: Makefile,v 1.4 1999/06/06 13:19:49 taoka Exp $
X
XDISTNAME=	kinput2-v3
XPKGNAME=	kinput2-3.0
XCATEGORIES=	japanese
XMASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/
X
XMAINTAINER=	tech-pkg-ja@jp.netbsd.org
XCOMMENT=	Input server of Japanese text
X
XUSE_IMAKE=	YES
X
XPLIST_SRC=	${PKGDIR}/PLIST-common
X
X.include "../../mk/bsd.prefs.mk"
X.if defined(USE_CANNA) && ${USE_CANNA} != YES &&	\
X    defined(USE_WNN4) && ${USE_WNN4} != YES &&		\
X    defined(USE_WNN6) && ${USE_WNN6} != YES &&		\
X    defined(USE_SJ3) && ${USE_SJ3} != YES
XIGNORE=	${PKGNAME} is ignored. because USE_CANNA,USE_WNN4,USE_WNN6,USE_SJ3 are "NO"
X.endif
X
X.if !defined(USE_CANNA) || ${USE_CANNA} == YES
XDEPENDS+=	Canna-lib>=3.5:../../japanese/canna-lib
XKINPUT2_DEF+=	-DUseCanna -Dport_CANNASRC=${LOCALBASE}/include \
X		-Dport_CANNALIB="${LDFLAGS} -lcanna16"
X.endif
X
X#.if defined(USE_WNN6) && ${USE_WNN6} == YES
X#DEPENDS+=
X#KINPUT2_DEF+=	-DUseWnn -DUseWnn6 -Dport_WNNINCDIR=${LOCALBASE}/include/wnn \
X#		-Dport_WNNLIB="${LDFLAGS} -lwnn6 -lcrypt"
X#.elif (!defined(USE_WNN4) || ${USE_WNN4} == YES)
X.if !defined(USE_WNN4) || ${USE_WNN4} == YES
XDEPENDS+=	ja-FreeWnn-lib-1.10:../../japanese/freewnn-lib
XKINPUT2_DEF+=	-DUseWnn -Dport_WNNINCDIR=${LOCALBASE}/include/wnn \
X		-Dport_WNNLIB="${LDFLAGS} -lwnn -lcrypt"
XPLIST_SRC+=	${PKGDIR}/PLIST-freewnn
X.endif
X
X.if !defined(USE_SJ3) || ${USE_SJ3} == YES
XDEPENDS+=	sj3-lib-2.0.1.20:../../japanese/sj3-lib
XKINPUT2_DEF+=	-DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \
X		-Dport_SJ3LIB="${LDFLAGS} -lsj3lib"
XPLIST_SRC+=	${PKGDIR}/PLIST-sj3
X.endif
X
XMAKE_ENV+=	PORT_IMAKE_DEFINES='${KINPUT2_DEF}'
X
Xpre-configure:
X	${MV} -f ${WRKSRC}/Kinput2.conf ${WRKSRC}/Kinput2.conf.org
X	${CP} ${FILESDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf
X
Xdo-configure:
X	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
X
X.include "../../mk/bsd.pkg.mk"
END-of-kinput2/Makefile
echo x - kinput2/PLIST-common
sed 's/^X//' >kinput2/PLIST-common << 'END-of-kinput2/PLIST-common'
X@comment $NetBSD: PLIST-common,v 1.1 2001/10/31 23:31:33 zuntum Exp $
Xbin/kinput2
Xlib/X11/app-defaults/Kinput2
Xman/cat1/kinput2.0
END-of-kinput2/PLIST-common
echo x - kinput2/PLIST-freewnn
sed 's/^X//' >kinput2/PLIST-freewnn << 'END-of-kinput2/PLIST-freewnn'
X@comment $NetBSD: PLIST-freewnn,v 1.1 2001/10/31 23:31:34 zuntum Exp $
Xlib/X11/ccdef/ccdef.kinput2
Xlib/X11/ccdef/rule.eggfunc
Xlib/X11/ccdef/rule.func
Xlib/X11/ccdef/rule.greek
Xlib/X11/ccdef/rule.kana
Xlib/X11/ccdef/rule.kana2
Xlib/X11/ccdef/rule.roma
Xlib/X11/ccdef/rule.wnnroma
Xlib/X11/ccdef/rule.zascii
Xlib/X11/ccdef/ccdef.kinput2.egg
Xlib/X11/ccdef/rule.hiragana.egg
Xlib/X11/ccdef/rule.katakana.egg
Xlib/X11/ccdef/rule.kigou.egg
X@dirrm lib/X11/ccdef
END-of-kinput2/PLIST-freewnn
echo x - kinput2/PLIST-sj3
sed 's/^X//' >kinput2/PLIST-sj3 << 'END-of-kinput2/PLIST-sj3'
X@comment $NetBSD: PLIST-sj3,v 1.1 2001/10/31 23:31:34 zuntum Exp $
Xlib/X11/sj3def/sjhk
Xlib/X11/sj3def/sjrc
Xlib/X11/sj3def/sjrk
Xlib/X11/sj3def/sjsb
Xlib/X11/sj3def/sjzh
X@dirrm lib/X11/sj3def
END-of-kinput2/PLIST-sj3
echo x - kinput2/distinfo
sed 's/^X//' >kinput2/distinfo << 'END-of-kinput2/distinfo'
X$NetBSD: distinfo,v 1.2 2001/04/21 10:13:33 wiz Exp $
X
XSHA1 (kinput2-v3.tar.gz) = a9e2be1fe4da4c5f4921a1d753f58d20f1ef3693
XSize (kinput2-v3.tar.gz) = 462281 bytes
XSHA1 (patch-aa) = c41b2baa5de117c031c266afbff0e947340ab708
END-of-kinput2/distinfo
echo c - kinput2/patches
mkdir -p kinput2/patches > /dev/null 2>&1
echo x - kinput2/patches/patch-aa
sed 's/^X//' >kinput2/patches/patch-aa << 'END-of-kinput2/patches/patch-aa'
X$NetBSD: patch-aa,v 1.1 1999/09/03 04:11:08 sakamoto Exp $
X
X--- include/wnnlib.h.orig	Thu May 27 08:55:22 1999
X+++ include/wnnlib.h	Fri Sep  3 09:34:09 1999
X@@ -29,4 +29,5 @@
X #define _wnnlib_h
X 
X+#include	<config.h>
X #include	<commonhd.h>
X #include	<jllib.h>
END-of-kinput2/patches/patch-aa
exit