Attachment #26790 for bug #45643

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

Lines 12-26 Link Here

(-)xshisen.new/Makefile (-3 / +16 lines)
12		12
13	MAINTAINER= nakai@FreeBSD.org	13	MAINTAINER= nakai@FreeBSD.org
14		14
		15	BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
		16
15	# runs fine on ssh connection	17	# runs fine on ssh connection
16	#IS_INTERACTIVE= YES # Has to create an app-defaults file	18	#IS_INTERACTIVE= YES # Has to create an app-defaults file
17	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
18	USE_XPM= yes	20	USE_XPM= yes
		21	USE_REINPLACE= yes
19	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
20	CONFIGURE_ENV= LIBS="-lxpg4"
21	CONFIGURE_ARGS= --datadir="${X11BASE}/lib/X11" \	23	CONFIGURE_ARGS= --datadir="${X11BASE}/lib/X11" \
22	--enable-japanese=euc #Japanese char set euc, jis sjis	24	--enable-japanese=euc #Japanese char set euc, jis sjis
23		25
		26	.include <bsd.port.pre.mk>
		27
		28	.if ${OSVERSION} >= 220000 && ${OSVERSION} < 400020 \|\| \
		29	${OSVERSION} >= 500000 && ${OSVERSION} < 500005
		30	CONFIGURE_ENV= LIBS="-lxpg4"
		31	.endif
		32
24	MANLANG= "" ja	33	MANLANG= "" ja
25	MAN6= xshisen.6	34	MAN6= xshisen.6
26		35
Lines 30-37 Link Here
30	@${CHOWN} root:games ${PREFIX}/lib/X11/xshisen/xshisen-scores	39	@${CHOWN} root:games ${PREFIX}/lib/X11/xshisen/xshisen-scores
31	@${CHMOD} 0660 ${PREFIX}/lib/X11/xshisen/xshisen-scores	40	@${CHMOD} 0660 ${PREFIX}/lib/X11/xshisen/xshisen-scores
32	${INSTALL_MAN} ${WRKSRC}/xshisen.man ${PREFIX}/man/man6/xshisen.6	41	${INSTALL_MAN} ${WRKSRC}/xshisen.man ${PREFIX}/man/man6/xshisen.6
33	@${PREFIX}/bin/xshisen -KCONV jis < ${WRKSRC}/xshisen.jman-jis \	42	@nkf -e < ${WRKSRC}/xshisen.jman-jis \
34	> ${WRKSRC}/xshisen.jman	43	> ${WRKSRC}/xshisen.jman
35	${INSTALL_MAN} ${WRKSRC}/xshisen.jman ${PREFIX}/man/ja/man6/xshisen.6	44	${INSTALL_MAN} ${WRKSRC}/xshisen.jman ${PREFIX}/man/ja/man6/xshisen.6
		45	-test -d ${PREFIX}/lib/X11/ja_JP.EUC/ -a \
		46	-d ${PREFIX}/lib/X11/ja_JP.EUC/app-defaults && \
		47	${LN} -s ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/XShisen \
		48	${PREFIX}/lib/X11/ja_JP.EUC/app-defaults && \
36		49
37	.include <bsd.port.mk>	50	.include <bsd.port.post.mk>




     if [ -d "$i/$j" ]; then
       JAPANESE="$j"
       break 2;
@@ -1603,7 +1603,7 @@
 case "${JAPANESE}" in
 j*) ;;
 *) if [ "${enable_japanese}" = "euc" ]; then
-     JAPANESE="ja_JP.eucJP"
+     JAPANESE="ja_JP.EUC"
    elif [ "${enable_japanese}" = "sjis" ]; then
      JAPANESE="ja_JP.SJIS"
    else

Lines 1-5 Link Here

(-)xshisen.new/files/patch-ac (-1 / +10 lines)
1	--- Makefile.in.orig Tue Jan 23 17:35:21 1996	1	--- Makefile.in.orig Tue Jan 23 17:35:21 1996
2	+++ Makefile.in Sun Nov 28 13:59:53 1999	2	+++ Makefile.in Sat Nov 9 17:18:47 2002
		3	@@ -39,7 +39,7 @@
		4	SCF = xshisen-scores
		5
		6	LIBS = @LIBS@
		7	-CODECONV = ./$(exec_name) -KCONV jis
		8	+CODECONV = (nkf -e \| sed 's/XSHISEN_VERSION/1.36/')
		9
		10	all: $(PROGS)
		11
3	@@ -64,6 +64,9 @@	12	@@ -64,6 +64,9 @@
4	$(INSTALLD) $$file $(XSHISENLIB)/`basename $$file`; \	13	$(INSTALLD) $$file $(XSHISENLIB)/`basename $$file`; \
5	done	14	done

Lines 37-43 Link Here

(-)xshisen.new/pkg-plist (-3 / +5 lines)
37	lib/X11/xshisen/sha.xpm	37	lib/X11/xshisen/sha.xpm
38	lib/X11/xshisen/ton.xpm	38	lib/X11/xshisen/ton.xpm
39	lib/X11/app-defaults/XShisen	39	lib/X11/app-defaults/XShisen
40	lib/X11/ja_JP.EUC/app-defaults/XShisen	40	lib/X11/ja_JP.eucJP/app-defaults/XShisen
41	@unexec rmdir %D/lib/X11/ja_JP.EUC/app-defaults 2>/dev/null \|\| true	41	@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null \|\| true
42	@unexec rmdir %D/lib/X11/ja_JP.EUC 2>/dev/null \|\| true	42	@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null \|\| true
43	@dirrm lib/X11/xshisen	43	@dirrm lib/X11/xshisen
		44	@exec [ -d %D/lib/X11/ja_JP.EUC/ -a -d %D/lib/X11/ja_JP.EUC/app-defaults ] && ln -s %D/lib/X11/ja_JP.eucJP/app-defaults/XShisen %D/lib/X11/ja_JP.EUC/app-defaults \|\| true
		45	@unexec rm %D/lib/X11/ja_JP.EUC/app-defaults/XShisen 2>/dev/null \|\| true

Return to bug 45643

Lines 9-20 Link Here

(-)xshisen.new/files/patch-aa (-9 lines)
9	if [ -d "$i/$j" ]; then	9	if [ -d "$i/$j" ]; then
10	JAPANESE="$j"	10	JAPANESE="$j"
11	break 2;	11	break 2;
12	@@ -1603,7 +1603,7 @@
13	case "${JAPANESE}" in
14	j*) ;;
15	*) if [ "${enable_japanese}" = "euc" ]; then
16	- JAPANESE="ja_JP.eucJP"
17	+ JAPANESE="ja_JP.EUC"
18	elif [ "${enable_japanese}" = "sjis" ]; then
19	JAPANESE="ja_JP.SJIS"
20	else