Added kpdef patch

5 files changed, 5 insertions, 362 deletions

diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index a4661c6af4a9..0f6e5c4aafc4 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,18 +1,15 @@
 MD5 d5bac215ed725111515aeacf0965cb8a ChangeLog 5184
 MD5 b46ea852aefb4b480a009e1d68813872 canna-3.5_beta2-r2.ebuild 1375
 MD5 b073f8feef2c9cdbdcb24b74bb93c101 canna-3.7.ebuild 3385
-MD5 e0fa7f2585f05d83612719a769f1264b canna-3.6_p3-r2.ebuild 1954
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 014292f80f745f4979566a9982b43fbb canna-3.6_p4.ebuild 2789
+MD5 525d990d8b13ef3fdf1916b62682ea40 canna-3.6_p4.ebuild 2848
 MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7-gentoo.diff.in 5263
 MD5 167b6b59b36ffe7d7ebda5ddd85c930a files/digest-canna-3.7 61
 MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
-MD5 57c633d3e17e89d06bf60940411d0992 files/canna-3.6_p3-r2-gentoo.diff 9552
 MD5 248b68ec823c14f763cc3f62221fb7d7 files/canna.confd 306
 MD5 d60168a33fd321ad1a29382cafcb60d3 files/canna.hosts 5
 MD5 190c04019722e776769ab0287dd9de6d files/canna.initd 692
 MD5 b662ec8c507add7b3d6550fe86ee83d6 files/digest-canna-3.5_beta2-r2 62
-MD5 9e27c1b8d2be61f0cd96a4b2689a3e61 files/digest-canna-3.6_p3-r2 62
 MD5 0d09a45d1074f9f4801a48bf8ec3208a files/update-canna-dics_dir 1101
 MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
 MD5 c48de658742361ca5549edaddebb3e94 files/digest-canna-3.6_p4 62
diff --git a/app-i18n/canna/canna-3.6_p3-r2.ebuild b/app-i18n/canna/canna-3.6_p3-r2.ebuild
deleted file mode 100644
index 8f0523128596..000000000000
--- a/app-i18n/canna/canna-3.6_p3-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p3-r2.ebuild,v 1.4 2003/08/05 15:39:29 vapier Exp $
-
-inherit eutils
-
-MY_P="Canna36p3"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/"
-SRC_URI="http://downloads.sourceforge.jp/canna/2181/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="virtual/glibc
-	x11-base/xfree
-	>=sys-apps/sed-4"
-RDEPEND="virtual/glibc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	find . -name '*.man' | xargs sed -i.bak -e 's/1M/8/g'
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-	xmkmf || die
-	make Makefiles || die
-	# make includes
-	make canna || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} install.man || die
-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
-	for i in cannaserver cannakill ; do
-		mv ${D}/usr/share/man/man1/$i.1 \
-			${D}/usr/share/man/man8/$i.8 || die
-		mv ${D}/usr/share/man/ja/man1/$i.1 \
-			${D}/usr/share/man/ja/man8/$i.8 || die
-	done
-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
-	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd canna || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/canna.confd canna || die
-	insinto /etc/       ; newins ${FILESDIR}/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
-
-	dosbin ${FILESDIR}/update-canna-dics_dir
-	insinto /var/lib/canna/dic/dics.d/ ;\
-		newins ${D}/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
-}
-
-pkg_postinst() {
-	if [ -x /usr/sbin/update-canna-dics_dir ]; then
-		einfo "Regenerating dics.dir file..."
-		/usr/sbin/update-canna-dics_dir || die "Regenerating failed."
-	fi
-}
-
-pkg_postrm() {
-	if [ -x /usr/sbin/update-canna-dics_dir ]; then
-		einfo "Regenerating dics.dir file..."
-		/usr/sbin/update-canna-dics_dir || die "Regenerating failed."
-	fi
-}
diff --git a/app-i18n/canna/canna-3.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
index 3bca7c70216b..af58c5d4bfae 100644
--- a/app-i18n/canna/canna-3.6_p4.ebuild
+++ b/app-i18n/canna/canna-3.6_p4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.7 2003/11/18 15:01:18 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.8 2003/12/12 19:11:19 usata Exp $
 
 inherit cannadic
 
 IUSE="doc"
 
-MY_P="Canna36${PV#*_}"
+MY_P="Canna${PV//[._]/}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
 HOMEPAGE="http://canna.sourceforge.jp/"
@@ -29,6 +29,8 @@ src_unpack() {
 	cd ${S}
 	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	cd dic/phono
+	epatch ${FILESDIR}/${PN}-kpdef-gentoo.diff
 }
 
 src_compile() {
diff --git a/app-i18n/canna/files/canna-3.6_p3-r2-gentoo.diff b/app-i18n/canna/files/canna-3.6_p3-r2-gentoo.diff
deleted file mode 100644
index 3a5b7637f605..000000000000
--- a/app-i18n/canna/files/canna-3.6_p3-r2-gentoo.diff
+++ /dev/null
@@ -1,284 +0,0 @@
-diff -urN Canna36p3.OLD/Canna.conf Canna36p3/Canna.conf
---- Canna36p3.OLD/Canna.conf	2003-01-25 17:47:47.000000000 +0900
-+++ Canna36p3/Canna.conf	2003-06-02 03:27:46.000000000 +0900
-@@ -133,7 +133,7 @@
- /* rootにならずにインストールする時はこれを定義して下さい */
- /* #define InstallAsUser */
- /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */
--#define ObsoleteInstallDir
-+/* #define ObsoleteInstallDir */
- #ifdef InstallAsUser
- # define DefCannaPrefix $(HOME)/canna
- # define DefErrDir $(cannaPrefix)/log
-@@ -144,7 +144,7 @@
- #  define DefErrDir /usr/spool/canna
- #  define DefLibCannaDir /usr/lib
- # else
--#  define DefErrDir /var/log
-+#  define DefErrDir /var/log/canna
- #  define DefLibCannaDir $(cannaExecPrefix)/lib
- # endif
- #endif
-@@ -156,16 +156,18 @@
- # define DefCannaLibDir $(cannaPrefix)/share/canna
- #endif
- 
--cannaPrefix = DefCannaPrefix
-+cannaPrefix = /usr
- cannaExecPrefix = $(cannaPrefix)
- cannaBinDir = $(cannaExecPrefix)/bin
- cannaSrvDir = DefCannaSrvDir
- XCOMM cannaLibDir = /var/lib/canna
- XCOMM cannaLibDir = /var/db/canna
- cannaLibDir = DefCannaLibDir
--XCOMM cannaManDir = $(cannaPrefix)/share/man
--cannaManDir = $(cannaPrefix)/man
-+cannaManDir = $(cannaPrefix)/share/man
-+XCOMM cannaManDir = $(cannaPrefix)/man
- cannaIncDir = $(cannaPrefix)/include/canna
-+cannaDocDir = $(cannaPrefix)/share/doc/canna-3.6_p3
-+cannaShareDir = $(cannaPrefix)/share/canna
- 
- libCannaDir = DefLibCannaDir
- ErrDir  = DefErrDir
-@@ -248,7 +250,7 @@
- /* #define UseInstalledLibCanna YES */
- #define UseInstalledLibCanna NO
- 
--DicDir   = $(cannaLibDir)/dic
-+DicDir   = /var/lib/canna/dic
- 
- #ifdef NeXT
- #define NO_X_ENV
-@@ -365,6 +367,7 @@
- 	 echo "s%@(UnixSockDir)%$(UnixSockDir)%g"; \			@@\
- 	 echo "s%@(UnixSockName)%$(UnixSockName)%g"; \			@@\
- 	 echo "s%@(AccessFile)%$(AccessFile)%g"; \			@@\
-+	 echo "s%@(DicDir)%$(DicDir)%g"; \				@@\
- 	 echo "s%@(ErrDir)%$(ErrDir)%g") > $(MANUALSED)			@@\
- clean::									@@\
- 	$(RM) $(MANUALSED)
-@@ -381,6 +384,7 @@
- 	echo "s%@(UnixSockDir)%$(UnixSockDir)%g" >> $(MANUALSED)	@@\
- 	echo "s%@(UnixSockName)%$(UnixSockName)%g" >> $(MANUALSED)	@@\
- 	echo "s%@(AccessFile)%$(AccessFile)%g" >> $(MANUALSED)		@@\
-+	echo "s%@(DicDir)%$(DicDir)%g" >> $(MANUALSED)			@@\
- 	echo "s%@(ErrDir)%$(ErrDir)%g" >> $(MANUALSED)			@@\
- clean::									@@\
- 	$(RM) $(MANUALSED)
-@@ -561,6 +565,7 @@
- 	echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junk	@@\
- 	echo "/* for lib/canna */" >> junk				@@\
- 	echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junk		@@\
-+	echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junk		@@\
- 	echo "/* for scripts */" >> junk				@@\
- 	echo "#define CANNABINDIR $(cannaBinDir)" >> junk		@@\
- 	echo "/* others */" >> junk					@@\
-@@ -587,6 +592,7 @@
- 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\	@@\
- 	 echo "/* for lib/canna */";\					@@\
- 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \		@@\
-+	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \		@@\
- 	 echo "/* for scripts */";\					@@\
- 	 echo "#define CANNABINDIR $(cannaBinDir)"; \			@@\
- 	 echo "/* others */";\					@@\
-diff -urN Canna36p3.OLD/dic/phono/Imakefile Canna36p3/dic/phono/Imakefile
---- Canna36p3.OLD/dic/phono/Imakefile	2002-10-19 17:27:40.000000000 +0900
-+++ Canna36p3/dic/phono/Imakefile	2003-06-02 03:27:46.000000000 +0900
-@@ -27,9 +27,10 @@
- 
-        ROMAJI_DIC_DEF = -DSHIFT
- 
--               DICDIR = $(cannaLibDir)/dic
--            SAMPLEDIR = $(cannaLibDir)/sample
--         SAMPLESRCDIR = $(cannaLibDir)/sample/src
-+               DICDIR = $(DicDir)
-+        CANNASHAREDIR = $(cannaShareDir)
-+            SAMPLEDIR = $(cannaDocDir)/sample
-+         SAMPLESRCDIR = $(cannaDocDir)/sample/src
- 
-     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
-             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
-@@ -69,7 +70,7 @@
- MakeDirectories(install,$(DICDIR))
- MakeDirectories(install,$(SAMPLESRCDIR))
- 
--InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
-+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
-diff -urN Canna36p3.OLD/lib/canna/Imakefile Canna36p3/lib/canna/Imakefile
---- Canna36p3.OLD/lib/canna/Imakefile	2002-10-20 17:20:33.000000000 +0900
-+++ Canna36p3/lib/canna/Imakefile	2003-06-02 03:27:46.000000000 +0900
-@@ -116,8 +116,8 @@
- #endif /* ProjectX */
- #endif /* DoSharedLib */
- 
--sglobal.h: GSYM.awk globnames
--	awk -f GSYM.awk < globnames > $@
-+includes::
-+	awk -f GSYM.awk < globnames > sglobal.h
- 
- clean::
- 	$(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c sglobal.h
-diff -urN Canna36p3.OLD/lib/canna/romaji.c Canna36p3/lib/canna/romaji.c
---- Canna36p3.OLD/lib/canna/romaji.c	2003-01-17 17:48:19.000000000 +0900
-+++ Canna36p3/lib/canna/romaji.c	2003-06-02 03:27:46.000000000 +0900
-@@ -438,7 +438,7 @@
- 	}
-       }
-       
--#if 0 /* currently CANNASHAREDDIR is not defined */
-+#if 1 /* currently CANNASHAREDDIR is defined */
-       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
-         extern jrUserInfoStruct *uinfo;
- 	
-diff -urN Canna36p3.OLD/misc/Imakefile Canna36p3/misc/Imakefile
---- Canna36p3.OLD/misc/Imakefile	2003-01-13 14:34:30.000000000 +0900
-+++ Canna36p3/misc/Imakefile	2003-06-02 03:27:46.000000000 +0900
-@@ -34,14 +34,14 @@
- MakeLintLibSubdirs($(SUBDIRS))
- MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
- 
--MakeDirectories(install,$(cannaLibDir)/sample/src)
-+MakeDirectories(install,$(cannaDocDir)/sample/src)
- #if defined(nec_ews_svr4) || defined(pcux_r32)
--InstallNamedNonExec(rMakefile,Makefile,$(cannaLibDir)/sample/src)
-+InstallNamedNonExec(rMakefile,Makefile,$(cannaDocDir)/sample/src)
- #else
--InstallNamedNonExec(cMakefile,Makefile,$(cannaLibDir)/sample/src)
-+InstallNamedNonExec(cMakefile,Makefile,$(cannaDocDir)/sample/src)
- #endif /* nec_ews_svr4 */
- 
--InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-+InstallNonExec(is.c,$(cannaDocDir)/sample/src)
- 
- clean::
- 	$(RM) $(PROGRAMS)
-diff -urN Canna36p3.OLD/misc/initfiles/Imakefile Canna36p3/misc/initfiles/Imakefile
---- Canna36p3.OLD/misc/initfiles/Imakefile	2003-01-21 19:57:03.000000000 +0900
-+++ Canna36p3/misc/initfiles/Imakefile	2003-06-02 03:27:46.000000000 +0900
-@@ -6,7 +6,7 @@
- #endif
- 
-             CANNAROOT = ../..
--            SAMPLEDIR = $(cannaLibDir)/sample
-+            SAMPLEDIR = $(cannaShareDir)
- 
- all::
- 
-@@ -22,7 +22,7 @@
- Install: 1.1.cob 1.2.cob fixer.cob jdemon.cob just.cob lan5.cob modes.cob \
-          matsu.cob sample.cob skk.cob tut.cob unix.cob vje.cob wx2+.cob \
-          default.cob
--InstallNamedNonExec(default.cob,default.canna,$(cannaLibDir))
-+InstallNamedNonExec(default.cob,default.canna,$(cannaShareDir))
- InstallNamedNonExec(1.1.cob,1.1.canna,$(SAMPLEDIR))
- InstallNamedNonExec(1.2.cob,1.2.canna,$(SAMPLEDIR))
- InstallNamedNonExec(fixer.cob,fixer.canna,$(SAMPLEDIR))
-@@ -38,7 +38,7 @@
- InstallNamedNonExec(vje.cob,vje.canna,$(SAMPLEDIR))
- InstallNamedNonExec(wx2+.cob,wx2+.canna,$(SAMPLEDIR))
- #else
--InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir))
-+InstallNamedNonExec(default.ca,default.canna,$(cannaShareDir))
- InstallNonExec(1.1.canna,$(SAMPLEDIR))
- InstallNonExec(1.2.canna,$(SAMPLEDIR))
- InstallNonExec(fixer.canna,$(SAMPLEDIR))
-diff -urN Canna36p3.OLD/server/main.c Canna36p3/server/main.c
---- Canna36p3.OLD/server/main.c	2002-10-19 17:27:53.000000000 +0900
-+++ Canna36p3/server/main.c	2003-06-02 03:32:05.000000000 +0900
-@@ -73,6 +73,9 @@
- long start_real_time, start_user_time, start_sys_time ; 
- extern void ClientStat();
- 
-+void EarlyInit pro((int, char **));
-+int BecomeDaemon pro((void));
-+
- main(argc, argv)
- int argc ;			
- char *argv[] ;
-@@ -83,13 +86,11 @@
-     extern struct sockaddr_un unsock;
- #endif
- 
--    /* サーバを子プロセス(デーモン)として起動する */
--    parentid = BecomeDaemon(argc, argv);
--    
-+    EarlyInit(argc, argv);
-+
-     /* コンテクスト数の malloc 処理 */
-     if(!WidenTables(INITSOCKS)){
-       PrintMsg("十分なメモリがありません。mallocに失敗しました。\n"); 
--      if (parentid) kill(parentid, SIGTERM);
-       exit(1); /* まだ UNIXドメインを作っていない */
-     }
-     
-@@ -110,10 +111,12 @@
- #endif
-       fprintf(stderr, "\n");
-       CloseServer();
--      if (parentid) kill(parentid, SIGTERM);
-       exit(2);
-     }
- 
-+    /* サーバを子プロセス(デーモン)として起動する */
-+    parentid = BecomeDaemon();
-+    
-     /* エラー出力の切り替え、TTYの切り離し */
-     if (parentid) kill(parentid, SIGTERM);
-     DetachTTY();
-diff -urN Canna36p3.OLD/server/misc.c Canna36p3/server/misc.c
---- Canna36p3.OLD/server/misc.c	2002-12-18 17:29:09.000000000 +0900
-+++ Canna36p3/server/misc.c	2003-06-02 03:34:02.000000000 +0900
-@@ -125,14 +125,14 @@
- 
- extern void getserver_version pro((void));
- 
--int
--BecomeDaemon ( argc, argv )
-+void
-+EarlyInit ( argc, argv )
- int argc;
- char *argv[];	
- {
-     char *ddname = (char *)NULL;
-     char buf[ MAXDATA ];
--    int     parent, parentid, i;
-+    int     i;
-     int     context;
-     struct  passwd *pwent;
- 
-@@ -276,15 +276,16 @@
- 	return 0; /* デーモンにならない */
-     }
- #endif
--    /*
--     * FORK a CHILD
--     */
--
--    parentid = getpid() ;
--
-     bzero(PreMountTabl, MAX_PREMOUNTS * sizeof(unsigned char *));
- 
-     CreateAccessControlList() ;
-+}
-+
-+int
-+BecomeDaemon ()
-+{
-+    int     parent, parentid ;
-+    parentid = getpid() ;
- 
-     signal(SIGTERM, parQUIT);
- #ifndef __EMX__
-@@ -294,7 +295,7 @@
-     }
-     if ( parent ) {
- 	pause() ;
--	exit( 0 ) ;
-+	_exit( 0 ) ;
- 	/* wait( (int *)0 ) ;	*/
-     } else
- 	signal(SIGTERM, SIG_DFL);
diff --git a/app-i18n/canna/files/digest-canna-3.6_p3-r2 b/app-i18n/canna/files/digest-canna-3.6_p3-r2
deleted file mode 100644
index a69e983ff335..000000000000
--- a/app-i18n/canna/files/digest-canna-3.6_p3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc48790adccd026aa2b1ddba80fe5850 Canna36p3.tar.gz 1441598