Upgrade to 1.36. I used a different MASTER_SITE than the submitter

did, since there's been a routing loop to the DNS servers for the
MASTER_SITE in the PR for the last 5 days.

PR:		ports/2905
Submitted by:	Nakai@Mlab.t.u-tokyo.ac.jp

5 files changed, 107 insertions, 186 deletions

diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index 67476a394162..5fc307dd2d5d 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -1,15 +1,14 @@
 # New ports collection makefile for:   xshisen
-# Version required:           1.35
+# Version required:           1.36
 # Date created:               9 Oct 1996
 # Whom:                 Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/03/06 04:05:01 asami Exp $
+# $Id: Makefile,v 1.6 1997/03/06 04:54:41 asami Exp $
 #
 
-DISTNAME=       xshisen-1.35
+DISTNAME=       xshisen-1.36
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	games
+MASTER_SITES=	ftp://ftp.win.or.jp/pub/doc-sources/fj.sources/1996/feb/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
@@ -22,12 +21,11 @@ GNU_CONFIGURE=	YES
 #CONFIGURE_ARGS=--enable-japanese=euc	#Japanese char set euc, jis sjis
 MAN6=		xshisen.6
 
+INSTALL_TARGET=	install install.man
+
 post-install:
 	@ strip ${PREFIX}/bin/xshisen
 	@ /bin/chmod 755 ${PREFIX}/bin/xshisen
 	@ /usr/sbin/chown ${BINOWN}.${BINGRP} ${PREFIX}/bin/xshisen
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/ja_JP.JIS7/man6/xshisen.6
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/xshisen/distinfo b/games/xshisen/distinfo
index a9ce55f3647d..aede5175766c 100644
--- a/games/xshisen/distinfo
+++ b/games/xshisen/distinfo
@@ -1 +1 @@
-MD5 (xshisen-1.35.tar.gz) = 36c979ccb5b958b6ae1f3807a26ffabd
+MD5 (xshisen-1.36.tar.gz) = 3c3904ff99075012201a2f6a8d6a5beb
diff --git a/games/xshisen/files/patch-aa b/games/xshisen/files/patch-aa
index 7f456c0cecf8..0da6d3e00e28 100644
--- a/games/xshisen/files/patch-aa
+++ b/games/xshisen/files/patch-aa
@@ -1,51 +1,69 @@
-*** Makefile.in.orig	Tue Jan 23 08:35:21 1996
---- Makefile.in	Fri Oct 11 08:19:53 1996
+*** configure.orig	Tue Feb 27 21:29:29 1996
+--- configure	Sat Feb 22 23:12:20 1997
 ***************
-*** 39,52 ****
-  SCF   = xshisen-scores
+*** 9,17 ****
   
-  LIBS      = @LIBS@ 
-! CODECONV  = ./$(exec_name) -KCONV jis
+  # Defaults:
+  ac_help=
+! ac_default_prefix=/usr/local
+  # Any additions from configure.in:
+! ac_default_prefix=/usr/local
+  ac_help="$ac_help
+    --with-x                use the X Window System"
+  ac_help="$ac_help
+--- 9,17 ----
   
-  all: $(PROGS)
+  # Defaults:
+  ac_help=
+! ac_default_prefix=/usr/X11R6
+  # Any additions from configure.in:
+! ac_default_prefix=/usr/X11R6
+  ac_help="$ac_help
+    --with-x                use the X Window System"
+  ac_help="$ac_help
+***************
+*** 53,59 ****
+  bindir='${exec_prefix}/bin'
+  sbindir='${exec_prefix}/sbin'
+  libexecdir='${exec_prefix}/libexec'
+! datadir='${prefix}/share'
+  sysconfdir='${prefix}/etc'
+  sharedstatedir='${prefix}/com'
+  localstatedir='${prefix}/var'
+--- 53,59 ----
+  bindir='${exec_prefix}/bin'
+  sbindir='${exec_prefix}/sbin'
+  libexecdir='${exec_prefix}/libexec'
+! datadir='${prefix}/lib/X11'
+  sysconfdir='${prefix}/etc'
+  sharedstatedir='${prefix}/com'
+  localstatedir='${prefix}/var'
+***************
+*** 1577,1589 ****
   
-  $(exec_name): $(OBJS)
-  	$(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(exec_name)
   
-! install: $(PROGS) $(AD) $(ADJ)
-  	@echo "XShisen executable directory is " $(bindir)
-  	@$(MKDIR) $(bindir)
-  	@chmod 755 $(bindir)
---- 39,52 ----
-  SCF   = xshisen-scores
+  # Check whether --enable-japanese or --disable-japanese was given.
+! if test "${enable_japanese+set}" = set; then
+!   enableval="$enable_japanese"
+!   cat >> confdefs.h <<EOF
+  #define KANJICODE "${enable_japanese}"
+! EOF
   
-  LIBS      = @LIBS@ 
-! CODECONV  = ./$(exec_name) -KCONV euc
+! fi
   
-  all: $(PROGS)
   
-  $(exec_name): $(OBJS)
-  	$(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(exec_name)
+  cat >> confdefs.h <<\EOF
+--- 1577,1589 ----
   
-! install: $(PROGS) $(AD) $(ADJ) install.man
-  	@echo "XShisen executable directory is " $(bindir)
-  	@$(MKDIR) $(bindir)
-  	@chmod 755 $(bindir)
-***************
-*** 63,73 ****
---- 63,77 ----
-  	for file in pixmaps/*.xpm; do \
-  		$(INSTALLD) $$file $(XSHISENLIB)/`basename $$file`; \
-  	done
-+ 	@$(MKDIR) $(XAD_DIR)/$(class_name)
-+ 	@$(MKDIR) $(JXAD_DIR)/$(class_name)
-  	$(INSTALLD) $(AD) $(XAD_DIR)/$(class_name)
-  	$(INSTALLD) $(ADJ) $(JXAD_DIR)/$(class_name)
-  
-  install.man: $(exec_name).jman $(exec_name).man
-+ 	mkdir -p $(MANDIR)/man6
-  	$(INSTALLD) $(exec_name).man $(MANDIR)/man6/$(exec_name).6
-+ 	mkdir -p $(MANDIR)/$(JAPANESE)/man6
-  	$(INSTALLD) $(exec_name).jman $(MANDIR)/$(JAPANESE)/man6/$(exec_name).6
-  
-  clean:
+  
+  # Check whether --enable-japanese or --disable-japanese was given.
+! #if test "${enable_japanese+set}" = set; then
+! #  enableval="$enable_japanese"
+! #  cat >> confdefs.h <<EOF
+  #define KANJICODE "${enable_japanese}"
+! #EOF
+  
+! #fi
+  
+  
+  cat >> confdefs.h <<\EOF
diff --git a/games/xshisen/pkg-descr b/games/xshisen/pkg-descr
index 89cfdb2e91eb..a4bf34c86a05 100644
--- a/games/xshisen/pkg-descr
+++ b/games/xshisen/pkg-descr
@@ -3,98 +3,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.  
-
-       The game will over when you remove all the pieces  on  the
-       board.   The  pieces  can be removed only when both of the
-       following conditions are true.
-
-
-       (1) The 2 pieces have the same picture
-
-       (2) The 2 pieces can be connected with up to 3 lines which
-           do not go over other pieces.
-
-       It may seem difficult rule, but is easier than describing
-       in
-       words.  "Auto-demo" mode must be very useful  for  you  to
-       understand the rule.
-
-OPTIONS
-       The following command line options are available.
-
-       standard Xt options
-               xshisen  accepts  standard  toolkit  options  like
-               -display, or -iconic.
-
-       -demo   Auto-demo  mode.   You  cannot play game with this
-               mode, but the game will proceed by computer  auto-
-               mated  algorithm.   This  mode is quite useful for
-               you to understand rules.
-
-       -score  Just displays the best score dialog and exits.
-       -mag number
-               Magnify main window by number times.  The standard
-               window  will be 640x400.  Number may be a decimal,
-               but the range is limited from 0.5 to  the  display
-               size.
-
-       -fn fontlist
-               Use fontlist for menubar and times.
-
-       -large  Play  double sized game.  Game size can be changed
-               with menubar after you started xshisen.  Each game
-               size has independent best time records.
-
-       -huge   Play  quadruple  sized  game.   Game  size  can be
-               changed with menubar after  you  started  xshisen.
-               Each  game size has independent best time records.
-
-       -trial  Play as "Click Trial" mode.  You can measure  your
-               mouse operation speed with this feature.
-
-       -gravity
-               Enable  gravity  effect.  All the pieces above the
-               removed pieces will fall down.
-
-MENU BAR AND KEYBOARD
-       Start (Control + D)
-               Starts new game. The pieces are located at  random
-               position.
-
-       Restart (Control + R)
-               Restarts  the  current game. The time of restarted
-               game will not be recorded as the best score.
-
-       Pause (Control + P)
-               Pauses the game. The time count will  be  stopped,
-               but  also  the pieces picture will be hidden.  You
-               can resume your game to do "Pause" again.
-
-       Exit    Exits the Shisen-sho.
-
-       Search (F1)
-               Teaches the pair you can remove now.  You can  use
-               "Search"   anytime,  but  the  time  will  not  be
-               recorded as the best score  if  you  use  "Search"
-               even once.
-
-
-       Back (F5)
-               Backs  one step.  The time will not be recorded if
-               you use "Back".
-
-
-MOUSE CONTROL
-       The following mouse control is available.  You can  change
-       mouse  button  bindings  with XShisen*drawing.translations
-       resource.
-
-       Button 1
-               Specifies the piece to remove.  You can cencel the
-               selection when you click the selected piece again.
-
-       Button 3
-               Cancels the selected piece.  You can use button  3
-               after "Search", which cancels the search result.
+       the board.
 
diff --git a/games/xshisen/pkg-plist b/games/xshisen/pkg-plist
index 7baeff47e01c..2b4910cfdf38 100644
--- a/games/xshisen/pkg-plist
+++ b/games/xshisen/pkg-plist
@@ -1,43 +1,41 @@
 bin/xshisen
-share/xshisen/xshisen-scores
-share/xshisen/chun.xpm
-share/xshisen/haku.xpm
-share/xshisen/hana.xpm
-share/xshisen/hatsu.xpm
-share/xshisen/hishi.xpm
-share/xshisen/m1.xpm
-share/xshisen/m2.xpm
-share/xshisen/m3.xpm
-share/xshisen/m4.xpm
-share/xshisen/m5.xpm
-share/xshisen/m6.xpm
-share/xshisen/m7.xpm
-share/xshisen/m8.xpm
-share/xshisen/m9.xpm
-share/xshisen/nan.xpm
-share/xshisen/p1.xpm
-share/xshisen/p2.xpm
-share/xshisen/p3.xpm
-share/xshisen/p4.xpm
-share/xshisen/p5.xpm
-share/xshisen/p6.xpm
-share/xshisen/p7.xpm
-share/xshisen/p8.xpm
-share/xshisen/p9.xpm
-share/xshisen/pei.xpm
-share/xshisen/s1.xpm
-share/xshisen/s2.xpm
-share/xshisen/s3.xpm
-share/xshisen/s4.xpm
-share/xshisen/s5.xpm
-share/xshisen/s6.xpm
-share/xshisen/s7.xpm
-share/xshisen/s8.xpm
-share/xshisen/s9.xpm
-share/xshisen/sha.xpm
-share/xshisen/ton.xpm
-lib/X11/app-defaults/XShisen/XShisen.ad
-lib/X11/ja_JP.JIS7/app-defaults/XShisen/XShisen-j.ad
+lib/X11/xshisen/xshisen-scores
+lib/X11/xshisen/chun.xpm
+lib/X11/xshisen/haku.xpm
+lib/X11/xshisen/hana.xpm
+lib/X11/xshisen/hatsu.xpm
+lib/X11/xshisen/hishi.xpm
+lib/X11/xshisen/m1.xpm
+lib/X11/xshisen/m2.xpm
+lib/X11/xshisen/m3.xpm
+lib/X11/xshisen/m4.xpm
+lib/X11/xshisen/m5.xpm
+lib/X11/xshisen/m6.xpm
+lib/X11/xshisen/m7.xpm
+lib/X11/xshisen/m8.xpm
+lib/X11/xshisen/m9.xpm
+lib/X11/xshisen/nan.xpm
+lib/X11/xshisen/p1.xpm
+lib/X11/xshisen/p2.xpm
+lib/X11/xshisen/p3.xpm
+lib/X11/xshisen/p4.xpm
+lib/X11/xshisen/p5.xpm
+lib/X11/xshisen/p6.xpm
+lib/X11/xshisen/p7.xpm
+lib/X11/xshisen/p8.xpm
+lib/X11/xshisen/p9.xpm
+lib/X11/xshisen/pei.xpm
+lib/X11/xshisen/s1.xpm
+lib/X11/xshisen/s2.xpm
+lib/X11/xshisen/s3.xpm
+lib/X11/xshisen/s4.xpm
+lib/X11/xshisen/s5.xpm
+lib/X11/xshisen/s6.xpm
+lib/X11/xshisen/s7.xpm
+lib/X11/xshisen/s8.xpm
+lib/X11/xshisen/s9.xpm
+lib/X11/xshisen/sha.xpm
+lib/X11/xshisen/ton.xpm
 man/man6/xshisen.6.gz
-man/ja_JP.JIS7/man6/xshisen.6.gz
-@dirrm share/xshisen
+lib/X11/app-defaults/XShisen
+@dirrm lib/X11/xshisen