Index: head/games/blockout/Makefile =================================================================== --- head/games/blockout/Makefile (revision 399480) +++ head/games/blockout/Makefile (revision 399481) @@ -1,37 +1,39 @@ # Created by: Stas Timokhin # $FreeBSD$ PORTNAME= blockout -PORTVERSION= 2.4 -PORTREVISION= 4 +PORTVERSION= 2.5 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BlockOut%20${PORTVERSION}/ \ http://www.stasyan.com/devel/distfiles/ -DISTNAME= bl24-src-linux-i586 +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 +ONLY_FOR_ARCHS= i386 amd64 USE_SDL= mixer sdl USES= gmake dos2unix -DOS2UNIX_FILES= ${WRKSRC}/ImageLib/src/gif/gif.c +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}/bl24_lin_src +WRKSRC= ${WRKDIR}/BL_SRC BUILD_WRKSRC= ${WRKSRC}/BlockOut post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/BlockOut/Utils.cpp pre-build: cd ${WRKSRC}/ImageLib/src && ${DO_MAKE_BUILD} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/BlockOut/blockout ${STAGEDIR}${PREFIX}/bin - cd ${WRKSRC}/BlockOut && ${COPYTREE_SHARE} "images sounds" ${STAGEDIR}${DATADIR} + cd ${WRKDIR}/blockout && ${COPYTREE_SHARE} "images sounds" ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR} .include Index: head/games/blockout/distinfo =================================================================== --- head/games/blockout/distinfo (revision 399480) +++ head/games/blockout/distinfo (revision 399481) @@ -1,2 +1,4 @@ -SHA256 (bl24-src-linux-i586.tar.gz) = c95766b8d6fce9820e14a23cd1bdea28591c01d8fdf5ece06cca1071f082c088 -SIZE (bl24-src-linux-i586.tar.gz) = 5017393 +SHA256 (bl25-src.tar.gz) = 3abf61c4a7bd921988596a2239d76a5800fc94d8fd84dcc82c720d4d4f84cf0f +SIZE (bl25-src.tar.gz) = 479743 +SHA256 (bl25-linux-x86.tar.gz) = 2bf9ab1798e7d3f82a372a3fae26a5c7699d1c57263253dce66f07fa418b702b +SIZE (bl25-linux-x86.tar.gz) = 4379299 Index: head/games/blockout/files/patch-gif.c =================================================================== --- head/games/blockout/files/patch-gif.c (revision 399480) +++ head/games/blockout/files/patch-gif.c (nonexistent) @@ -1,11 +0,0 @@ ---- ImageLib/src/gif/gif.c.orig 2009-08-07 15:16:48.000000000 -0400 -+++ ImageLib/src/gif/gif.c 2009-08-07 15:19:01.000000000 -0400 -@@ -4,7 +4,7 @@ - /* Use an ultra fast compression method */ - /***************************************************/ - #include --#include -+#include - #include - #include "gif.h" - Property changes on: head/games/blockout/files/patch-gif.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/blockout/files/patch-BlockOut__Utils.cpp =================================================================== --- head/games/blockout/files/patch-BlockOut__Utils.cpp (revision 399480) +++ head/games/blockout/files/patch-BlockOut__Utils.cpp (revision 399481) @@ -1,16 +1,16 @@ ---- BlockOut/Utils.cpp.orig 2008-01-09 21:29:06.000000000 +0300 -+++ BlockOut/Utils.cpp 2014-12-02 07:58:58.452013513 +0300 -@@ -162,11 +162,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 ); - +--- 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 ); + Index: head/games/blockout/files/patch-BotPlayer.cpp =================================================================== --- head/games/blockout/files/patch-BotPlayer.cpp (nonexistent) +++ head/games/blockout/files/patch-BotPlayer.cpp (revision 399481) @@ -0,0 +1,11 @@ +--- BlockOut/BotPlayer.cpp.orig 2015-08-20 21:42:27.000000000 +0600 ++++ BlockOut/BotPlayer.cpp 2015-08-20 21:42:41.000000000 +0600 +@@ -16,7 +16,7 @@ + */ + + #include "BotPlayer.h" +-#include ++#include + #include + #include + #include Property changes on: head/games/blockout/files/patch-BotPlayer.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/blockout/files/patch-BotPlayerAI.cpp =================================================================== --- head/games/blockout/files/patch-BotPlayerAI.cpp (nonexistent) +++ head/games/blockout/files/patch-BotPlayerAI.cpp (revision 399481) @@ -0,0 +1,11 @@ +--- BlockOut/BotPlayerAI.cpp.orig 2015-08-20 21:43:41.000000000 +0600 ++++ BlockOut/BotPlayerAI.cpp 2015-08-20 21:43:51.000000000 +0600 +@@ -15,7 +15,7 @@ + GNU General Public License for more details. + */ + #include "BotPlayer.h" +-#include ++#include + #include + #include + #include Property changes on: head/games/blockout/files/patch-BotPlayerAI.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/blockout/files/patch-GLFont.cpp =================================================================== --- head/games/blockout/files/patch-GLFont.cpp (revision 399480) +++ head/games/blockout/files/patch-GLFont.cpp (revision 399481) @@ -1,11 +1,11 @@ ---- BlockOut/GLApp/GLFont.cpp.orig 2009-08-06 15:16:50.000000000 +0700 -+++ BlockOut/GLApp/GLFont.cpp 2009-08-06 15:16:58.000000000 +0700 -@@ -3,7 +3,7 @@ +--- BlockOut/GLApp/GLFont.cpp.orig 2014-05-06 16:47:55.000000000 +0700 ++++ BlockOut/GLApp/GLFont.cpp 2015-08-17 10:31:54.000000000 +0600 +@@ -2,7 +2,7 @@ + // Simple 2D font // ----------------------------------------------- #include "GLFont.h" - #include -#include +#include #include #include - + #undef LoadImage Index: head/games/blockout/files/patch-GLSprite.cpp =================================================================== --- head/games/blockout/files/patch-GLSprite.cpp (revision 399480) +++ head/games/blockout/files/patch-GLSprite.cpp (revision 399481) @@ -1,11 +1,11 @@ ---- BlockOut/GLApp/GLSprite.cpp.orig 2009-08-06 15:17:24.000000000 +0700 -+++ BlockOut/GLApp/GLSprite.cpp 2009-08-06 15:17:46.000000000 +0700 -@@ -3,7 +3,7 @@ +--- BlockOut/GLApp/GLSprite.cpp.orig 2014-05-06 16:47:55.000000000 +0700 ++++ BlockOut/GLApp/GLSprite.cpp 2015-08-17 10:37:35.000000000 +0600 +@@ -2,7 +2,7 @@ + // 2D sprites // ----------------------------------------------- #include "GLSprite.h" - #include -#include +#include #include #include - + #undef LoadImage Index: head/games/blockout/files/patch-Http.cpp =================================================================== --- head/games/blockout/files/patch-Http.cpp (revision 399480) +++ head/games/blockout/files/patch-Http.cpp (revision 399481) @@ -1,19 +1,21 @@ ---- BlockOut/Http.cpp.orig 2009-08-06 15:04:34.000000000 +0700 -+++ BlockOut/Http.cpp 2009-08-06 15:14:02.000000000 +0700 -@@ -24,11 +24,16 @@ +--- BlockOut/Http.cpp.orig 2014-05-06 16:47:54.000000000 +0700 ++++ BlockOut/Http.cpp 2015-08-17 10:39:47.000000000 +0600 +@@ -25,6 +25,7 @@ #include #include #include +#include - - + #define closesocket close + #else + #include +@@ -46,6 +47,10 @@ #define WAIT_FOR_READ 1 #define WAIT_FOR_WRITE 2 +#ifndef ENOSR +#define ENOSR 9922 +#endif + // ------------------------------------------------------- Http::Http() { Index: head/games/blockout/files/patch-Makefile =================================================================== --- head/games/blockout/files/patch-Makefile (revision 399480) +++ head/games/blockout/files/patch-Makefile (revision 399481) @@ -1,25 +1,50 @@ ---- BlockOut/Makefile.orig 2008-01-10 00:29:06.000000000 +0600 -+++ BlockOut/Makefile 2014-02-09 13:17:22.000000000 +0700 -@@ -34,17 +34,17 @@ +--- 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 --SDL_ROOT = /users/pons/test/opengl/SDL --IMGLIB_ROOT = ../ImageLib +-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++ +SDL_ROOT = /usr/local +IMGLIB_ROOT = ../ImageLib/src --CXX = g++ -+#CXX = g++ + ifdef _release - CXXFLAGS = -g -D_DEBUG -Dlinux -c \ -- -I$(SDL_ROOT)/include/SDL -I$(IMGLIB_ROOT) -I. -+ -I/usr/include -I$(SDL_ROOT)/include/SDL -I$(SDL_ROOT)/include -I$(IMGLIB_ROOT) -I. + 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. - LIBS = -L$(SDL_ROOT)/lib -L$(IMGLIB_ROOT) + LFLAGS = -Wl,--strip-all \ + $(ADD_LIBS) \ + -lSDL_mixer -lSDL -lasound \ +- -lGL -lGLU -lpthread -lm -ldl ++ -lGL -lGLU -lpthread -lm --LFLAGS = $(LIBS) -limagelib -lGL -lGLU -lSDL_mixer -lSDL -lpthread -lm -ldl -+LFLAGS = $(LIBS) -limagelib -lGL -lGLU -lSDL_mixer -lSDL -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 Index: head/games/blockout/files/patch-gif.cpp =================================================================== --- head/games/blockout/files/patch-gif.cpp (nonexistent) +++ head/games/blockout/files/patch-gif.cpp (revision 399481) @@ -0,0 +1,11 @@ +--- ImageLib/src/gif/gif.cpp.orig 2015-08-20 21:29:33.000000000 +0600 ++++ ImageLib/src/gif/gif.cpp 2015-08-20 21:29:46.000000000 +0600 +@@ -4,7 +4,7 @@ + /* Use an ultra fast compression method */ + /***************************************************/ + #include +-#include ++#include + #include + #include + #include "gif.h" Property changes on: head/games/blockout/files/patch-gif.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/blockout/pkg-plist =================================================================== --- head/games/blockout/pkg-plist (revision 399480) +++ head/games/blockout/pkg-plist (revision 399481) @@ -1,35 +1,35 @@ bin/blockout -%%DATADIR%%/images/allPieces.png %%DATADIR%%/images/background.png %%DATADIR%%/images/background2.png %%DATADIR%%/images/background3.png %%DATADIR%%/images/font.png %%DATADIR%%/images/gameover.png %%DATADIR%%/images/gameovera.png %%DATADIR%%/images/marble.png %%DATADIR%%/images/marbleg.png %%DATADIR%%/images/menuback.png %%DATADIR%%/images/menucredits.png %%DATADIR%%/images/menufont.png %%DATADIR%%/images/menufont2.png %%DATADIR%%/images/menupit.png %%DATADIR%%/images/online.png %%DATADIR%%/images/onlinea.png %%DATADIR%%/images/spark.png %%DATADIR%%/images/sparka.png %%DATADIR%%/images/sprites.png %%DATADIR%%/images/spritesa.png %%DATADIR%%/images/star_crystal_grid.png %%DATADIR%%/sounds/blub.wav %%DATADIR%%/sounds/empty.wav %%DATADIR%%/sounds/empty2.wav %%DATADIR%%/sounds/hit.wav %%DATADIR%%/sounds/level.wav %%DATADIR%%/sounds/level2.wav %%DATADIR%%/sounds/line.wav %%DATADIR%%/sounds/line2.wav -%%DATADIR%%/sounds/music.mp3 +%%DATADIR%%/sounds/music.ogg %%DATADIR%%/sounds/tchh.wav %%DATADIR%%/sounds/welldone.wav %%DATADIR%%/sounds/welldone2.wav %%DATADIR%%/sounds/wozz.wav +%%PORTDOCS%%%%DOCSDIR%%/README.txt