Attachment #21754 for bug #37997

View | Details | Raw Unified | Return to bug 37997
Collapse All | Expand All

Lines 7-12 Link Here

(-)xcalendar/Makefile (+1 lines)
7		7
8	PORTNAME= xcalendar	8	PORTNAME= xcalendar
9	PORTVERSION= 4.0.2002	9	PORTVERSION= 4.0.2002
		10	PORTREVISION= 1
10	CATEGORIES= deskutils	11	CATEGORIES= deskutils
11	MASTER_SITES= ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/	12	MASTER_SITES= ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
12	DISTNAME= ${PORTNAME}-4.0+i18n	13	DISTNAME= ${PORTNAME}-4.0+i18n




--- /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_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 +16,7 @@
 #
 # for Internationalization
 #

 ##if !SharedLibXwchar
 #       _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a)
 #       XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB))
@@ -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_EUCJP);'\
+	< $? \
+	> $@
+xcalendar-uj.hlp: $(FILESDIR)/xcalendar-uj.hlp.sed
+	sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR_EUCJP);'\
+	< $? \
+	> $@
+xcalendar-uj.man: $(FILESDIR)/xcalendar-uj.man.sed
+	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($(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




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
lib/X11/ja_JP.EUC/xcalendar/xcalendar.hlp
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.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

Return to bug 37997

Lines 1-12 Link Here

(-)xcalendar/files/patch-ad (-14 / +29 lines)
1	--- Imakefile.orig Sun Oct 1 12:19:17 1995	1	--- /usr/ports/deskutils/xcalendar.orig/work/xcalendar/Imakefile Sun Oct 1 12:19:17 1995
2	+++ Imakefile Mon Mar 12 20:54:39 2001	2	+++ Imakefile Mon May 13 00:55:07 2002
3	@@ -1,4 +1,5 @@	3	@@ -1,4 +1,8 @@
4	XCALENDAR_LIBDIR = $(LIBDIR)/xcalendar	4	XCALENDAR_LIBDIR = $(LIBDIR)/xcalendar
5	+XCALENDAR_JP_LIBDIR = $(LIBDIR)/ja_JP.EUC/xcalendar	5	+XCALENDAR_JP_LIBDIR_EUCJP = $(LIBDIR)/ja_JP.eucJP/xcalendar
		6	+XCALENDAR_JP_LIBDIR_EUC = $(LIBDIR)/ja_JP.EUC/xcalendar
		7	+XCALENDAR_JP_APPDEFAULTS_EUCJP = $(LIBDIR)/ja_JP.eucJP/app-defaults
		8	+XCALENDAR_JP_APPDEFAULTS_EUC = $(LIBDIR)/ja_JP.EUC/app-defaults
6	LIBFILES = larrow.xbm qmark.xbm quit.xbm rarrow.xbm xcalendar.hlp	9	LIBFILES = larrow.xbm qmark.xbm quit.xbm rarrow.xbm xcalendar.hlp
7	# Comment out the following two lines for the Motif version	10	# Comment out the following two lines for the Motif version
8	LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)	11	LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
9	@@ -12,7 +13,7 @@	12	@@ -12,7 +16,7 @@
10	#	13	#
11	# for Internationalization	14	# for Internationalization
12	#	15	#
Lines 15-43 Link Here
15	##if !SharedLibXwchar	18	##if !SharedLibXwchar
16	# _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a)	19	# _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a)
17	# XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB))	20	# XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB))
18	@@ -40,12 +41,26 @@	21	@@ -40,12 +44,36 @@
19	# for Internationalization	22	# for Internationalization
20	#	23	#
21	XCal-uj.ad: XCal-uj.sed	24	XCal-uj.ad: XCal-uj.sed
22	- sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_LIBDIR);'\	25	- sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_LIBDIR);'\
23	+ sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR);'\	26	+ sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR_EUCJP);'\
24	+ < $? \	27	+ < $? \
25	+ > $@	28	+ > $@
26	+xcalendar-uj.hlp: $(FILESDIR)/xcalendar-uj.hlp.sed	29	+xcalendar-uj.hlp: $(FILESDIR)/xcalendar-uj.hlp.sed
27	+ sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR);'\	30	+ sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR_EUCJP);'\
28	+ < $? \	31	+ < $? \
29	+ > $@	32	+ > $@
30	+xcalendar-uj.man: $(FILESDIR)/xcalendar-uj.man.sed	33	+xcalendar-uj.man: $(FILESDIR)/xcalendar-uj.man.sed
31	+ sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR);'\	34	+ sed 's;%%XCALENDAR_LIBDIR%%;$(XCALENDAR_JP_LIBDIR_EUCJP);'\
32	< $? \	35	< $? \
33	> $@	36	> $@
34	-install:: XCal-uj.ad	37	-install:: XCal-uj.ad
		38	- MakeDir($(LIBDIR)/ja_JP.EUC/app-defaults)
		39	- $(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja_JP.EUC/app-defaults/XCalendar
35	+install::	40	+install::
36	MakeDir($(LIBDIR)/ja_JP.EUC/app-defaults)	41	+ MakeDir($(XCALENDAR_JP_APPDEFAULTS_EUCJP))
37	$(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja_JP.EUC/app-defaults/XCalendar	42	+ $(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad \
38	+ MakeDir($(XCALENDAR_JP_LIBDIR))	43	+ $(XCALENDAR_JP_APPDEFAULTS_EUCJP)/XCalendar
39	+ $(INSTALL) -c $(INSTAPPFLAGS) $(FILESDIR)/xcalendar-uj.hol $(XCALENDAR_JP_LIBDIR)/xcalendar.hol	44	+ MakeDir($(XCALENDAR_JP_APPDEFAULTS_EUC))
40	+ $(INSTALL) -c $(INSTAPPFLAGS) xcalendar-uj.hlp $(XCALENDAR_JP_LIBDIR)/xcalendar.hlp	45	+ $(LN) $(XCALENDAR_JP_APPDEFAULTS_EUCJP)/XCalendar \
		46	+ $(XCALENDAR_JP_APPDEFAULTS_EUC)/
		47	+
		48	+ MakeDir($(XCALENDAR_JP_LIBDIR_EUCJP))
		49	+ $(INSTALL) -c $(INSTAPPFLAGS) $(FILESDIR)/xcalendar-uj.hol \
		50	+ $(XCALENDAR_JP_LIBDIR_EUCJP)/xcalendar.hol
		51	+ $(INSTALL) -c $(INSTAPPFLAGS) xcalendar-uj.hlp \
		52	+ $(XCALENDAR_JP_LIBDIR_EUCJP)/xcalendar.hlp
		53	+ $(LN) $(XCALENDAR_JP_LIBDIR_EUCJP) \
		54	+ $(XCALENDAR_JP_LIBDIR_EUC)
		55	+
41	+ $(INSTALL) -c $(INSTMANFLAGS) xcalendar-uj.man \	56	+ $(INSTALL) -c $(INSTMANFLAGS) xcalendar-uj.man \
42	+ $(MANPATH)/ja/man1/xcalendar.1	57	+ $(MANPATH)/ja/man1/xcalendar.1
43	+ $(COMPRESSMANCMD) $(MANPATH)/ja/man1/xcalendar.1	58	+ $(COMPRESSMANCMD) $(MANPATH)/ja/man1/xcalendar.1

Lines 1-14 Link Here

(-)xcalendar/pkg-plist (-5 / +8 lines)
1	bin/xcalendar	1	bin/xcalendar
2	lib/X11/app-defaults/XCalendar	2	lib/X11/app-defaults/XCalendar
		3	lib/X11/ja_JP.eucJP/app-defaults/XCalendar
		4	lib/X11/ja_JP.eucJP/xcalendar/xcalendar.hol
		5	lib/X11/ja_JP.eucJP/xcalendar/xcalendar.hlp
3	lib/X11/ja_JP.EUC/app-defaults/XCalendar	6	lib/X11/ja_JP.EUC/app-defaults/XCalendar
4	lib/X11/ja_JP.EUC/xcalendar/xcalendar.hol	7	lib/X11/ja_JP.EUC/xcalendar
5	lib/X11/ja_JP.EUC/xcalendar/xcalendar.hlp
6	lib/X11/xcalendar/larrow.xbm	8	lib/X11/xcalendar/larrow.xbm
7	lib/X11/xcalendar/qmark.xbm	9	lib/X11/xcalendar/qmark.xbm
8	lib/X11/xcalendar/quit.xbm	10	lib/X11/xcalendar/quit.xbm
9	lib/X11/xcalendar/rarrow.xbm	11	lib/X11/xcalendar/rarrow.xbm
10	lib/X11/xcalendar/xcalendar.hlp	12	lib/X11/xcalendar/xcalendar.hlp
11	@dirrm lib/X11/xcalendar	13	@dirrm lib/X11/xcalendar
12	@dirrm lib/X11/ja_JP.EUC/xcalendar	14	@dirrm lib/X11/ja_JP.eucJP/xcalendar
13	@unexec rmdir %D/lib/X11/ja_JP.EUC/app-defaults 2>/dev/null \|\| true	15	@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null \|\| true
14	@unexec rmdir %D/lib/X11/ja_JP.EUC 2>/dev/null \|\| true	16	@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null \|\| true
		17	@unexec rm %D/lib/X11/ja_JP.EUC 2>/dev/null \|\| true