Attachment #169203 for bug #208708

View | Details | Raw Unified | Return to bug 208708
Collapse All | Expand All





PORTNAME=	xdeblock
PORTVERSION=	1.0
PORTREVISION=	3
CATEGORIES=	games
MASTER_SITES=	http://ftp.vector.co.jp/03/94/1328/
DISTNAME=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Block action game

BROKEN=		unfetchable

WRKSRC=		${WRKDIR}/xdeblo_v1.0

USES=		imake:noman tar:tgz
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)


Lines 1-57 Link Here

(-)games/xdeblock/files/patch-Imakefile (-57 / +33 lines)
1	*** Imakefile.orig 1996-11-16 13:06:36.000000000 +0900	1	--- Imakefile.orig 1996-11-16 04:06:36 UTC
2	--- Imakefile 2011-04-15 01:51:45.000000000 +0900	2	+++ Imakefile
3	***************	3	@@ -10,7 +10,7 @@ XCOMM ==================================
4	* 10,16 **	4	XCOMM Set xdeblock working directory.
5	XCOMM Set xdeblock working directory.	5	XCOMM =====================================================================
6	XCOMM =====================================================================	6
7		7	- XDEBLO_DIR = .
8	! XDEBLO_DIR = .	8	+ XDEBLO_DIR = $(LIBDIR)/xdeblock
9		9
10	XCOMM =====================================================================	10	XCOMM =====================================================================
11	XCOMM Set xpm.	11	XCOMM Set xpm.
12	--- 10,16 ----	12	@@ -20,8 +20,8 @@ XCOMM ex.
13	XCOMM Set xdeblock working directory.	13	XCOMM abc% find /usr -name xpm.h -print
14	XCOMM =====================================================================	14	XCOMM =====================================================================
15		15
16	! XDEBLO_DIR = $(LIBDIR)/xdeblock	16	- XPM_INC = -I/usr/include/X11
17		17	- XPMLIB_DIR = -L/usr/lib
18	XCOMM =====================================================================	18	+ XPM_INC = -I$(INCDIR)/X11
19	XCOMM Set xpm.	19	+ XPMLIB_DIR = -L$(USRLIBDIR)
20	***************	20
21	* 20,27 **	21	XCOMM =====================================================================
22	XCOMM abc% find /usr -name xpm.h -print	22
23	XCOMM =====================================================================	23	@@ -46,8 +46,8 @@ OBJS = main.o misc.o file.o dialog.o \
24		24
25	! XPM_INC = -I/usr/include/X11	25	PROGRAMS = xdeblo
26	! XPMLIB_DIR = -L/usr/lib	26
27		27	-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
28	XCOMM =====================================================================	28	- $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
29		29	+CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
30	--- 20,27 ----	30	+ $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
31	XCOMM abc% find /usr -name xpm.h -print	31
32	XCOMM =====================================================================	32	all:: $(PROGRAMS)
33		33
34	! XPM_INC = -I$(INCDIR)/X11
35	! XPMLIB_DIR = -L$(USRLIBDIR)
36
37	XCOMM =====================================================================
38
39	***************
40	* 46,53 **
41
42	PROGRAMS = xdeblo
43
44	! CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
45	! $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
46
47	all:: $(PROGRAMS)
48
49	--- 46,53 ----
50
51	PROGRAMS = xdeblo
52
53	! CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
54	! $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
55
56	all:: $(PROGRAMS)
57




--- 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;
*** 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;

Lines 1-6 Link Here

(-)games/xdeblock/files/patch-gamemain.c (-4 / +4 lines)
1	--- gamemain.c.orig Sat Nov 16 14:37:16 1996	1	--- gamemain.c.orig 1996-11-16 05:37:16 UTC
2	+++ gamemain.c Mon Nov 3 15:30:25 2003	2	+++ gamemain.c
3	@@ -793,14 +793,13 @@	3	@@ -793,14 +793,13 @@ void stageScoreCheck(void)
4	void openingString(void)	4	void openingString(void)
5	{	5	{
6	XRectangle tempRect;	6	XRectangle tempRect;
Lines 18-24 Link Here
18	{	18	{
19	/ not yet clear map /	19	/ not yet clear map /
20	drawShadowText(display,mWin,120,300,	20	drawShadowText(display,mWin,120,300,
21	@@ -812,15 +811,15 @@	21	@@ -812,15 +811,15 @@ void openingString(void)
22		22
23	x = 120;	23	x = 120;
24	drawShadowText(display,mWin,x,300,	24	drawShadowText(display,mWin,x,300,




--- 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++)
     {
--- 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++)
      {

Lines 4-6 Link Here

(-)games/xdeblock/pkg-plist (+1 lines)
4	lib/X11/xdeblock/mapf/middle.mapf.txt	4	lib/X11/xdeblock/mapf/middle.mapf.txt
5	lib/X11/xdeblock/mapf/odo.mapf.txt	5	lib/X11/xdeblock/mapf/odo.mapf.txt
6	lib/X11/xdeblock/mapf/standard.mapf.txt	6	lib/X11/xdeblock/mapf/standard.mapf.txt
		7	@dir(,,777) lib/X11/xdeblock/mapf

Return to bug 208708

Lines 3-31 Link Here

(-)games/xdeblock/Makefile (-7 / +7 lines)
3		3
4	PORTNAME= xdeblock	4	PORTNAME= xdeblock
5	PORTVERSION= 1.0	5	PORTVERSION= 1.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= http://ftp.vector.co.jp/pack/unix/game/action/block/	8	MASTER_SITES= http://ftp.vector.co.jp/03/94/1328/
9	DISTFILES= ${PORTNAME}.tgz	9	DISTNAME= ${PORTNAME}
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Block action game	12	COMMENT= Block action game
13		13
14	BROKEN= unfetchable
15
16	WRKSRC= ${WRKDIR}/xdeblo_v1.0	14	WRKSRC= ${WRKDIR}/xdeblo_v1.0
17		15
18	USES= imake:noman	16	USES= imake:noman tar:tgz
19	USE_XORG= xpm	17	USE_XORG= xpm
		18
20	CFLAGS+= -Wno-return-type	19	CFLAGS+= -Wno-return-type
21		20
		21	DESKTOP_ENTRIES="XDeBlock" "" "" "xdeblo" "" ""
		22
22	post-patch:	23	post-patch:
23	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/main.c	24	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/main.c
24		25
25	do-install:	26	do-install:
26	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xdeblo ${STAGEDIR}${PREFIX}/bin)	27	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xdeblo ${STAGEDIR}${PREFIX}/bin)
27	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf	28	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
28	${CHMOD} 777 ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
29	(cd ${WRKSRC}/mapf && ${INSTALL_DATA} *.txt \	29	(cd ${WRKSRC}/mapf && ${INSTALL_DATA} *.txt \
30	${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf)	30	${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf)
31		31

Lines 1-36 Link Here

(-)games/xdeblock/files/patch-dialog.c (-36 / +20 lines)
1	*** dialog.c.orig Sat Nov 16 14:37:15 1996	1	--- dialog.c.orig 1996-11-16 05:37:15 UTC
2	--- dialog.c Fri Jan 15 00:00:00 2000	2	+++ dialog.c
3	***************	3	@@ -8,7 +8,7 @@
4	* 8,14 **	4
5		5	#include <sys/types.h>
6	#include <sys/types.h>	6	#include <sys/stat.h>
7	#include <sys/stat.h>	7	-#include <sys/dir.h>
8	! #include <sys/dir.h>	8	+#include <dirent.h>
9		9
10	#include "gameheader.h"	10	#include "gameheader.h"
11		11
12	--- 8,14 ----	12	@@ -430,7 +430,7 @@ void checkdir(dirname,fname,fflag)
13		13	char *fflag;
14	#include <sys/types.h>	14	{
15	#include <sys/stat.h>	15	DIR *dp;
16	! #include <dirent.h>	16	- struct direct *dir;
17		17	+ struct dirent *dir;
18	#include "gameheader.h"	18	struct stat sbuf;
19		19	char newname[256];
20	***************	20	register i = 0;
21	* 430,436 **
22	char *fflag;
23	{
24	DIR *dp;
25	! struct direct *dir;
26	struct stat sbuf;
27	char newname[256];
28	register i = 0;
29	--- 430,436 ----
30	char *fflag;
31	{
32	DIR *dp;
33	! struct dirent *dir;
34	struct stat sbuf;
35	char newname[256];
36	register i = 0;

Lines 1-19 Link Here

(-)games/xdeblock/files/patch-main.c (-19 / +11 lines)
1	*** main.c.orig Sat Nov 16 14:37:16 1996	1	--- main.c.orig 1996-11-16 05:37:16 UTC
2	--- main.c Thu Jan 15 00:00:00 2000	2	+++ main.c
3	***************	3	@@ -66,7 +66,7 @@ int checkOption(argc,argv)
4	* 66,72 **	4	/* set s_map */
5	/* set s_map */	5	gameMainFlg.s_map = False;
6	gameMainFlg.s_map = False;	6	nowDataRec.nowMap.gameSpeed = 90;
7	nowDataRec.nowMap.gameSpeed = 90;	7	- nowDataRec.nowMap.dirname[0] == 0x00;
8	! nowDataRec.nowMap.dirname[0] == 0x00;	8	+ strcpy(nowDataRec.nowMap.dirname, "/usr/local/lib/X11/xdeblock/mapf");
9		9
10	for(i =1; i < argc; i++)	10	for(i =1; i < argc; i++)
11	{	11	{
12	--- 66,72 ----
13	/* set s_map */
14	gameMainFlg.s_map = False;
15	nowDataRec.nowMap.gameSpeed = 90;
16	! strcpy(nowDataRec.nowMap.dirname, "%%PREFIX%%/lib/X11/xdeblock/mapf");
17
18	for(i =1; i < argc; i++)
19	{