Fix and updates from KATO Tsuguru.

Submitted by:		"KATO Tsuguru" <tkato@prontomail.ne.jp>

6 files changed, 30 insertions, 11 deletions

diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile
index bbfa6b0523fb..bc301db8a35b 100644
--- a/games/xsokoban/Makefile
+++ b/games/xsokoban/Makefile
@@ -1,7 +1,7 @@
-# New ports collection makefile for:   xsokoban
-# Version required:    3.3b
-# Date created:        16 November 1996
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# New ports collection makefile for:	xsokoban
+# Version required:	3.3c
+# Date created:		16 November 1996
+# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
@@ -19,6 +19,9 @@ WRKSRC=		${WRKDIR}/xsokoban
 ALL_TARGET=	xsokoban
 MAN1=		xsokoban.1
 
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h
+
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/xsokoban/scores \
 		${PREFIX}/lib/X11/xsokoban/bitmaps/defaults \
diff --git a/games/xsokoban/files/patch-aa b/games/xsokoban/files/patch-aa
index 89bc7c5a4fc1..355fb6bab0aa 100644
--- a/games/xsokoban/files/patch-aa
+++ b/games/xsokoban/files/patch-aa
@@ -1,5 +1,5 @@
-*** Imakefile.org	Sun Nov 17 15:36:02 1996
---- Imakefile	Sun Nov 17 15:36:36 1996
+*** Imakefile.orig	Wed Aug 28 02:34:41 1996
+--- Imakefile	Sat Jan 15 00:00:00 2000
 ***************
 *** 1,7 ****
   DEFINES=	-DNDEBUG
@@ -9,12 +9,11 @@
   # -lXpm is only needed if you are using Xpm.
   
   SRCS=		display.c main.c resources.c play.c score.c screen.c \
---- 1,8 ----
+--- 1,7 ----
   DEFINES=	-DNDEBUG
-! EXTRA_INCLUDES= -I/usr/local/include -I/usr/X11R6/include/X11 \
-! 		-I/usr/X11R6/include
+! EXTRA_INCLUDES= -I$(INCDIR)/X11
   
-! SYS_LIBRARIES=	-L/usr/local/lib -L/usr/X11R6/lib -lXpm $(XLIB)
+! SYS_LIBRARIES=	-lXpm $(XLIB)
   # -lXpm is only needed if you are using Xpm.
   
   SRCS=		display.c main.c resources.c play.c score.c screen.c \
diff --git a/games/xsokoban/files/patch-ab b/games/xsokoban/files/patch-ab
index 395b4a0875cf..32d94ebae589 100644
--- a/games/xsokoban/files/patch-ab
+++ b/games/xsokoban/files/patch-ab
@@ -13,7 +13,7 @@
   	    variable in the installed version, but you know best...
   */
   #ifndef ROOTDIR
-! #define ROOTDIR "/usr/X11R6/lib/X11/xsokoban"
+! #define ROOTDIR "%%PREFIX%%/lib/X11/xsokoban"
   #endif
   
   /*
diff --git a/games/xsokoban/files/patch-ad b/games/xsokoban/files/patch-ad
new file mode 100644
index 000000000000..b8f11957c8d8
--- /dev/null
+++ b/games/xsokoban/files/patch-ad
@@ -0,0 +1,14 @@
+*** externs.h.orig	Sun Apr 16 07:46:14 1995
+--- externs.h	Sat Jan 15 00:00:00 2000
+***************
+*** 5,11 ****
+--- 5,13 ----
+  #include <X11/Xresource.h>
+  #include <sys/stat.h>
+  #include <sys/types.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #ifdef NEED_NETINET_IN
+  #include <netinet/in.h>
diff --git a/games/xsokoban/pkg-descr b/games/xsokoban/pkg-descr
index b41e51b945e2..cab0254b2701 100644
--- a/games/xsokoban/pkg-descr
+++ b/games/xsokoban/pkg-descr
@@ -1,2 +1,4 @@
 XSokoban is a puzzle of pushing objects. This is the X-Window version of 
 'Sokoban', developed in Japan.
+
+WWW: http://xsokoban.lcs.mit.edu/xsokoban.html
diff --git a/games/xsokoban/pkg-plist b/games/xsokoban/pkg-plist
index 56027470a284..aaa42fd3158c 100644
--- a/games/xsokoban/pkg-plist
+++ b/games/xsokoban/pkg-plist
@@ -135,6 +135,7 @@ lib/X11/xsokoban/screens/screen.88
 lib/X11/xsokoban/screens/screen.89
 lib/X11/xsokoban/screens/screen.9
 lib/X11/xsokoban/screens/screen.90
+@unexec rm -f %D/lib/X11/xsokoban/scores/scores 2>/dev/null || true
 @dirrm lib/X11/xsokoban/bitmaps/defaults
 @dirrm lib/X11/xsokoban/bitmaps
 @dirrm lib/X11/xsokoban/saves