Version bumped. Fixed numerous bugs in ebuild. See ChangeLog for detail

5 files changed, 275 insertions, 2 deletions

diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index b276de09a97b..6b3b87dfc229 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,4 +1,4 @@
-MD5 bda8258c661ac77ba73c414ca053f0cf ChangeLog 3035
+MD5 b5f4568c17cec9653253a22874473489 ChangeLog 3623
 MD5 b46ea852aefb4b480a009e1d68813872 canna-3.5_beta2-r2.ebuild 1375
 MD5 7879d3f3c6ededc8a6f47cd0c770f267 canna-3.6-r1.ebuild 1027
 MD5 95178f2423fe0546797fe526c877dc7d canna-3.6.ebuild 981
@@ -6,7 +6,7 @@ MD5 e065f74ecde1b04138d704ed2e15944c canna-3.6_p3-r1.ebuild 1632
 MD5 e0fa7f2585f05d83612719a769f1264b canna-3.6_p3-r2.ebuild 1954
 MD5 9fd4a3616817f3b0eeb585398803579c canna-3.6_p3.ebuild 1068
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 5a2ecfb8325d64573db40e6bf8850a74 canna-3.6_p4.ebuild 1752
+MD5 3c77f6a4e364407ff763838b20973b7d canna-3.6_p4.ebuild 2101
 MD5 6f0f185ecaa7391115043400b8e9e7c1 files/canna-3.6-gentoo.diff 20102
 MD5 b80ead17590a825d4cbd66c29852fceb files/canna-3.6-r1-gentoo.diff 15417
 MD5 506fffb5973b7936dea383bb0265dc90 files/canna-3.6_p3-gentoo.diff 14252
@@ -24,6 +24,7 @@ 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
+MD5 d4dea6579bb38b239b93899b2b8226a4 files/canna.initd.new 1009
 MD5 6915bb4afc796b0f7c35b448594eace6 files/canna-3.5_beta2-r2/canna.confd 89
 MD5 63eedc1ac2474b6a3ed13dcf74ac6fca files/canna-3.5_beta2-r2/canna.initd 471
 MD5 fb68f318058521c299eb4776b98fab43 files/canna-3.5_beta2-r2/gentoo.diff 50373
diff --git a/app-i18n/canna/canna-3.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
new file mode 100644
index 000000000000..115ec4266cdb
--- /dev/null
+++ b/app-i18n/canna/canna-3.6_p4.ebuild
@@ -0,0 +1,79 @@
+# 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.1 2003/09/22 19:26:04 usata Exp $
+
+inherit cannadic eutils
+
+MY_P="Canna36${PV#*_}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/canna/6059/${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' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
+	epatch ${FILESDIR}/${P}-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 man in cannaserver cannakill ; do
+		for mandir in ${D}/usr/share/man ${D}/usr/share/man/ja ; do
+			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
+		done
+	done
+
+	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
+	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd.new 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
+
+	# for backward compatibility
+	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
+
+	# fix permission for user dictionary
+	keepdir /var/lib/canna/dic/{user,group}
+	fowners root:bin /var/lib/canna/dic/{user,group}
+	fperms 775 /var/lib/canna/dic/{user,group}
+}
+
+pkg_prerm () {
+
+	if [ -S /tmp/.iroha_unix/IROHA ] ; then
+		einfo
+		einfo "Stopping Canna for safe unmerge"
+		einfo
+		/etc/init.d/canna stop
+	fi
+	if [ -e /var/lib/canna/dic/canna/dics.dir ] ; then
+		# no need to keep dics.dir if canna is not installed
+		rm -f /var/lib/canna/dic/canna/dics.dir
+	fi
+}
diff --git a/app-i18n/canna/files/canna-3.6_p4-gentoo.diff b/app-i18n/canna/files/canna-3.6_p4-gentoo.diff
new file mode 100644
index 000000000000..297060f16838
--- /dev/null
+++ b/app-i18n/canna/files/canna-3.6_p4-gentoo.diff
@@ -0,0 +1,155 @@
+diff -urN Canna36p4.ORIG/Canna.conf Canna36p4/Canna.conf
+--- Canna36p4.ORIG/Canna.conf	2003-09-22 19:27:12.000000000 +0900
++++ Canna36p4/Canna.conf	2003-09-22 23:02:32.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_p4
++cannaShareDir = $(cannaPrefix)/share/canna
+ 
+ libCannaDir = DefLibCannaDir
+ ErrDir  = DefErrDir
+@@ -251,7 +253,7 @@
+ /* #define UseInstalledLibCanna YES */
+ #define UseInstalledLibCanna NO
+ 
+-DicDir   = $(cannaLibDir)/dic
++DicDir   = /var/lib/canna/dic
+ 
+ #ifdef NeXT
+ #define NO_X_ENV
+@@ -566,6 +568,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					@@\
+@@ -592,6 +595,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 Canna36p4.ORIG/dic/phono/Imakefile Canna36p4/dic/phono/Imakefile
+--- Canna36p4.ORIG/dic/phono/Imakefile	2002-10-19 17:27:40.000000000 +0900
++++ Canna36p4/dic/phono/Imakefile	2003-09-22 22:55:59.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 Canna36p4.ORIG/lib/canna/Imakefile Canna36p4/lib/canna/Imakefile
+--- Canna36p4.ORIG/lib/canna/Imakefile	2002-10-20 17:20:33.000000000 +0900
++++ Canna36p4/lib/canna/Imakefile	2003-09-22 22:55:59.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 Canna36p4.ORIG/lib/canna/romaji.c Canna36p4/lib/canna/romaji.c
+--- Canna36p4.ORIG/lib/canna/romaji.c	2003-09-12 22:18:05.000000000 +0900
++++ Canna36p4/lib/canna/romaji.c	2003-09-22 22:55:59.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 Canna36p4.ORIG/misc/Imakefile Canna36p4/misc/Imakefile
+--- Canna36p4.ORIG/misc/Imakefile	2003-09-12 14:48:44.000000000 +0900
++++ Canna36p4/misc/Imakefile	2003-09-22 22:59:20.000000000 +0900
+@@ -48,7 +48,7 @@
+ MakeLintLibSubdirs($(SUBDIRS))
+ MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
+ 
+-MakeDirectories(install,$(cannaLibDir)/sample/src)
++MakeDirectories(install,$(cannaDocDir)/sample/src)
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ default.canna: default.ca
+@@ -58,8 +58,8 @@
+ 	$(CP) default.ca default.canna
+ #endif
+ 
+-InstallNonExec(default.canna,$(cannaLibDir))
+-InstallNonExec(is.c,$(cannaLibDir)/sample/src)
++InstallNonExec(default.canna,$(cannaDocDir))
++InstallNonExec(is.c,$(cannaDocDir)/sample/src)
+ 
+ clean::
+ 	$(RM) $(PROGRAMS)
+diff -urN Canna36p4.ORIG/misc/initfiles/Imakefile Canna36p4/misc/initfiles/Imakefile
+--- Canna36p4.ORIG/misc/initfiles/Imakefile	2003-09-12 14:48:44.000000000 +0900
++++ Canna36p4/misc/initfiles/Imakefile	2003-09-22 22:55:59.000000000 +0900
+@@ -6,7 +6,7 @@
+ #endif
+ 
+             CANNAROOT = ../..
+-            SAMPLEDIR = $(cannaLibDir)/sample
++            SAMPLEDIR = $(cannaShareDir)
+ 
+ all::
+ 
diff --git a/app-i18n/canna/files/canna.initd.new b/app-i18n/canna/files/canna.initd.new
new file mode 100644
index 000000000000..27cf1e064072
--- /dev/null
+++ b/app-i18n/canna/files/canna.initd.new
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# 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/files/canna.initd.new,v 1.1 2003/09/22 19:26:04 usata Exp $
+
+# CANNASERVER_OPTS is defined in /etc/conf.d/canna
+
+depend() {
+	after logger
+}
+
+start() {
+	if [ -S /tmp/.iroha_unix/IROHA ] ; then
+		/usr/sbin/cannakill >/dev/null 2>&1
+	fi
+	rm -f /tmp/.iroha_unix/IROHA
+
+	if [ "${CANNASERVER_OPTS}" = "${CANNASERVER_OPTS/-syslog/}" ] ; then
+		if [ ! -f /var/log/canna/CANNA0msgs ] ; then
+			touch /var/log/canna/CANNA0msgs
+		fi
+		if [ "${CANNASERVER_OPTS}" != "${CANNASERVER_OPTS/-u/}" ] ; then
+			chown `echo ${CANNASERVER_OPTS} | sed -e 's/.*-u *\(\w*\).*/\1/'` /var/log/canna/CANNA0msgs
+		fi
+		chmod u+w /var/log/canna/CANNA0msgs
+	fi
+
+	ebegin "Starting canna"
+	/usr/sbin/cannaserver ${CANNASERVER_OPTS}
+	eend $? "Failed to start canna"
+}
+
+stop() {
+	ebegin "Stopping canna"
+	/usr/sbin/cannakill
+	eend $? "Failed to stop canna"
+}
diff --git a/app-i18n/canna/files/digest-canna-3.6_p4 b/app-i18n/canna/files/digest-canna-3.6_p4
new file mode 100644
index 000000000000..4ee8ccf6bcb0
--- /dev/null
+++ b/app-i18n/canna/files/digest-canna-3.6_p4
@@ -0,0 +1 @@
+MD5 4798ca358e9ecdb37dbb1f5d986832e1 Canna36p4.tar.gz 1455672