From 6c9f63d85675022c1327c4ec9b5926ec121029bf Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Sat, 23 Nov 2002 14:56:18 +0000 Subject: 1. This port haven't be corresponded to locale name for Japanese EUC environment ja_JP.EUC -> ja_JP.eucJP. This patch installs X resource file into ja_JP.eucJP/app-defaults instead of ja_JP.EUC/app-defaults, and then if ja_JP.EUC directory is exist, it will make a symlink from ja_JP.EUC/app-defaults to ja_JP.eucJP/app-defaults 2. This port execute xshisen, a X11 program, to convert KANJI code and VERSION string in resource files, and failed with 'Could not open display' error. This patch replace it with japanese/nkf to convert KANJI code (sorry for non-japanese people). 3. -lxpg4 is obsoleted and not required for newer environment. PR: ports/45643 Submitted by: Yoshihiko Sarumaru Approved by: maintainer timeout (2 months) --- games/xshisen/Makefile | 19 ++++++++++++++++--- games/xshisen/files/patch-aa | 9 --------- games/xshisen/files/patch-ac | 11 ++++++++++- games/xshisen/pkg-plist | 8 +++++--- 4 files changed, 31 insertions(+), 16 deletions(-) (limited to 'games/xshisen') diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile index b43a79d4021f..4e12cd619125 100644 --- a/games/xshisen/Makefile +++ b/games/xshisen/Makefile @@ -12,15 +12,24 @@ MASTER_SITES= http://www.techfirm.co.jp/~masaoki/ MAINTAINER= nakai@FreeBSD.org +BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf + # runs fine on ssh connection #IS_INTERACTIVE= YES # Has to create an app-defaults file USE_X_PREFIX= yes USE_XPM= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lxpg4" CONFIGURE_ARGS= --datadir="${X11BASE}/lib/X11" \ --enable-japanese=euc #Japanese char set euc, jis sjis +.include + +.if ${OSVERSION} >= 220000 && ${OSVERSION} < 400020 || \ + ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 +CONFIGURE_ENV= LIBS="-lxpg4" +.endif + MANLANG= "" ja MAN6= xshisen.6 @@ -30,8 +39,12 @@ post-install: @${CHOWN} root:games ${PREFIX}/lib/X11/xshisen/xshisen-scores @${CHMOD} 0660 ${PREFIX}/lib/X11/xshisen/xshisen-scores ${INSTALL_MAN} ${WRKSRC}/xshisen.man ${PREFIX}/man/man6/xshisen.6 - @${PREFIX}/bin/xshisen -KCONV jis < ${WRKSRC}/xshisen.jman-jis \ + @nkf -e < ${WRKSRC}/xshisen.jman-jis \ > ${WRKSRC}/xshisen.jman ${INSTALL_MAN} ${WRKSRC}/xshisen.jman ${PREFIX}/man/ja/man6/xshisen.6 + -test -d ${PREFIX}/lib/X11/ja_JP.EUC/ -a \ + -d ${PREFIX}/lib/X11/ja_JP.EUC/app-defaults && \ + ${LN} -s ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/XShisen \ + ${PREFIX}/lib/X11/ja_JP.EUC/app-defaults && \ -.include +.include diff --git a/games/xshisen/files/patch-aa b/games/xshisen/files/patch-aa index fec6aebab785..d3ed5829c04a 100644 --- a/games/xshisen/files/patch-aa +++ b/games/xshisen/files/patch-aa @@ -9,12 +9,3 @@ 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 diff --git a/games/xshisen/files/patch-ac b/games/xshisen/files/patch-ac index ccba545eb726..35bc8ad44e80 100644 --- a/games/xshisen/files/patch-ac +++ b/games/xshisen/files/patch-ac @@ -1,5 +1,14 @@ --- Makefile.in.orig Tue Jan 23 17:35:21 1996 -+++ Makefile.in Sun Nov 28 13:59:53 1999 ++++ Makefile.in Sat Nov 9 17:18:47 2002 +@@ -39,7 +39,7 @@ + SCF = xshisen-scores + + LIBS = @LIBS@ +-CODECONV = ./$(exec_name) -KCONV jis ++CODECONV = (nkf -e | sed 's/XSHISEN_VERSION/1.36/') + + all: $(PROGS) + @@ -64,6 +64,9 @@ $(INSTALLD) $$file $(XSHISENLIB)/`basename $$file`; \ done diff --git a/games/xshisen/pkg-plist b/games/xshisen/pkg-plist index e49ab21ce2fa..f9c3c41b1905 100644 --- a/games/xshisen/pkg-plist +++ b/games/xshisen/pkg-plist @@ -37,7 +37,9 @@ lib/X11/xshisen/s9.xpm lib/X11/xshisen/sha.xpm lib/X11/xshisen/ton.xpm lib/X11/app-defaults/XShisen -lib/X11/ja_JP.EUC/app-defaults/XShisen -@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 +lib/X11/ja_JP.eucJP/app-defaults/XShisen +@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 @dirrm lib/X11/xshisen +@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 +@unexec rm %D/lib/X11/ja_JP.EUC/app-defaults/XShisen 2>/dev/null || true -- cgit v1.2.3