From owner-ports-jp@jp.FreeBSD.org Mon May 13 01:39:48 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g4CGdmN03412;
	Mon, 13 May 2002 01:39:48 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from mistral.imasy.or.jp (Q127097.ppp.dion.ne.jp [61.204.127.97])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id g4CGddf03406
	for <ports-jp@jp.FreeBSD.org>; Mon, 13 May 2002 01:39:39 +0900 (JST)
	(envelope-from mistral@imasy.or.jp)
Received: from mistral.imasy.or.jp (localhost [IPv6:::1])
	by mistral.imasy.or.jp (8.12.3/8.12.3/mistral) with ESMTP id g4CGd89W047008
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <ports-jp@jp.FreeBSD.org>; Mon, 13 May 2002 01:39:11 +0900 (JST)
	(envelope-from mistral@imasy.or.jp)
Received: (from sarumaru@localhost)
	by mistral.imasy.or.jp (8.12.3/8.12.2/Submit) id g4CGd37T047007;
	Mon, 13 May 2002 01:39:03 +0900 (JST)
	(envelope-from sarumaru)
From: mistral@imasy.or.jp (Yoshihiko SARUMARU)
To: ports-jp@jp.FreeBSD.org
In-Reply-To: Your message of "Mon, 07 Jan 2002 16:18:27 +0900".
	<200201070718.g077IRd07432@sakura.mk.bsdclub.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
X-Mailer: mnews [version 1.22PL5] 2001-02/07(Wed)
Date: Mon, 13 May 2002 01:39:03 +0900
Message-ID: <020513013903.M0143502@mistral.imasy.or.jp>
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+020417
X-Sequence: ports-jp 12777
Subject: [ports-jp 12777] Re: ja_JP.EUC -> ja_JP.eucJP
Errors-To: owner-ports-jp@jp.FreeBSD.org
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: mistral@imasy.or.jp

$B!!1n4]$G$9!#(B

2002-01-07($B7n(B) 16:18:27.$B:"!"(Bmotoyuki@bsdclub.org$B$5$s$O=q$-$^$7$?!#(B

>   $B%j%=!<%9%U%!%$%k$K$D$$$F$G$9$,!"<!$N$h$&$K$9$k$N$,$$$$$+$J$H9M(B
> $B$($F$$$^$9!#0U8+$,$"$l$P$h$m$7$/$*4j$$$7$^$9!#(B
> 
>    1.  $B%U%!%$%kK\BN$O(B /usr/X11R6/lib/X11/ja_JP.eucJP/APPNAME/ $B$K(B
>        $B%$%s%9%H!<%k$9$k!#(B
> 
>    2.  /usr/X11R6/lib/X11/ja_JP.EUC $B$H$$$&%G%#%l%/%H%j$r:n@.$9$k!#(B
> 
>    3.  cd /usr/X11R6/lib/X11/ja_JP.EUC
>        ln -s ../ja_JP.eucJP/APPNAME .
>        $B$r9T$&!#(B
> 
>    4.  PORTREVISION $B$r(B bump $B$9$k!#(B
> 
> $B4{$K%$%s%9%H!<%k$5$l$F$$$k%U%!%$%k$K$D$$$F(B ja_JP.EUC $B$N2<$+$i(B
> ja_JP.eucJP $B$X6/@)E*$K0\F0$9$k;EAH$_$r:n$k$N$O4m81$,H<$$$^$9!#0J(B
> $B>e$NJ}K!$G$"$l$P!"6/@)E*$K0\F0$9$k$3$H$J$7$K=y!9$K(B ja_JP.eucJP $B$K(B
> $B0\9T$G$-$k$O$:$G$9!#(B

  $B7k6I%j%j!<%9D>A0$K$J$C$F$7$^$$$^$7$?$,!"(Bdeskutils/xcalendar $B$r(B
ja_JP.eucJP $B$KBP1~$5$;$?$D$b$j$J$N$G%A%'%C%/$r$*4j$$$7$^$9!D!D!"(B
$B$H$$$$$D$D4{$K(B send-pr $B$7$F$7$^$C$?$N$G$9$,!#(B
# http://www.freebsd.org/cgi/query-pr.cgi?pr=37997 $B$G$9!#(B

  $B$h$m$7$/$*4j$$$7$^$9!#(B


diff -ur xcalendar.orig/Makefile xcalendar/Makefile
--- xcalendar.orig/Makefile	Sun Dec 30 01:49:51 2001
+++ xcalendar/Makefile	Sun May 12 23:52:35 2002
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcalendar
 PORTVERSION=	4.0.2002
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
 DISTNAME=	${PORTNAME}-4.0+i18n
diff -ur xcalendar.orig/files/patch-ad xcalendar/files/patch-ad
--- xcalendar.orig/files/patch-ad	Fri Jan  4 20:21:17 2002
+++ xcalendar/files/patch-ad	Mon May 13 00:55:51 2002
@@ -1,12 +1,15 @@
---- Imakefile.orig	Sun Oct  1 12:19:17 1995
-+++ Imakefile	Mon Mar 12 20:54:39 2001
-@@ -1,4 +1,5 @@
+--- /usr/ports/deskutils/xcalendar.orig/work/xcalendar/Imakefile	Sun Oct  1 12:19:17 1995
++++ Imakefile	Mon May 13 00:55:07 2002
+@@ -1,4 +1,8 @@
  XCALENDAR_LIBDIR = $(LIBDIR)/xcalendar
-+XCALENDAR_JP_LIBDIR = $(LIBDIR)/ja_JP.EUC/xcalendar
++XCALENDAR_JP_LIBDIR_EUCJP = $(LIBDIR)/ja_JP.eucJP/xcalendar
++XCALENDAR_JP_LIBDIR_EUC = $(LIBDIR)/ja_JP.EUC/xcalendar
++XCALENDAR_JP_APPDEFAULTS_EUCJP = $(LIBDIR)/ja_JP.eucJP/app-defaults
++XCALENDAR_JP_APPDEFAULTS_EUC = $(LIBDIR)/ja_JP.EUC/app-defaults
          LIBFILES = larrow.xbm qmark.xbm quit.xbm rarrow.xbm xcalendar.hlp
  # Comment out the following two lines for the Motif version
  LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-@@ -12,7 +13,7 @@
+@@ -12,7 +16,7 @@
  #
  # for Internationalization
  #
@@ -15,29 +18,41 @@
  ##if !SharedLibXwchar
  #       _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a)
  #       XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB))
-@@ -40,12 +41,26 @@
+@@ -40,12 +44,36 @@
  # for Internationalization
  #
  XCal-uj.ad: XCal-uj.sed
 -	sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_LIBDIR);'\
-+	sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR);'\
++	sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR_EUCJP);'\
 +	< $? \
 +	> $@
 +xcalendar-uj.hlp: $(FILESDIR)/xcalendar-uj.hlp.sed
-+	sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR);'\
++	sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR_EUCJP);'\
 +	< $? \
 +	> $@
 +xcalendar-uj.man: $(FILESDIR)/xcalendar-uj.man.sed
-+	sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR);'\
++	sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR_EUCJP);'\
  	< $? \
  	> $@
 -install:: XCal-uj.ad
+-	MakeDir($(LIBDIR)/ja_JP.EUC/app-defaults)
+-	$(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja_JP.EUC/app-defaults/XCalendar
 +install:: 
- 	MakeDir($(LIBDIR)/ja_JP.EUC/app-defaults)
- 	$(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja_JP.EUC/app-defaults/XCalendar
-+	MakeDir($(XCALENDAR_JP_LIBDIR))
-+	$(INSTALL) -c $(INSTAPPFLAGS) $(FILESDIR)/xcalendar-uj.hol $(XCALENDAR_JP_LIBDIR)/xcalendar.hol
-+	$(INSTALL) -c $(INSTAPPFLAGS) xcalendar-uj.hlp $(XCALENDAR_JP_LIBDIR)/xcalendar.hlp
++	MakeDir($(XCALENDAR_JP_APPDEFAULTS_EUCJP))
++	$(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad \
++		$(XCALENDAR_JP_APPDEFAULTS_EUCJP)/XCalendar
++	MakeDir($(XCALENDAR_JP_APPDEFAULTS_EUC))
++	$(LN) $(XCALENDAR_JP_APPDEFAULTS_EUCJP)/XCalendar \
++		$(XCALENDAR_JP_APPDEFAULTS_EUC)/
++
++	MakeDir($(XCALENDAR_JP_LIBDIR_EUCJP))
++	$(INSTALL) -c $(INSTAPPFLAGS) $(FILESDIR)/xcalendar-uj.hol \
++		$(XCALENDAR_JP_LIBDIR_EUCJP)/xcalendar.hol
++	$(INSTALL) -c $(INSTAPPFLAGS) xcalendar-uj.hlp \
++		$(XCALENDAR_JP_LIBDIR_EUCJP)/xcalendar.hlp
++	$(LN) $(XCALENDAR_JP_LIBDIR_EUCJP) \
++		$(XCALENDAR_JP_LIBDIR_EUC)
++
 +	$(INSTALL) -c $(INSTMANFLAGS) xcalendar-uj.man \
 +		$(MANPATH)/ja/man1/xcalendar.1
 +	$(COMPRESSMANCMD) $(MANPATH)/ja/man1/xcalendar.1
diff -ur xcalendar.orig/pkg-plist xcalendar/pkg-plist
--- xcalendar.orig/pkg-plist	Fri Jun 22 18:53:55 2001
+++ xcalendar/pkg-plist	Mon May 13 00:48:01 2002
@@ -1,14 +1,17 @@
 bin/xcalendar
 lib/X11/app-defaults/XCalendar
+lib/X11/ja_JP.eucJP/app-defaults/XCalendar
+lib/X11/ja_JP.eucJP/xcalendar/xcalendar.hol
+lib/X11/ja_JP.eucJP/xcalendar/xcalendar.hlp
 lib/X11/ja_JP.EUC/app-defaults/XCalendar
-lib/X11/ja_JP.EUC/xcalendar/xcalendar.hol
-lib/X11/ja_JP.EUC/xcalendar/xcalendar.hlp
+lib/X11/ja_JP.EUC/xcalendar
 lib/X11/xcalendar/larrow.xbm
 lib/X11/xcalendar/qmark.xbm
 lib/X11/xcalendar/quit.xbm
 lib/X11/xcalendar/rarrow.xbm
 lib/X11/xcalendar/xcalendar.hlp
 @dirrm lib/X11/xcalendar
-@dirrm lib/X11/ja_JP.EUC/xcalendar
-@unexec rmdir %D/lib/X11/ja_JP.EUC/app-defaults 2>/dev/null || true
-@unexec rmdir %D/lib/X11/ja_JP.EUC 2>/dev/null || true
+@dirrm lib/X11/ja_JP.eucJP/xcalendar
+@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null || true
+@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null || true
+@unexec rm %D/lib/X11/ja_JP.EUC 2>/dev/null || true
Only in xcalendar.orig/: work

--
$B1n4]K'I'(B (Yoshihiko SARUMARU)
mail: mistral@imasy.or.jp       web: http://www.imasy.or.jp/~mistral/
