due to /var/run permission change in 2.2.5-RELEASE, we changed

change where to write pid file.

Submitted by:	sanpei@jp.freebsd.org

9 files changed, 252 insertions, 357 deletions

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index 8e85ba429fa9..e6fb5710568e 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -4,14 +4,13 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.16 1997/07/17 15:12:45 max Exp $
+# $Id: Makefile,v 1.17 1997/09/14 21:34:28 max Exp $
 #
 
 DISTNAME=	Canna32p2
 PKGNAME=	ja-Canna-3.2.2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/ \
-		ftp://ftp.cdrom.com/pub/japanese/titech/Canna32/
+MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
 
 MAINTAINER=	max@FreeBSD.ORG
 
@@ -34,6 +33,10 @@ MAN3= 	RkRgnBun.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+pre-install:
+	${MKDIR} /var/run/canna
+	chown bin.bin /var/run/canna
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
@@ -42,7 +45,7 @@ post-install:
 		echo 'canna=${PREFIX}/sbin/cannaserver' 		\
 		  >> ${STARTUP_SCRIPT} ;				\
 		echo 'if [ -f $$canna ]; then' >> ${STARTUP_SCRIPT} ;	\
-		echo '    rm -f /var/run/Canna.pid' >> ${STARTUP_SCRIPT};\
+		echo '    rm -f /var/run/canna/Canna.pid' >> ${STARTUP_SCRIPT};\
 		echo "    echo -n ' Canna'" >> ${STARTUP_SCRIPT};	\
 		echo '     $$canna' >> ${STARTUP_SCRIPT} ;		\
 		echo "fi" >> ${STARTUP_SCRIPT} ;			\
diff --git a/japanese/Canna/files/patch-ac b/japanese/Canna/files/patch-ac
index 306b6a0c5938..07d73f0cf670 100644
--- a/japanese/Canna/files/patch-ac
+++ b/japanese/Canna/files/patch-ac
@@ -1,115 +1,74 @@
-*** Canna.conf.orig	Wed Apr 12 22:15:03 1995
---- Canna.conf	Thu Oct 31 13:47:39 1996
-***************
-*** 114,128 ****
-   * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
-   */
-  
-! cannaBinDir = /usr/local/canna/bin
-! cannaSrvDir = /usr/local/canna/bin
-! cannaLibDir = /usr/local/canna/lib
-! cannaManDir = /usr/local/canna/man
-! cannaIncDir = /usr/local/canna/include/canna
-! libCannaDir = /usr/lib
-  
-! ErrDir  = /usr/spool/canna
-! LockDir = /usr/spool/canna/lock
-  
-  wcharDefinition = -DCANNA_WCHAR
-  Wlib =
---- 114,128 ----
-   * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
-   */
-  
-! cannaBinDir = ${PREFIX}/bin
-! cannaSrvDir = ${PREFIX}/sbin
-! cannaLibDir = ${PREFIX}/lib/canna
-! cannaManDir = ${PREFIX}/man
-! cannaIncDir = ${PREFIX}/include/canna
-! libCannaDir = ${PREFIX}/lib
-  
-! ErrDir  = /var/log
-! LockDir = /var/run
-  
-  wcharDefinition = -DCANNA_WCHAR
-  Wlib =
-***************
-*** 135,141 ****
-  
-  pointerIntegerDef =
-  
-! cannaDsoRev = 1
-  sharedLibExtension = so.$(cannaDsoRev)
-  
-  /* 以下の３つは root にならないでインストールするのであれば echo に
---- 135,141 ----
-  
-  pointerIntegerDef =
-  
-! cannaDsoRev = 1.0
-  sharedLibExtension = so.$(cannaDsoRev)
-  
-  /* 以下の３つは root にならないでインストールするのであれば echo に
-***************
-*** 145,151 ****
-  CHMOD = chmod
-  
-  /* 日本語マニュアルを使わないのであればコメントアウト */
-! #define JAPANESEMAN
-  
-  /* locale ディレクトリを持っている場合は以下を記述する */
-  /* #define LOCALE_DIR /usr/lib/locale */
---- 145,151 ----
-  CHMOD = chmod
-  
-  /* 日本語マニュアルを使わないのであればコメントアウト */
-! /* #define JAPANESEMAN */
-  
-  /* locale ディレクトリを持っている場合は以下を記述する */
-  /* #define LOCALE_DIR /usr/lib/locale */
-***************
-*** 178,184 ****
-  #define UseInstalledLibCanna NO
-  
-  DicDir   = $(cannaLibDir)/dic
-! LockFile = .CANNALOCK
-  
-  #ifdef NeXT
-  #define NO_X_ENV
---- 178,184 ----
-  #define UseInstalledLibCanna NO
-  
-  DicDir   = $(cannaLibDir)/dic
-! LockFile = Canna.pid
-  
-  #ifdef NeXT
-  #define NO_X_ENV
-***************
-*** 311,323 ****
-  #endif
-  #define InstallLibManPageAliases(file,destdir,aliases)			@@\
-  install.man::								@@\
-!         @(TMP=/tmp/tmp.$$$$; \						@@\
-!         $(RM) $${TMP}; \						@@\
-!         echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-!         for i in aliases; do (set -x; \					@@\
-!         $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-!         done; \								@@\
-!         $(RM) $${TMP})
-  #ifndef MakeDirectoriesLong
-  #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
-  step::									@@\
---- 311,323 ----
-  #endif
-  #define InstallLibManPageAliases(file,destdir,aliases)			@@\
-  install.man::								@@\
-! 	@(TMP=/tmp/tmp.$$$$; \						@@\
-! 	$(RM) $${TMP}; \						@@\
-! 	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-! 	for i in aliases; do (set -x; \					@@\
-! 	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-! 	done; \								@@\
-! 	$(RM) $${TMP})
-  #ifndef MakeDirectoriesLong
-  #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
-  step::									@@\
+--- Canna.conf.orig	Wed Apr 12 22:15:03 1995
++++ Canna.conf	Fri Oct 17 23:05:25 1997
+@@ -114,15 +114,15 @@
+  * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
+  */
+ 
+-cannaBinDir = /usr/local/canna/bin
+-cannaSrvDir = /usr/local/canna/bin
+-cannaLibDir = /usr/local/canna/lib
+-cannaManDir = /usr/local/canna/man
+-cannaIncDir = /usr/local/canna/include/canna
+-libCannaDir = /usr/lib
++cannaBinDir = ${PREFIX}/bin
++cannaSrvDir = ${PREFIX}/sbin
++cannaLibDir = ${PREFIX}/lib/canna
++cannaManDir = ${PREFIX}/man
++cannaIncDir = ${PREFIX}/include/canna
++libCannaDir = ${PREFIX}/lib
+ 
+-ErrDir  = /usr/spool/canna
+-LockDir = /usr/spool/canna/lock
++ErrDir  = /var/log
++LockDir = /var/run/canna
+ 
+ wcharDefinition = -DCANNA_WCHAR
+ Wlib =
+@@ -135,7 +135,7 @@
+ 
+ pointerIntegerDef =
+ 
+-cannaDsoRev = 1
++cannaDsoRev = 1.0
+ sharedLibExtension = so.$(cannaDsoRev)
+ 
+ /* 以下の３つは root にならないでインストールするのであれば echo に
+@@ -145,7 +145,7 @@
+ CHMOD = chmod
+ 
+ /* 日本語マニュアルを使わないのであればコメントアウト */
+-#define JAPANESEMAN
++/* #define JAPANESEMAN */
+ 
+ /* locale ディレクトリを持っている場合は以下を記述する */
+ /* #define LOCALE_DIR /usr/lib/locale */
+@@ -178,7 +178,7 @@
+ #define UseInstalledLibCanna NO
+ 
+ DicDir   = $(cannaLibDir)/dic
+-LockFile = .CANNALOCK
++LockFile = Canna.pid
+ 
+ #ifdef NeXT
+ #define NO_X_ENV
+@@ -311,13 +311,13 @@
+ #endif
+ #define InstallLibManPageAliases(file,destdir,aliases)			@@\
+ install.man::								@@\
+-        @(TMP=/tmp/tmp.$$$$; \						@@\
+-        $(RM) $${TMP}; \						@@\
+-        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
+-        for i in aliases; do (set -x; \					@@\
+-        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
+-        done; \								@@\
+-        $(RM) $${TMP})
++	@(TMP=/tmp/tmp.$$$$; \						@@\
++	$(RM) $${TMP}; \						@@\
++	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
++	for i in aliases; do (set -x; \					@@\
++	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
++	done; \								@@\
++	$(RM) $${TMP})
+ #ifndef MakeDirectoriesLong
+ #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
+ step::									@@\
diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist
index 07733dadef4f..ed3231f1319c 100644
--- a/japanese/Canna/pkg-plist
+++ b/japanese/Canna/pkg-plist
@@ -178,9 +178,12 @@ man/man3/cannalib.3.gz
 man/man3/uilib.3.gz
 sbin/cannakill
 sbin/cannaserver
+@exec mkdir /var/run/canna
+@exec chown bin.bin /var/run/canna
 @exec chown bin.bin %D/lib/canna/dic/canna
 @exec chmod 775 %D/lib/canna/dic/canna
 @exec chown bin.bin %D/lib/canna/dic
 @exec chmod 775 %D/lib/canna/dic
 @exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user
+@dirrm /var/run/canna
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 8e85ba429fa9..e6fb5710568e 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -4,14 +4,13 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.16 1997/07/17 15:12:45 max Exp $
+# $Id: Makefile,v 1.17 1997/09/14 21:34:28 max Exp $
 #
 
 DISTNAME=	Canna32p2
 PKGNAME=	ja-Canna-3.2.2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/ \
-		ftp://ftp.cdrom.com/pub/japanese/titech/Canna32/
+MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
 
 MAINTAINER=	max@FreeBSD.ORG
 
@@ -34,6 +33,10 @@ MAN3= 	RkRgnBun.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+pre-install:
+	${MKDIR} /var/run/canna
+	chown bin.bin /var/run/canna
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
@@ -42,7 +45,7 @@ post-install:
 		echo 'canna=${PREFIX}/sbin/cannaserver' 		\
 		  >> ${STARTUP_SCRIPT} ;				\
 		echo 'if [ -f $$canna ]; then' >> ${STARTUP_SCRIPT} ;	\
-		echo '    rm -f /var/run/Canna.pid' >> ${STARTUP_SCRIPT};\
+		echo '    rm -f /var/run/canna/Canna.pid' >> ${STARTUP_SCRIPT};\
 		echo "    echo -n ' Canna'" >> ${STARTUP_SCRIPT};	\
 		echo '     $$canna' >> ${STARTUP_SCRIPT} ;		\
 		echo "fi" >> ${STARTUP_SCRIPT} ;			\
diff --git a/japanese/canna-lib/files/patch-ac b/japanese/canna-lib/files/patch-ac
index 306b6a0c5938..07d73f0cf670 100644
--- a/japanese/canna-lib/files/patch-ac
+++ b/japanese/canna-lib/files/patch-ac
@@ -1,115 +1,74 @@
-*** Canna.conf.orig	Wed Apr 12 22:15:03 1995
---- Canna.conf	Thu Oct 31 13:47:39 1996
-***************
-*** 114,128 ****
-   * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
-   */
-  
-! cannaBinDir = /usr/local/canna/bin
-! cannaSrvDir = /usr/local/canna/bin
-! cannaLibDir = /usr/local/canna/lib
-! cannaManDir = /usr/local/canna/man
-! cannaIncDir = /usr/local/canna/include/canna
-! libCannaDir = /usr/lib
-  
-! ErrDir  = /usr/spool/canna
-! LockDir = /usr/spool/canna/lock
-  
-  wcharDefinition = -DCANNA_WCHAR
-  Wlib =
---- 114,128 ----
-   * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
-   */
-  
-! cannaBinDir = ${PREFIX}/bin
-! cannaSrvDir = ${PREFIX}/sbin
-! cannaLibDir = ${PREFIX}/lib/canna
-! cannaManDir = ${PREFIX}/man
-! cannaIncDir = ${PREFIX}/include/canna
-! libCannaDir = ${PREFIX}/lib
-  
-! ErrDir  = /var/log
-! LockDir = /var/run
-  
-  wcharDefinition = -DCANNA_WCHAR
-  Wlib =
-***************
-*** 135,141 ****
-  
-  pointerIntegerDef =
-  
-! cannaDsoRev = 1
-  sharedLibExtension = so.$(cannaDsoRev)
-  
-  /* 以下の３つは root にならないでインストールするのであれば echo に
---- 135,141 ----
-  
-  pointerIntegerDef =
-  
-! cannaDsoRev = 1.0
-  sharedLibExtension = so.$(cannaDsoRev)
-  
-  /* 以下の３つは root にならないでインストールするのであれば echo に
-***************
-*** 145,151 ****
-  CHMOD = chmod
-  
-  /* 日本語マニュアルを使わないのであればコメントアウト */
-! #define JAPANESEMAN
-  
-  /* locale ディレクトリを持っている場合は以下を記述する */
-  /* #define LOCALE_DIR /usr/lib/locale */
---- 145,151 ----
-  CHMOD = chmod
-  
-  /* 日本語マニュアルを使わないのであればコメントアウト */
-! /* #define JAPANESEMAN */
-  
-  /* locale ディレクトリを持っている場合は以下を記述する */
-  /* #define LOCALE_DIR /usr/lib/locale */
-***************
-*** 178,184 ****
-  #define UseInstalledLibCanna NO
-  
-  DicDir   = $(cannaLibDir)/dic
-! LockFile = .CANNALOCK
-  
-  #ifdef NeXT
-  #define NO_X_ENV
---- 178,184 ----
-  #define UseInstalledLibCanna NO
-  
-  DicDir   = $(cannaLibDir)/dic
-! LockFile = Canna.pid
-  
-  #ifdef NeXT
-  #define NO_X_ENV
-***************
-*** 311,323 ****
-  #endif
-  #define InstallLibManPageAliases(file,destdir,aliases)			@@\
-  install.man::								@@\
-!         @(TMP=/tmp/tmp.$$$$; \						@@\
-!         $(RM) $${TMP}; \						@@\
-!         echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-!         for i in aliases; do (set -x; \					@@\
-!         $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-!         done; \								@@\
-!         $(RM) $${TMP})
-  #ifndef MakeDirectoriesLong
-  #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
-  step::									@@\
---- 311,323 ----
-  #endif
-  #define InstallLibManPageAliases(file,destdir,aliases)			@@\
-  install.man::								@@\
-! 	@(TMP=/tmp/tmp.$$$$; \						@@\
-! 	$(RM) $${TMP}; \						@@\
-! 	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-! 	for i in aliases; do (set -x; \					@@\
-! 	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-! 	done; \								@@\
-! 	$(RM) $${TMP})
-  #ifndef MakeDirectoriesLong
-  #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
-  step::									@@\
+--- Canna.conf.orig	Wed Apr 12 22:15:03 1995
++++ Canna.conf	Fri Oct 17 23:05:25 1997
+@@ -114,15 +114,15 @@
+  * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
+  */
+ 
+-cannaBinDir = /usr/local/canna/bin
+-cannaSrvDir = /usr/local/canna/bin
+-cannaLibDir = /usr/local/canna/lib
+-cannaManDir = /usr/local/canna/man
+-cannaIncDir = /usr/local/canna/include/canna
+-libCannaDir = /usr/lib
++cannaBinDir = ${PREFIX}/bin
++cannaSrvDir = ${PREFIX}/sbin
++cannaLibDir = ${PREFIX}/lib/canna
++cannaManDir = ${PREFIX}/man
++cannaIncDir = ${PREFIX}/include/canna
++libCannaDir = ${PREFIX}/lib
+ 
+-ErrDir  = /usr/spool/canna
+-LockDir = /usr/spool/canna/lock
++ErrDir  = /var/log
++LockDir = /var/run/canna
+ 
+ wcharDefinition = -DCANNA_WCHAR
+ Wlib =
+@@ -135,7 +135,7 @@
+ 
+ pointerIntegerDef =
+ 
+-cannaDsoRev = 1
++cannaDsoRev = 1.0
+ sharedLibExtension = so.$(cannaDsoRev)
+ 
+ /* 以下の３つは root にならないでインストールするのであれば echo に
+@@ -145,7 +145,7 @@
+ CHMOD = chmod
+ 
+ /* 日本語マニュアルを使わないのであればコメントアウト */
+-#define JAPANESEMAN
++/* #define JAPANESEMAN */
+ 
+ /* locale ディレクトリを持っている場合は以下を記述する */
+ /* #define LOCALE_DIR /usr/lib/locale */
+@@ -178,7 +178,7 @@
+ #define UseInstalledLibCanna NO
+ 
+ DicDir   = $(cannaLibDir)/dic
+-LockFile = .CANNALOCK
++LockFile = Canna.pid
+ 
+ #ifdef NeXT
+ #define NO_X_ENV
+@@ -311,13 +311,13 @@
+ #endif
+ #define InstallLibManPageAliases(file,destdir,aliases)			@@\
+ install.man::								@@\
+-        @(TMP=/tmp/tmp.$$$$; \						@@\
+-        $(RM) $${TMP}; \						@@\
+-        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
+-        for i in aliases; do (set -x; \					@@\
+-        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
+-        done; \								@@\
+-        $(RM) $${TMP})
++	@(TMP=/tmp/tmp.$$$$; \						@@\
++	$(RM) $${TMP}; \						@@\
++	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
++	for i in aliases; do (set -x; \					@@\
++	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
++	done; \								@@\
++	$(RM) $${TMP})
+ #ifndef MakeDirectoriesLong
+ #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
+ step::									@@\
diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist
index 07733dadef4f..ed3231f1319c 100644
--- a/japanese/canna-lib/pkg-plist
+++ b/japanese/canna-lib/pkg-plist
@@ -178,9 +178,12 @@ man/man3/cannalib.3.gz
 man/man3/uilib.3.gz
 sbin/cannakill
 sbin/cannaserver
+@exec mkdir /var/run/canna
+@exec chown bin.bin /var/run/canna
 @exec chown bin.bin %D/lib/canna/dic/canna
 @exec chmod 775 %D/lib/canna/dic/canna
 @exec chown bin.bin %D/lib/canna/dic
 @exec chmod 775 %D/lib/canna/dic
 @exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user
+@dirrm /var/run/canna
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 8e85ba429fa9..e6fb5710568e 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -4,14 +4,13 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.16 1997/07/17 15:12:45 max Exp $
+# $Id: Makefile,v 1.17 1997/09/14 21:34:28 max Exp $
 #
 
 DISTNAME=	Canna32p2
 PKGNAME=	ja-Canna-3.2.2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/ \
-		ftp://ftp.cdrom.com/pub/japanese/titech/Canna32/
+MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
 
 MAINTAINER=	max@FreeBSD.ORG
 
@@ -34,6 +33,10 @@ MAN3= 	RkRgnBun.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+pre-install:
+	${MKDIR} /var/run/canna
+	chown bin.bin /var/run/canna
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
@@ -42,7 +45,7 @@ post-install:
 		echo 'canna=${PREFIX}/sbin/cannaserver' 		\
 		  >> ${STARTUP_SCRIPT} ;				\
 		echo 'if [ -f $$canna ]; then' >> ${STARTUP_SCRIPT} ;	\
-		echo '    rm -f /var/run/Canna.pid' >> ${STARTUP_SCRIPT};\
+		echo '    rm -f /var/run/canna/Canna.pid' >> ${STARTUP_SCRIPT};\
 		echo "    echo -n ' Canna'" >> ${STARTUP_SCRIPT};	\
 		echo '     $$canna' >> ${STARTUP_SCRIPT} ;		\
 		echo "fi" >> ${STARTUP_SCRIPT} ;			\
diff --git a/japanese/canna-server/files/patch-ac b/japanese/canna-server/files/patch-ac
index 306b6a0c5938..07d73f0cf670 100644
--- a/japanese/canna-server/files/patch-ac
+++ b/japanese/canna-server/files/patch-ac
@@ -1,115 +1,74 @@
-*** Canna.conf.orig	Wed Apr 12 22:15:03 1995
---- Canna.conf	Thu Oct 31 13:47:39 1996
-***************
-*** 114,128 ****
-   * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
-   */
-  
-! cannaBinDir = /usr/local/canna/bin
-! cannaSrvDir = /usr/local/canna/bin
-! cannaLibDir = /usr/local/canna/lib
-! cannaManDir = /usr/local/canna/man
-! cannaIncDir = /usr/local/canna/include/canna
-! libCannaDir = /usr/lib
-  
-! ErrDir  = /usr/spool/canna
-! LockDir = /usr/spool/canna/lock
-  
-  wcharDefinition = -DCANNA_WCHAR
-  Wlib =
---- 114,128 ----
-   * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
-   */
-  
-! cannaBinDir = ${PREFIX}/bin
-! cannaSrvDir = ${PREFIX}/sbin
-! cannaLibDir = ${PREFIX}/lib/canna
-! cannaManDir = ${PREFIX}/man
-! cannaIncDir = ${PREFIX}/include/canna
-! libCannaDir = ${PREFIX}/lib
-  
-! ErrDir  = /var/log
-! LockDir = /var/run
-  
-  wcharDefinition = -DCANNA_WCHAR
-  Wlib =
-***************
-*** 135,141 ****
-  
-  pointerIntegerDef =
-  
-! cannaDsoRev = 1
-  sharedLibExtension = so.$(cannaDsoRev)
-  
-  /* 以下の３つは root にならないでインストールするのであれば echo に
---- 135,141 ----
-  
-  pointerIntegerDef =
-  
-! cannaDsoRev = 1.0
-  sharedLibExtension = so.$(cannaDsoRev)
-  
-  /* 以下の３つは root にならないでインストールするのであれば echo に
-***************
-*** 145,151 ****
-  CHMOD = chmod
-  
-  /* 日本語マニュアルを使わないのであればコメントアウト */
-! #define JAPANESEMAN
-  
-  /* locale ディレクトリを持っている場合は以下を記述する */
-  /* #define LOCALE_DIR /usr/lib/locale */
---- 145,151 ----
-  CHMOD = chmod
-  
-  /* 日本語マニュアルを使わないのであればコメントアウト */
-! /* #define JAPANESEMAN */
-  
-  /* locale ディレクトリを持っている場合は以下を記述する */
-  /* #define LOCALE_DIR /usr/lib/locale */
-***************
-*** 178,184 ****
-  #define UseInstalledLibCanna NO
-  
-  DicDir   = $(cannaLibDir)/dic
-! LockFile = .CANNALOCK
-  
-  #ifdef NeXT
-  #define NO_X_ENV
---- 178,184 ----
-  #define UseInstalledLibCanna NO
-  
-  DicDir   = $(cannaLibDir)/dic
-! LockFile = Canna.pid
-  
-  #ifdef NeXT
-  #define NO_X_ENV
-***************
-*** 311,323 ****
-  #endif
-  #define InstallLibManPageAliases(file,destdir,aliases)			@@\
-  install.man::								@@\
-!         @(TMP=/tmp/tmp.$$$$; \						@@\
-!         $(RM) $${TMP}; \						@@\
-!         echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-!         for i in aliases; do (set -x; \					@@\
-!         $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-!         done; \								@@\
-!         $(RM) $${TMP})
-  #ifndef MakeDirectoriesLong
-  #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
-  step::									@@\
---- 311,323 ----
-  #endif
-  #define InstallLibManPageAliases(file,destdir,aliases)			@@\
-  install.man::								@@\
-! 	@(TMP=/tmp/tmp.$$$$; \						@@\
-! 	$(RM) $${TMP}; \						@@\
-! 	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-! 	for i in aliases; do (set -x; \					@@\
-! 	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-! 	done; \								@@\
-! 	$(RM) $${TMP})
-  #ifndef MakeDirectoriesLong
-  #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
-  step::									@@\
+--- Canna.conf.orig	Wed Apr 12 22:15:03 1995
++++ Canna.conf	Fri Oct 17 23:05:25 1997
+@@ -114,15 +114,15 @@
+  * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
+  */
+ 
+-cannaBinDir = /usr/local/canna/bin
+-cannaSrvDir = /usr/local/canna/bin
+-cannaLibDir = /usr/local/canna/lib
+-cannaManDir = /usr/local/canna/man
+-cannaIncDir = /usr/local/canna/include/canna
+-libCannaDir = /usr/lib
++cannaBinDir = ${PREFIX}/bin
++cannaSrvDir = ${PREFIX}/sbin
++cannaLibDir = ${PREFIX}/lib/canna
++cannaManDir = ${PREFIX}/man
++cannaIncDir = ${PREFIX}/include/canna
++libCannaDir = ${PREFIX}/lib
+ 
+-ErrDir  = /usr/spool/canna
+-LockDir = /usr/spool/canna/lock
++ErrDir  = /var/log
++LockDir = /var/run/canna
+ 
+ wcharDefinition = -DCANNA_WCHAR
+ Wlib =
+@@ -135,7 +135,7 @@
+ 
+ pointerIntegerDef =
+ 
+-cannaDsoRev = 1
++cannaDsoRev = 1.0
+ sharedLibExtension = so.$(cannaDsoRev)
+ 
+ /* 以下の３つは root にならないでインストールするのであれば echo に
+@@ -145,7 +145,7 @@
+ CHMOD = chmod
+ 
+ /* 日本語マニュアルを使わないのであればコメントアウト */
+-#define JAPANESEMAN
++/* #define JAPANESEMAN */
+ 
+ /* locale ディレクトリを持っている場合は以下を記述する */
+ /* #define LOCALE_DIR /usr/lib/locale */
+@@ -178,7 +178,7 @@
+ #define UseInstalledLibCanna NO
+ 
+ DicDir   = $(cannaLibDir)/dic
+-LockFile = .CANNALOCK
++LockFile = Canna.pid
+ 
+ #ifdef NeXT
+ #define NO_X_ENV
+@@ -311,13 +311,13 @@
+ #endif
+ #define InstallLibManPageAliases(file,destdir,aliases)			@@\
+ install.man::								@@\
+-        @(TMP=/tmp/tmp.$$$$; \						@@\
+-        $(RM) $${TMP}; \						@@\
+-        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
+-        for i in aliases; do (set -x; \					@@\
+-        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
+-        done; \								@@\
+-        $(RM) $${TMP})
++	@(TMP=/tmp/tmp.$$$$; \						@@\
++	$(RM) $${TMP}; \						@@\
++	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
++	for i in aliases; do (set -x; \					@@\
++	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
++	done; \								@@\
++	$(RM) $${TMP})
+ #ifndef MakeDirectoriesLong
+ #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
+ step::									@@\
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index 07733dadef4f..ed3231f1319c 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -178,9 +178,12 @@ man/man3/cannalib.3.gz
 man/man3/uilib.3.gz
 sbin/cannakill
 sbin/cannaserver
+@exec mkdir /var/run/canna
+@exec chown bin.bin /var/run/canna
 @exec chown bin.bin %D/lib/canna/dic/canna
 @exec chmod 775 %D/lib/canna/dic/canna
 @exec chown bin.bin %D/lib/canna/dic
 @exec chmod 775 %D/lib/canna/dic
 @exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user
+@dirrm /var/run/canna