From owner-ports-jp@jp.freebsd.org  Fri Oct 17 23:17:40 1997
Received: by jaz.jp.freebsd.org (8.8.7+2.7Wbeta7/8.7.3) id XAA03963
	Fri, 17 Oct 1997 23:17:40 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.7+2.7Wbeta7/8.7.3) with ESMTP id XAA03958
	for <ports-jp@jp.freebsd.org>; Fri, 17 Oct 1997 23:17:37 +0900 (JST)
From: itojun@itojun.org
Received: from localhost (itojun@localhost.itojun.org [127.0.0.1])
	by coconut.itojun.org (8.8.5/3.6Wbeta6) with ESMTP id XAA06903
	for <ports-jp@jp.freebsd.org>; Fri, 17 Oct 1997 23:17:36 +0900 (JST)
To: ports-jp@jp.freebsd.org
In-reply-to: itojun's message of Fri, 17 Oct 1997 22:57:56 JST.
      <6322.877096676@coconut.itojun.org> 
X-Template-Reply-To: itojun@itojun.org
X-Template-Return-Receipt-To: itojun@itojun.org
X-PGP-Fingerprint: F8 24 B4 2C 8C 98 57 FD  90 5F B4 60 79 54 16 E2
Date: Fri, 17 Oct 1997 23:17:36 +0900
Message-ID: <6899.877097856@coconut.itojun.org>
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=20]
X-Sequence: ports-jp 1846
Subject: [ports-jp 1846] Re: [2.2.5] ja-Canna and /var/run directory owner
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org


>	/var/run/canna$B7!$C$F$=$3$O(Bbin$B$N;}$A$b$N$K$9$k$N(B($B$G(BLockDir$B$rJQ$($k(B)
>	$B$G$O%@%a(B?  $B4E4E$G$9$+(B?

	$B$3$l$G$OB-$j$J$$(B?
	patch-ac$B$,GI<j$KJQ$o$C$?$h$&$K8+$($^$9$,!"$3$l$O(Bcontext-diff$B$+$i(B
	unified diff$B$K$7$?$+$i$G$9!#(B

itojun@$B%F%9%H$*$M$,$$$7$^$9(B...


---
? work
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/Canna/Makefile,v
retrieving revision 1.17
diff -c -r1.17 Makefile
*** Makefile	1997/09/14 21:34:28	1.17
--- Makefile	1997/10/17 14:15:00
***************
*** 10,17 ****
  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/
  
  MAINTAINER=	max@FreeBSD.ORG
  
--- 10,16 ----
  DISTNAME=	Canna32p2
  PKGNAME=	ja-Canna-3.2.2
  CATEGORIES=	japanese
! MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
  
  MAINTAINER=	max@FreeBSD.ORG
  
***************
*** 33,38 ****
--- 32,41 ----
  	RkCvtZen.3 RkMapPhonogram.3 RkMapRoma.3 RkOpenRoma.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
Index: patches/patch-ac
===================================================================
RCS file: /home/ncvs/ports/japanese/Canna/patches/patch-ac,v
retrieving revision 1.2
diff -c -r1.2 patch-ac
*** patch-ac	1996/10/31 05:06:27	1.2
--- patch-ac	1997/10/17 14:15:00
***************
*** 1,115 ****
! *** Canna.conf.orig	Wed Apr 12 22:15:03 1995
! --- Canna.conf	Thu Oct 31 13:47:39 1996
! ***************
! *** 114,128 ****
!    * $Id: patch-ac,v 1.2 1996/10/31 05:06:27 max 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: patch-ac,v 1.2 1996/10/31 05:06:27 max 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)
!   
!   /* $B0J2<$N#3$D$O(B root $B$K$J$i$J$$$G%$%s%9%H!<%k$9$k$N$G$"$l$P(B echo $B$K(B
! --- 135,141 ----
!   
!   pointerIntegerDef =
!   
! ! cannaDsoRev = 1.0
!   sharedLibExtension = so.$(cannaDsoRev)
!   
!   /* $B0J2<$N#3$D$O(B root $B$K$J$i$J$$$G%$%s%9%H!<%k$9$k$N$G$"$l$P(B echo $B$K(B
! ***************
! *** 145,151 ****
!   CHMOD = chmod
!   
!   /* $BF|K\8l%^%K%e%"%k$r;H$o$J$$$N$G$"$l$P%3%a%s%H%"%&%H(B */
! ! #define JAPANESEMAN
!   
!   /* locale $B%G%#%l%/%H%j$r;}$C$F$$$k>l9g$O0J2<$r5-=R$9$k(B */
!   /* #define LOCALE_DIR /usr/lib/locale */
! --- 145,151 ----
!   CHMOD = chmod
!   
!   /* $BF|K\8l%^%K%e%"%k$r;H$o$J$$$N$G$"$l$P%3%a%s%H%"%&%H(B */
! ! /* #define JAPANESEMAN */
!   
!   /* locale $B%G%#%l%/%H%j$r;}$C$F$$$k>l9g$O0J2<$r5-=R$9$k(B */
!   /* #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::									@@\
--- 1,74 ----
! --- 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)
!  
!  /* $B0J2<$N#3$D$O(B root $B$K$J$i$J$$$G%$%s%9%H!<%k$9$k$N$G$"$l$P(B echo $B$K(B
! @@ -145,7 +145,7 @@
!  CHMOD = chmod
!  
!  /* $BF|K\8l%^%K%e%"%k$r;H$o$J$$$N$G$"$l$P%3%a%s%H%"%&%H(B */
! -#define JAPANESEMAN
! +/* #define JAPANESEMAN */
!  
!  /* locale $B%G%#%l%/%H%j$r;}$C$F$$$k>l9g$O0J2<$r5-=R$9$k(B */
!  /* #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::									@@\
Index: pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/japanese/Canna/pkg/PLIST,v
retrieving revision 1.7
diff -c -r1.7 PLIST
*** PLIST	1996/11/18 11:22:41	1.7
--- PLIST	1997/10/17 14:15:00
***************
*** 178,186 ****
--- 178,189 ----
  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
