4 files changed, 40 insertions, 64 deletions

diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index 444a5a96d589..158aa2db99f7 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -8,24 +8,31 @@
 
 DISTNAME=	xshisen-1.36
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.win.or.jp/pub/doc-sources/fj.sources/1996/feb/
+MASTER_SITES=	http://www.techfirm.co.jp/~masaoki/
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 # runs fine on ssh connection
 #IS_INTERACTIVE=	YES	# Has to create an app-defaults file
-USE_X_PREFIX=	YES
-GNU_CONFIGURE=	YES
-#CONFIGURE_ARGS=--enable-japanese=euc	#Japanese char set euc, jis sjis
-MAN6=		xshisen.6
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LIBS="-lxpg4"
+CONFIGURE_ARGS=	--datadir="${X11BASE}/lib/X11" \
+		--enable-japanese=euc	#Japanese char set euc, jis sjis
 
-INSTALL_TARGET=	install install.man
+MANLANG=	"" ja
+MAN6=		xshisen.6
 
 post-install:
-	@ strip ${PREFIX}/bin/xshisen
-	@ ${CHMOD} 755 ${PREFIX}/bin/xshisen
-	@ ${CHOWN} ${BINOWN}.${BINGRP} ${PREFIX}/bin/xshisen
+	@${CHOWN} games:games ${PREFIX}/bin/xshisen
+	@${CHMOD} 2555 ${PREFIX}/bin/xshisen
+	@${CHOWN} games: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 \
+	  > ${WRKSRC}/xshisen.jman
+	${INSTALL_MAN} ${WRKSRC}/xshisen.jman ${PREFIX}/man/ja/man6/xshisen.6
 
 .include <bsd.port.mk>
diff --git a/games/xshisen/files/patch-aa b/games/xshisen/files/patch-aa
index 91bf2f8fcec1..fec6aebab785 100644
--- a/games/xshisen/files/patch-aa
+++ b/games/xshisen/files/patch-aa
@@ -1,55 +1,20 @@
---- configure.orig	Tue Feb 27 06:29:29 1996
-+++ configure	Sun Sep 27 16:15:59 1998
-@@ -9,9 +9,9 @@
+--- configure.orig	Tue Feb 27 21:29:29 1996
++++ configure	Sun Oct 10 17:49:35 1999
+@@ -1593,7 +1593,7 @@
+ CPPFLAGS="${CPPFLAGS} -DLIB_DIR=\\\"\$(XSHISENLIB)\\\""
  
- # Defaults:
- ac_help=
--ac_default_prefix=/usr/local
-+ac_default_prefix=/usr/X11R6
- # Any additions from configure.in:
--ac_default_prefix=/usr/local
-+ac_default_prefix=/usr/X11R6
- ac_help="$ac_help
-   --with-x                use the X Window System"
- ac_help="$ac_help
-@@ -53,7 +53,7 @@
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datadir='${prefix}/lib/X11'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
-@@ -1370,7 +1370,11 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  LIBS="-lXt -lX11 $LIBS"
-+  if [ "$PORTOBJFORMAT" = "elf" ]; then
-+    LIBS="-lXpm -lXaw -lXt -lX11 $LIBS"
-+  else
-+    LIBS="-lXt -lX11 $LIBS"
-+  fi
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -1577,13 +1581,13 @@
- 
- 
- # Check whether --enable-japanese or --disable-japanese was given.
--if test "${enable_japanese+set}" = set; then
--  enableval="$enable_japanese"
--  cat >> confdefs.h <<EOF
-+#if test "${enable_japanese+set}" = set; then
-+#  enableval="$enable_japanese"
-+#  cat >> confdefs.h <<EOF
- #define KANJICODE "${enable_japanese}"
--EOF
-+#EOF
- 
--fi
-+#fi
- 
- 
- cat >> confdefs.h <<\EOF
+ for i in ${mandir} /usr/share/man /usr/man /usr/local/man; do
+-  for j in japanese japan ja ja_JP ja_JP.eucJP ja_JP.SJIS; do
++  for j in a_JP.EUC ja_JP.SJIS ja_JP.JIS7; do
+     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/pkg-descr b/games/xshisen/pkg-descr
index ade7f587dc06..6fdccf90598b 100644
--- a/games/xshisen/pkg-descr
+++ b/games/xshisen/pkg-descr
@@ -4,3 +4,5 @@ xshisen - Shisen-sho puzzle game for X11
        xshisen  is  a puzzle game for X11.  Similar to the famous
        "Shang-hai", your objective is to remove all the pieces on
        the board.
+
+WWW: http://www.techfirm.co.jp/~masaoki/xshisen.html
diff --git a/games/xshisen/pkg-plist b/games/xshisen/pkg-plist
index 586d29a58e6c..925c99798af7 100644
--- a/games/xshisen/pkg-plist
+++ b/games/xshisen/pkg-plist
@@ -37,4 +37,6 @@ 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
 @dirrm lib/X11/xshisen