Attachment #160954 for bug #203057

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




# $FreeBSD: head/games/blockout/Makefile 374303 2014-12-08 16:48:38Z tijl $

PORTNAME=	blockout
PORTVERSION=	2.5
PORTREVISION=	4
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/BlockOut%20${PORTVERSION}/ \
		http://www.stasyan.com/devel/distfiles/
DISTFILES=	bl25-src${EXTRACT_SUFX} bl25-linux-x86${EXTRACT_SUFX}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	BlockOut II is an adaptation of the original Blockout DOS game

LICENSE=	GPLv2 # or later

ONLY_FOR_ARCHS=	i386 amd64

USE_SDL=	mixer sdl
USES=		gmake dos2unix
DOS2UNIX_FILES=	${WRKSRC}/ImageLib/src/gif/gif.h ${WRKSRC}/ImageLib/src/gif/gif.cpp
LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
USE_GL=		gl glu

WRKSRC=		${WRKDIR}/BL_SRC
BUILD_WRKSRC=	${WRKSRC}/BlockOut

post-patch:


do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/BlockOut/blockout ${STAGEDIR}${PREFIX}/bin
	cd ${WRKDIR}/blockout && ${COPYTREE_SHARE} "images sounds" ${STAGEDIR}${DATADIR}
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt  ${STAGEDIR}${DOCSDIR}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)blockout/distinfo (-2 / +4 lines)
1	SHA256 (bl24-src-linux-i586.tar.gz) = c95766b8d6fce9820e14a23cd1bdea28591c01d8fdf5ece06cca1071f082c088	1	SHA256 (bl25-src.tar.gz) = 3abf61c4a7bd921988596a2239d76a5800fc94d8fd84dcc82c720d4d4f84cf0f
2	SIZE (bl24-src-linux-i586.tar.gz) = 5017393	2	SIZE (bl25-src.tar.gz) = 479743
		3	SHA256 (bl25-linux-x86.tar.gz) = 2bf9ab1798e7d3f82a372a3fae26a5c7699d1c57263253dce66f07fa418b702b
		4	SIZE (bl25-linux-x86.tar.gz) = 4379299




--- BlockOut/Utils.cpp.orig	2014-05-06 16:47:55.000000000 +0700
+++ BlockOut/Utils.cpp	2015-08-17 10:34:51.000000000 +0600
@@ -207,11 +207,9 @@
     return FALSE;
   }
     
-  char *blockoutHome = getenv("BL2_HOME");
+  const char *blockoutHome = getenv("BL2_HOME");
   if( blockoutHome==NULL ) {
-    printf("BL2_HOME environement variable if not defined !\n");
-    printf("Please set the BL2_HOME to the BlockOut II installation directory (ex: BL2_HOME=/usr/local/bl2).\n");
-    return FALSE;
+    blockoutHome="%%DATADIR%%";
   }
   strcpy( bl2Home , blockoutHome );
     

Line 0 Link Here

(-)blockout/files/patch-BotPlayer.cpp (+11 lines)
	1	--- BlockOut/BotPlayer.cpp.orig 2015-08-20 21:42:27.000000000 +0600
	2	+++ BlockOut/BotPlayer.cpp 2015-08-20 21:42:41.000000000 +0600
	3	@@ -16,7 +16,7 @@
	4	*/
	5
	6	#include "BotPlayer.h"
	7	-#include <malloc.h>
	8	+#include <stdlib.h>
	9	#include <string.h>
	10	#include <stdio.h>
	11	#include <stdlib.h>

Line 0 Link Here

(-)blockout/files/patch-BotPlayerAI.cpp (+11 lines)
	1	--- BlockOut/BotPlayerAI.cpp.orig 2015-08-20 21:43:41.000000000 +0600
	2	+++ BlockOut/BotPlayerAI.cpp 2015-08-20 21:43:51.000000000 +0600
	3	@@ -15,7 +15,7 @@
	4	GNU General Public License for more details.
	5	*/
	6	#include "BotPlayer.h"
	7	-#include <malloc.h>
	8	+#include <stdlib.h>
	9	#include <string.h>
	10	#include <stdio.h>
	11	#include <stdlib.h>

Lines 1-11 Link Here

(-)blockout/files/patch-GLFont.cpp (-5 / +5 lines)
1	--- BlockOut/GLApp/GLFont.cpp.orig 2009-08-06 15:16:50.000000000 +0700	1	--- BlockOut/GLApp/GLFont.cpp.orig 2014-05-06 16:47:55.000000000 +0700
2	+++ BlockOut/GLApp/GLFont.cpp 2009-08-06 15:16:58.000000000 +0700	2	+++ BlockOut/GLApp/GLFont.cpp 2015-08-17 10:31:54.000000000 +0600
3	@@ -3,7 +3,7 @@	3	@@ -2,7 +2,7 @@
		4	// Simple 2D font
4	// -----------------------------------------------	5	// -----------------------------------------------
5	#include "GLFont.h"	6	#include "GLFont.h"
6	#include <CImage.h>
7	-#include <malloc.h>	7	-#include <malloc.h>
8	+#include <stdlib.h>	8	+#include <stdlib.h>
9	#include <stdio.h>	9	#include <stdio.h>
10	#include <string.h>	10	#include <string.h>
11		11	#undef LoadImage

Lines 1-11 Link Here

(-)blockout/files/patch-GLSprite.cpp (-5 / +5 lines)
1	--- BlockOut/GLApp/GLSprite.cpp.orig 2009-08-06 15:17:24.000000000 +0700	1	--- BlockOut/GLApp/GLSprite.cpp.orig 2014-05-06 16:47:55.000000000 +0700
2	+++ BlockOut/GLApp/GLSprite.cpp 2009-08-06 15:17:46.000000000 +0700	2	+++ BlockOut/GLApp/GLSprite.cpp 2015-08-17 10:37:35.000000000 +0600
3	@@ -3,7 +3,7 @@	3	@@ -2,7 +2,7 @@
		4	// 2D sprites
4	// -----------------------------------------------	5	// -----------------------------------------------
5	#include "GLSprite.h"	6	#include "GLSprite.h"
6	#include <CImage.h>
7	-#include <malloc.h>	7	-#include <malloc.h>
8	+#include <stdlib.h>	8	+#include <stdlib.h>
9	#include <stdio.h>	9	#include <stdio.h>
10	#include <string.h>	10	#include <string.h>
11		11	#undef LoadImage

Lines 1-12 Link Here

(-)blockout/files/patch-Http.cpp (-5 / +7 lines)
1	--- BlockOut/Http.cpp.orig 2009-08-06 15:04:34.000000000 +0700	1	--- BlockOut/Http.cpp.orig 2014-05-06 16:47:54.000000000 +0700
2	+++ BlockOut/Http.cpp 2009-08-06 15:14:02.000000000 +0700	2	+++ BlockOut/Http.cpp 2015-08-17 10:39:47.000000000 +0600
3	@@ -24,11 +24,16 @@	3	@@ -25,6 +25,7 @@
4	#include <sys/types.h>	4	#include <sys/types.h>
5	#include <sys/socket.h>	5	#include <sys/socket.h>
6	#include <netdb.h>	6	#include <netdb.h>
7	+#include <netinet/in.h>	7	+#include <netinet/in.h>
8		8	#define closesocket close
9		9	#else
		10	#include <Winsock2.h>
		11	@@ -46,6 +47,10 @@
10	#define WAIT_FOR_READ 1	12	#define WAIT_FOR_READ 1
11	#define WAIT_FOR_WRITE 2	13	#define WAIT_FOR_WRITE 2
12		14




--- BlockOut/Makefile.orig	2014-05-06 16:47:56.000000000 +0700
+++ BlockOut/Makefile	2015-08-30 12:41:52.375668000 +0600
@@ -41,33 +41,37 @@
 
 ADD_LIBS = ../ImageLib/src/libimagelib.a
 
-ifdef _linux64
-SDL_LIBS = /usr/lib/x86_64-linux-gnu
-else
-SDL_LIBS = /usr/lib/i386-linux-gnu
-endif
+#ifdef _linux64
+#SDL_LIBS = /usr/lib/x86_64-linux-gnu
+#else
+#SDL_LIBS = /usr/lib/i386-linux-gnu
+#endif
+SDL_LIBS = /usr/local/lib
+
+#CXX		= g++
 
-CXX		= g++
-IMGLIB_ROOT	= ../ImageLib
+SDL_ROOT	= /usr/local
+IMGLIB_ROOT	= ../ImageLib/src
 
 ifdef _release
+#CXX		= g++
 
 CXXFLAGS =     -O2 -Dlinux -c \
-               -I/usr/include/SDL -I../ImageLib/src -I.
+		-I/usr/include -I$(SDL_ROOT)/include/SDL -I$(SDL_ROOT)/include -I$(IMGLIB_ROOT) -I.
 
 LFLAGS   =      -Wl,--strip-all \
 		$(ADD_LIBS) \
 		-lSDL_mixer -lSDL -lasound \
-		-lGL -lGLU -lpthread -lm -ldl
+		-lGL -lGLU -lpthread -lm
 
 else
 
 CXXFLAGS =     -g -D_DEBUG -Dlinux -c \
-               -I/usr/include/SDL -I../ImageLib/src -I.
+		-I/usr/include -I$(SDL_ROOT)/include/SDL -I$(SDL_ROOT)/include -I$(IMGLIB_ROOT) -I.
 
 LFLAGS   =      -L $(SDL_LIBS) \
 		$(ADD_LIBS) \
 		-lSDL_mixer -lSDL -lasound \
-		-lGL -lGLU -lpthread -lm -ldl
+		-lGL -lGLU -lpthread -lm
 
 endif
 

Lines 1-11 Link Here

(-)blockout/files/patch-gif.c (-11 lines)
1	--- ImageLib/src/gif/gif.c.orig 2009-08-07 15:16:48.000000000 -0400
2	+++ ImageLib/src/gif/gif.c 2009-08-07 15:19:01.000000000 -0400
3	@@ -4,7 +4,7 @@
4	/* Use an ultra fast compression method */
5	/***************************************************/
6	#include <stdio.h>
7	-#include <malloc.h>
8	+#include <stdlib.h>
9	#include <memory.h>
10	#include "gif.h"
11

Line 0 Link Here

(-)blockout/files/patch-gif.cpp (+11 lines)
	1	--- ImageLib/src/gif/gif.cpp.orig 2015-08-20 21:29:33.000000000 +0600
	2	+++ ImageLib/src/gif/gif.cpp 2015-08-20 21:29:46.000000000 +0600
	3	@@ -4,7 +4,7 @@
	4	/* Use an ultra fast compression method */
	5	/***************************************************/
	6	#include <stdio.h>
	7	-#include <malloc.h>
	8	+#include <stdlib.h>
	9	#include <memory.h>
	10	#include <string.h>
	11	#include "gif.h"

Lines 1-5 Link Here

(-)blockout/pkg-plist (-2 / +2 lines)
1	bin/blockout	1	bin/blockout
2	%%DATADIR%%/images/allPieces.png
3	%%DATADIR%%/images/background.png	2	%%DATADIR%%/images/background.png
4	%%DATADIR%%/images/background2.png	3	%%DATADIR%%/images/background2.png
5	%%DATADIR%%/images/background3.png	4	%%DATADIR%%/images/background3.png
Lines 28-35 Link Here
28	%%DATADIR%%/sounds/level2.wav	27	%%DATADIR%%/sounds/level2.wav
29	%%DATADIR%%/sounds/line.wav	28	%%DATADIR%%/sounds/line.wav
30	%%DATADIR%%/sounds/line2.wav	29	%%DATADIR%%/sounds/line2.wav
31	%%DATADIR%%/sounds/music.mp3	30	%%DATADIR%%/sounds/music.ogg
32	%%DATADIR%%/sounds/tchh.wav	31	%%DATADIR%%/sounds/tchh.wav
33	%%DATADIR%%/sounds/welldone.wav	32	%%DATADIR%%/sounds/welldone.wav
34	%%DATADIR%%/sounds/welldone2.wav	33	%%DATADIR%%/sounds/welldone2.wav
35	%%DATADIR%%/sounds/wozz.wav	34	%%DATADIR%%/sounds/wozz.wav
		35	%%PORTDOCS%%%%DOCSDIR%%/README.txt

Return to bug 203057

Lines 2-27 Link Here

(-)blockout/Makefile (-7 / +9 lines)
2	# $FreeBSD: head/games/blockout/Makefile 374303 2014-12-08 16:48:38Z tijl $	2	# $FreeBSD: head/games/blockout/Makefile 374303 2014-12-08 16:48:38Z tijl $
3		3
4	PORTNAME= blockout	4	PORTNAME= blockout
5	PORTVERSION= 2.4	5	PORTVERSION= 2.5
6	PORTREVISION= 4
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BlockOut%20${PORTVERSION}/ \	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BlockOut%20${PORTVERSION}/ \
9	http://www.stasyan.com/devel/distfiles/	8	http://www.stasyan.com/devel/distfiles/
10	DISTNAME= bl24-src-linux-i586	9	DISTFILES= bl25-src${EXTRACT_SUFX} bl25-linux-x86${EXTRACT_SUFX}
11		10
12	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= BlockOut II is an adaptation of the original Blockout DOS game	12	COMMENT= BlockOut II is an adaptation of the original Blockout DOS game
14		13
15	LICENSE= GPLv2 # or later	14	LICENSE= GPLv2 # or later
16		15
17	ONLY_FOR_ARCHS= i386	16	ONLY_FOR_ARCHS= i386 amd64
18		17
19	USE_SDL= mixer sdl	18	USE_SDL= mixer sdl
20	USES= gmake dos2unix	19	USES= gmake dos2unix
21	DOS2UNIX_FILES= ${WRKSRC}/ImageLib/src/gif/gif.c	20	DOS2UNIX_FILES= ${WRKSRC}/ImageLib/src/gif/gif.h ${WRKSRC}/ImageLib/src/gif/gif.cpp
		21	LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib
22	USE_GL= gl glu	22	USE_GL= gl glu
23		23
24	WRKSRC= ${WRKDIR}/bl24_lin_src	24	WRKSRC= ${WRKDIR}/BL_SRC
25	BUILD_WRKSRC= ${WRKSRC}/BlockOut	25	BUILD_WRKSRC= ${WRKSRC}/BlockOut
26		26
27	post-patch:	27	post-patch:
Lines 32-37 Link Here
32		32
33	do-install:	33	do-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/BlockOut/blockout ${STAGEDIR}${PREFIX}/bin	34	${INSTALL_PROGRAM} ${WRKSRC}/BlockOut/blockout ${STAGEDIR}${PREFIX}/bin
35	cd ${WRKSRC}/BlockOut && ${COPYTREE_SHARE} "images sounds" ${STAGEDIR}${DATADIR}	35	cd ${WRKDIR}/blockout && ${COPYTREE_SHARE} "images sounds" ${STAGEDIR}${DATADIR}
		36	${MKDIR} ${STAGEDIR}${DOCSDIR}
		37	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
36		38
37	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)blockout/files/patch-BlockOut__Utils.cpp (-16 / +16 lines)
1	--- BlockOut/Utils.cpp.orig 2008-01-09 21:29:06.000000000 +0300	1	--- BlockOut/Utils.cpp.orig 2014-05-06 16:47:55.000000000 +0700
2	+++ BlockOut/Utils.cpp 2014-12-02 07:58:58.452013513 +0300	2	+++ BlockOut/Utils.cpp 2015-08-17 10:34:51.000000000 +0600
3	@@ -162,11 +162,9 @@	3	@@ -207,11 +207,9 @@
4	return FALSE;	4	return FALSE;
5	}	5	}
6		6
7	- char *blockoutHome = getenv("BL2_HOME");	7	- char *blockoutHome = getenv("BL2_HOME");
8	+ const char *blockoutHome = getenv("BL2_HOME");	8	+ const char *blockoutHome = getenv("BL2_HOME");
9	if( blockoutHome==NULL ) {	9	if( blockoutHome==NULL ) {
10	- printf("BL2_HOME environement variable if not defined !\n");	10	- printf("BL2_HOME environement variable if not defined !\n");
11	- printf("Please set the BL2_HOME to the BlockOut II installation directory (ex: BL2_HOME=/usr/local/bl2).\n");	11	- printf("Please set the BL2_HOME to the BlockOut II installation directory (ex: BL2_HOME=/usr/local/bl2).\n");
12	- return FALSE;	12	- return FALSE;
13	+ blockoutHome="%%DATADIR%%";	13	+ blockoutHome="%%DATADIR%%";
14	}	14	}
15	strcpy( bl2Home , blockoutHome );	15	strcpy( bl2Home , blockoutHome );
16		16

Lines 1-25 Link Here

(-)blockout/files/patch-Makefile (-16 / +41 lines)
1	--- BlockOut/Makefile.orig 2008-01-10 00:29:06.000000000 +0600	1	--- BlockOut/Makefile.orig 2014-05-06 16:47:56.000000000 +0700
2	+++ BlockOut/Makefile 2014-02-09 13:17:22.000000000 +0700	2	+++ BlockOut/Makefile 2015-08-30 12:41:52.375668000 +0600
3	@@ -34,17 +34,17 @@	3	@@ -41,33 +41,37 @@
4		4
5	#---------------------------------------------------------------------	5	ADD_LIBS = ../ImageLib/src/libimagelib.a
		6
		7	-ifdef _linux64
		8	-SDL_LIBS = /usr/lib/x86_64-linux-gnu
		9	-else
		10	-SDL_LIBS = /usr/lib/i386-linux-gnu
		11	-endif
		12	+#ifdef _linux64
		13	+#SDL_LIBS = /usr/lib/x86_64-linux-gnu
		14	+#else
		15	+#SDL_LIBS = /usr/lib/i386-linux-gnu
		16	+#endif
		17	+SDL_LIBS = /usr/local/lib
		18	+
		19	+#CXX = g++
6		20
7	-SDL_ROOT = /users/pons/test/opengl/SDL	21	-CXX = g++
8	-IMGLIB_ROOT = ../ImageLib
9	+SDL_ROOT = /usr/local	22	+SDL_ROOT = /usr/local
10	+IMGLIB_ROOT = ../ImageLib/src	23	+IMGLIB_ROOT = ../ImageLib/src
11		24
12	-CXX = g++	25	ifdef _release
13	+#CXX = g++
14		26
15	CXXFLAGS = -g -D_DEBUG -Dlinux -c \	27	CXXFLAGS = -O2 -Dlinux -c \
16	- -I$(SDL_ROOT)/include/SDL -I$(IMGLIB_ROOT) -I.	28	- -I/usr/include/SDL -I../ImageLib/src -I.
17	+ -I/usr/include -I$(SDL_ROOT)/include/SDL -I$(SDL_ROOT)/include -I$(IMGLIB_ROOT) -I.	29	+ -I/usr/include -I$(SDL_ROOT)/include/SDL -I$(SDL_ROOT)/include -I$(IMGLIB_ROOT) -I.
		30
		31	LFLAGS = -Wl,--strip-all \
		32	$(ADD_LIBS) \
		33	-lSDL_mixer -lSDL -lasound \
		34	- -lGL -lGLU -lpthread -lm -ldl
		35	+ -lGL -lGLU -lpthread -lm
18		36
19	LIBS = -L$(SDL_ROOT)/lib -L$(IMGLIB_ROOT)	37	else
		38
		39	CXXFLAGS = -g -D_DEBUG -Dlinux -c \
		40	- -I/usr/include/SDL -I../ImageLib/src -I.
		41	+ -I/usr/include -I$(SDL_ROOT)/include/SDL -I$(SDL_ROOT)/include -I$(IMGLIB_ROOT) -I.
20		42
21	-LFLAGS = $(LIBS) -limagelib -lGL -lGLU -lSDL_mixer -lSDL -lpthread -lm -ldl	43	LFLAGS = -L $(SDL_LIBS) \
22	+LFLAGS = $(LIBS) -limagelib -lGL -lGLU -lSDL_mixer -lSDL -lpthread -lm	44	$(ADD_LIBS) \
		45	-lSDL_mixer -lSDL -lasound \
		46	- -lGL -lGLU -lpthread -lm -ldl
		47	+ -lGL -lGLU -lpthread -lm
23		48
24	#--------------------------------------------------------------------	49	endif
25		50