Fix and updates from KATO Tsuguru.

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

5 files changed, 60 insertions, 18 deletions

diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index a8edab055d30..ef5a8d654475 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -1,27 +1,31 @@
-# New ports collection makefile for:   xdeblock
-# Version required:    v1.0
-# Date created:        28 December 1996
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# New ports collection makefile for:	xdeblock
+# Version required:	1.0
+# Date created:		28 December 1996
+# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xdeblo_v1.0
+DISTNAME=	xdeblock
 PKGNAME=	xdeblock-1.0
 CATEGORIES=	games
-MASTER_SITES=	ftp://www.vector.co.jp/pack/unix/game/action/block/
-DISTFILES=	xdeblock.tgz
+MASTER_SITES=	ftp://ftp.vector.co.jp/pack/unix/game/action/block/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
+WRKSRC=		${WRKDIR}/xdeblo_v1.0
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdeblo ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/lib/X11/xdeblock/mapf
+	@${MKDIR} ${PREFIX}/lib/X11/xdeblock/mapf
 	${CHMOD} 777 ${PREFIX}/lib/X11/xdeblock/mapf
 	${INSTALL_DATA} ${WRKSRC}/mapf/*.txt ${PREFIX}/lib/X11/xdeblock/mapf
 
diff --git a/games/xdeblock/files/patch-aa b/games/xdeblock/files/patch-aa
index ebeda5855280..fd5cbc10e1aa 100644
--- a/games/xdeblock/files/patch-aa
+++ b/games/xdeblock/files/patch-aa
@@ -1,5 +1,5 @@
-*** Imakefile.orig	Sat Jan 25 23:26:41 1997
---- Imakefile	Sat Jan 25 23:31:45 1997
+*** Imakefile.orig	Sat Nov 16 13:06:36 1996
+--- Imakefile	Thu Jan 15 00:00:00 2000
 ***************
 *** 10,16 ****
   XCOMM    Set xdeblock working directory.
@@ -13,7 +13,7 @@
   XCOMM    Set xdeblock working directory.
   XCOMM =====================================================================
   
-!     XDEBLO_DIR = /usr/X11R6/lib/X11/xdeblock
+!     XDEBLO_DIR = $(LIBDIR)/xdeblock
   
   XCOMM =====================================================================
   XCOMM    Set xpm.
@@ -31,8 +31,8 @@
   XCOMM         abc% find /usr -name xpm.h -print
   XCOMM =====================================================================
    
-!     XPM_INC 			= -I/usr/X11R6/include/X11
-!     XPMLIB_DIR 			= -L/usr/X11R6/lib
+!     XPM_INC 			= -I$(INCDIR)/X11
+!     XPMLIB_DIR 			= -L$(USRLIBDIR)
   
   XCOMM =====================================================================
   
diff --git a/games/xdeblock/files/patch-ab b/games/xdeblock/files/patch-ab
index 07dd0937db43..d73228060bd5 100644
--- a/games/xdeblock/files/patch-ab
+++ b/games/xdeblock/files/patch-ab
@@ -1,5 +1,5 @@
-*** main.c.orig	Sat Nov 16 05:37:16 1996
---- main.c	Wed Mar  5 03:11:37 1997
+*** main.c.orig	Sat Nov 16 14:37:16 1996
+--- main.c	Thu Jan 15 00:00:00 2000
 ***************
 *** 66,72 ****
     /***  set s_map  ***/
@@ -13,7 +13,7 @@
     /***  set s_map  ***/
     gameMainFlg.s_map = False;
     nowDataRec.nowMap.gameSpeed = 90;
-!   strcpy(nowDataRec.nowMap.dirname, "/usr/X11R6/lib/X11/xdeblock/mapf");
+!   strcpy(nowDataRec.nowMap.dirname, "%%PREFIX%%/lib/X11/xdeblock/mapf");
   
     for(i =1; i  < argc; i++)
       {
diff --git a/games/xdeblock/files/patch-ac b/games/xdeblock/files/patch-ac
new file mode 100644
index 000000000000..d89daf31ed13
--- /dev/null
+++ b/games/xdeblock/files/patch-ac
@@ -0,0 +1,36 @@
+*** dialog.c.orig	Sat Nov 16 14:37:15 1996
+--- dialog.c	Fri Jan 15 00:00:00 2000
+***************
+*** 8,14 ****
+  
+  #include        <sys/types.h>
+  #include        <sys/stat.h>
+! #include        <sys/dir.h>
+  
+  #include 	"gameheader.h"
+  
+--- 8,14 ----
+  
+  #include        <sys/types.h>
+  #include        <sys/stat.h>
+! #include        <dirent.h>
+  
+  #include 	"gameheader.h"
+  
+***************
+*** 430,436 ****
+       char    *fflag;
+  {
+    DIR           *dp;
+!   struct direct *dir;
+    struct stat   sbuf;
+    char          newname[256];
+    register      i = 0;
+--- 430,436 ----
+       char    *fflag;
+  {
+    DIR           *dp;
+!   struct dirent *dir;
+    struct stat   sbuf;
+    char          newname[256];
+    register      i = 0;
diff --git a/games/xdeblock/pkg-descr b/games/xdeblock/pkg-descr
index 219b96148f0e..0741bf4d0f56 100644
--- a/games/xdeblock/pkg-descr
+++ b/games/xdeblock/pkg-descr
@@ -6,8 +6,10 @@ USAGE:
 	and push PLAY button in the window.
 
 ENVIRONMENT:
-	You need 256 or more colors, 840x600 or more window, and enough memory.
+	You need 256 or more colors, 800x600 or more window, and enough memory.
 
 AUTHOR:
-	e-mail: QYI03211@niftyserve.or.jp
+	e-mail: usapato@anet.ne.jp
 	Takuto Okuno
+
+WWW: http://hp.vector.co.jp/authors/VA008796/xdeblo.html