Unbreak.

Regen patches.

PR:		208708
Submitted by:	tkato432 yahoo com
Sponsored by:	Absolight

6 files changed, 74 insertions, 121 deletions

diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index e9bcd8dd8b32..0167023c60cb 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -3,29 +3,29 @@
 
 PORTNAME=	xdeblock
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	http://ftp.vector.co.jp/pack/unix/game/action/block/
+MASTER_SITES=	http://ftp.vector.co.jp/03/94/1328/
 DISTFILES=	${PORTNAME}.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Block action game
 
-BROKEN=		unfetchable
-
 WRKSRC=		${WRKDIR}/xdeblo_v1.0
 
 USES=		imake:noman
 USE_XORG=	xpm
+
 CFLAGS+=	-Wno-return-type
 
+DESKTOP_ENTRIES="XDeBlock" "" "" "xdeblo" "" ""
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xdeblo ${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
-	${CHMOD} 777 ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
 	(cd ${WRKSRC}/mapf && ${INSTALL_DATA} *.txt \
 		${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf)
 
diff --git a/games/xdeblock/files/patch-Imakefile b/games/xdeblock/files/patch-Imakefile
index 6abcf9a3c071..178ca5eb9b5e 100644
--- a/games/xdeblock/files/patch-Imakefile
+++ b/games/xdeblock/files/patch-Imakefile
@@ -1,57 +1,33 @@
-*** Imakefile.orig	1996-11-16 13:06:36.000000000 +0900
---- Imakefile	2011-04-15 01:51:45.000000000 +0900
-***************
-*** 10,16 ****
-  XCOMM    Set xdeblock working directory.
-  XCOMM =====================================================================
-  
-!     XDEBLO_DIR = .
-  
-  XCOMM =====================================================================
-  XCOMM    Set xpm.
---- 10,16 ----
-  XCOMM    Set xdeblock working directory.
-  XCOMM =====================================================================
-  
-!     XDEBLO_DIR = $(LIBDIR)/xdeblock
-  
-  XCOMM =====================================================================
-  XCOMM    Set xpm.
-***************
-*** 20,27 ****
-  XCOMM         abc% find /usr -name xpm.h -print
-  XCOMM =====================================================================
-   
-!     XPM_INC 			= -I/usr/include/X11
-!     XPMLIB_DIR 			= -L/usr/lib
-  
-  XCOMM =====================================================================
-  
---- 20,27 ----
-  XCOMM         abc% find /usr -name xpm.h -print
-  XCOMM =====================================================================
-   
-!     XPM_INC 			= -I$(INCDIR)/X11
-!     XPMLIB_DIR 			= -L$(USRLIBDIR)
-  
-  XCOMM =====================================================================
-  
-***************
-*** 46,53 ****
-  
-  PROGRAMS = xdeblo
-  
-! CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
-!          $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
-  
-  all:: $(PROGRAMS)
-  
---- 46,53 ----
-  
-  PROGRAMS = xdeblo
-  
-! CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
-!           $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
-  
-  all:: $(PROGRAMS)
-  
+--- Imakefile.orig	1996-11-16 04:06:36 UTC
++++ Imakefile
+@@ -10,7 +10,7 @@ XCOMM ==================================
+ XCOMM    Set xdeblock working directory.
+ XCOMM =====================================================================
+ 
+-    XDEBLO_DIR = .
++    XDEBLO_DIR = $(LIBDIR)/xdeblock
+ 
+ XCOMM =====================================================================
+ XCOMM    Set xpm.
+@@ -20,8 +20,8 @@ XCOMM    ex. 
+ XCOMM         abc% find /usr -name xpm.h -print
+ XCOMM =====================================================================
+  
+-    XPM_INC 			= -I/usr/include/X11
+-    XPMLIB_DIR 			= -L/usr/lib
++    XPM_INC 			= -I$(INCDIR)/X11
++    XPMLIB_DIR 			= -L$(USRLIBDIR)
+ 
+ XCOMM =====================================================================
+ 
+@@ -46,8 +46,8 @@ OBJS = main.o misc.o file.o dialog.o \
+ 
+ PROGRAMS = xdeblo
+ 
+-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
+-         $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
++CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
++          $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
+ 
+ all:: $(PROGRAMS)
+ 
diff --git a/games/xdeblock/files/patch-dialog.c b/games/xdeblock/files/patch-dialog.c
index d89daf31ed13..258d8ea64842 100644
--- a/games/xdeblock/files/patch-dialog.c
+++ b/games/xdeblock/files/patch-dialog.c
@@ -1,36 +1,20 @@
-*** 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;
+--- dialog.c.orig	1996-11-16 05:37:15 UTC
++++ dialog.c
+@@ -8,7 +8,7 @@
+ 
+ #include        <sys/types.h>
+ #include        <sys/stat.h>
+-#include        <sys/dir.h>
++#include        <dirent.h>
+ 
+ #include 	"gameheader.h"
+ 
+@@ -430,7 +430,7 @@ void checkdir(dirname,fname,fflag)
+      char    *fflag;
+ {
+   DIR           *dp;
+-  struct direct *dir;
++  struct dirent *dir;
+   struct stat   sbuf;
+   char          newname[256];
+   register      i = 0;
diff --git a/games/xdeblock/files/patch-gamemain.c b/games/xdeblock/files/patch-gamemain.c
index 9c2137f7f662..fb8ac4b8ddf7 100644
--- a/games/xdeblock/files/patch-gamemain.c
+++ b/games/xdeblock/files/patch-gamemain.c
@@ -1,6 +1,6 @@
---- gamemain.c.orig	Sat Nov 16 14:37:16 1996
-+++ gamemain.c	Mon Nov  3 15:30:25 2003
-@@ -793,14 +793,13 @@
+--- gamemain.c.orig	1996-11-16 05:37:16 UTC
++++ gamemain.c
+@@ -793,14 +793,13 @@ void stageScoreCheck(void)
  void openingString(void)
  {
    XRectangle   	tempRect;
@@ -18,7 +18,7 @@
      {
        /**  not yet clear map  **/
        drawShadowText(display,mWin,120,300,
-@@ -812,15 +811,15 @@
+@@ -812,15 +811,15 @@ void openingString(void)
  
        x = 120;
        drawShadowText(display,mWin,x,300,
diff --git a/games/xdeblock/files/patch-main.c b/games/xdeblock/files/patch-main.c
index d73228060bd5..0ee4800c3d14 100644
--- a/games/xdeblock/files/patch-main.c
+++ b/games/xdeblock/files/patch-main.c
@@ -1,19 +1,11 @@
-*** main.c.orig	Sat Nov 16 14:37:16 1996
---- main.c	Thu Jan 15 00:00:00 2000
-***************
-*** 66,72 ****
-    /***  set s_map  ***/
-    gameMainFlg.s_map = False;
-    nowDataRec.nowMap.gameSpeed = 90;
-!   nowDataRec.nowMap.dirname[0] == 0x00;
-  
-    for(i =1; i  < argc; i++)
-      {
---- 66,72 ----
-    /***  set s_map  ***/
-    gameMainFlg.s_map = False;
-    nowDataRec.nowMap.gameSpeed = 90;
-!   strcpy(nowDataRec.nowMap.dirname, "%%PREFIX%%/lib/X11/xdeblock/mapf");
-  
-    for(i =1; i  < argc; i++)
-      {
+--- main.c.orig	1996-11-16 05:37:16 UTC
++++ main.c
+@@ -66,7 +66,7 @@ int checkOption(argc,argv)
+   /***  set s_map  ***/
+   gameMainFlg.s_map = False;
+   nowDataRec.nowMap.gameSpeed = 90;
+-  nowDataRec.nowMap.dirname[0] == 0x00;
++  strcpy(nowDataRec.nowMap.dirname, "/usr/local/lib/X11/xdeblock/mapf");
+ 
+   for(i =1; i  < argc; i++)
+     {
diff --git a/games/xdeblock/pkg-plist b/games/xdeblock/pkg-plist
index f398c3087b09..d9e407ad4c12 100644
--- a/games/xdeblock/pkg-plist
+++ b/games/xdeblock/pkg-plist
@@ -4,3 +4,4 @@ lib/X11/xdeblock/mapf/hard.mapf.txt
 lib/X11/xdeblock/mapf/middle.mapf.txt
 lib/X11/xdeblock/mapf/odo.mapf.txt
 lib/X11/xdeblock/mapf/standard.mapf.txt
+@dir(,,777) lib/X11/xdeblock/mapf