Attachment 160954 Details for Bug 203057 – diff of ports files

[patch] diff of ports files

blockout25.diff (text/plain), 11.04 KB, created by devel on 2015-09-12 11:25:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: devel

Created: 2015-09-12 11:25:05 UTC

Size: 11.04 KB

patch

obsolete

>diff -ruN blockout.orig/Makefile blockout/Makefile
>--- blockout.orig/Makefile	2014-12-08 22:48:38.000000000 +0600
>+++ blockout/Makefile	2015-09-04 21:37:54.000000000 +0600
>@@ -2,26 +2,26 @@
> # $FreeBSD: head/games/blockout/Makefile 374303 2014-12-08 16:48:38Z tijl $
> 
> 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:
>@@ -32,6 +32,8 @@
> 
> 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 <bsd.port.mk>
>diff -ruN blockout.orig/distinfo blockout/distinfo
>--- blockout.orig/distinfo	2014-01-22 22:30:13.000000000 +0700
>+++ blockout/distinfo	2015-08-30 12:36:48.000000000 +0600
>@@ -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
>diff -ruN blockout.orig/files/patch-BlockOut__Utils.cpp blockout/files/patch-BlockOut__Utils.cpp
>--- blockout.orig/files/patch-BlockOut__Utils.cpp	2014-12-03 05:29:20.000000000 +0600
>+++ blockout/files/patch-BlockOut__Utils.cpp	2015-08-30 12:37:12.000000000 +0600
>@@ -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 );
>+     
>diff -ruN blockout.orig/files/patch-BotPlayer.cpp blockout/files/patch-BotPlayer.cpp
>--- blockout.orig/files/patch-BotPlayer.cpp	1970-01-01 07:00:00.000000000 +0700
>+++ blockout/files/patch-BotPlayer.cpp	2015-08-30 12:37:12.000000000 +0600
>@@ -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 <malloc.h>
>++#include <stdlib.h>
>+ #include <string.h>
>+ #include <stdio.h>
>+ #include <stdlib.h>
>diff -ruN blockout.orig/files/patch-BotPlayerAI.cpp blockout/files/patch-BotPlayerAI.cpp
>--- blockout.orig/files/patch-BotPlayerAI.cpp	1970-01-01 07:00:00.000000000 +0700
>+++ blockout/files/patch-BotPlayerAI.cpp	2015-08-30 12:37:12.000000000 +0600
>@@ -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 <malloc.h>
>++#include <stdlib.h>
>+ #include <string.h>
>+ #include <stdio.h>
>+ #include <stdlib.h>
>diff -ruN blockout.orig/files/patch-GLFont.cpp blockout/files/patch-GLFont.cpp
>--- blockout.orig/files/patch-GLFont.cpp	2014-01-23 00:40:44.000000000 +0700
>+++ blockout/files/patch-GLFont.cpp	2015-08-30 12:37:12.000000000 +0600
>@@ -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 <CImage.h>
> -#include <malloc.h>
> +#include <stdlib.h>
>  #include <stdio.h>
>  #include <string.h>
>- 
>+ #undef LoadImage
>diff -ruN blockout.orig/files/patch-GLSprite.cpp blockout/files/patch-GLSprite.cpp
>--- blockout.orig/files/patch-GLSprite.cpp	2014-01-23 00:40:44.000000000 +0700
>+++ blockout/files/patch-GLSprite.cpp	2015-08-30 12:37:12.000000000 +0600
>@@ -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 <CImage.h>
> -#include <malloc.h>
> +#include <stdlib.h>
>  #include <stdio.h>
>  #include <string.h>
>- 
>+ #undef LoadImage
>diff -ruN blockout.orig/files/patch-Http.cpp blockout/files/patch-Http.cpp
>--- blockout.orig/files/patch-Http.cpp	2014-01-23 00:40:44.000000000 +0700
>+++ blockout/files/patch-Http.cpp	2015-08-30 12:37:12.000000000 +0600
>@@ -1,12 +1,14 @@
>---- 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 <sys/types.h>
>  #include <sys/socket.h>
>  #include <netdb.h>
> +#include <netinet/in.h>
>- 
>- 
>+ #define closesocket close
>+ #else
>+ #include <Winsock2.h>
>+@@ -46,6 +47,10 @@
>  #define WAIT_FOR_READ  1
>  #define WAIT_FOR_WRITE 2
>  
>diff -ruN blockout.orig/files/patch-Makefile blockout/files/patch-Makefile
>--- blockout.orig/files/patch-Makefile	2014-03-28 20:29:58.000000000 +0700
>+++ blockout/files/patch-Makefile	2015-08-30 12:42:33.000000000 +0600
>@@ -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
>+ 
>+-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++
>  
>--SDL_ROOT	= /users/pons/test/opengl/SDL
>--IMGLIB_ROOT	= ../ImageLib
>+-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.
>+ 
>+ LFLAGS   =      -Wl,--strip-all \
>+ 		$(ADD_LIBS) \
>+ 		-lSDL_mixer -lSDL -lasound \
>+-		-lGL -lGLU -lpthread -lm -ldl
>++		-lGL -lGLU -lpthread -lm
>  
>- LIBS	 =     -L$(SDL_ROOT)/lib -L$(IMGLIB_ROOT)
>+ 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   =      $(LIBS) -limagelib -lGL -lGLU -lSDL_mixer -lSDL -lpthread -lm -ldl 
>-+LFLAGS   =      $(LIBS) -limagelib -lGL -lGLU -lSDL_mixer -lSDL -lpthread -lm 
>+ LFLAGS   =      -L $(SDL_LIBS) \
>+ 		$(ADD_LIBS) \
>+ 		-lSDL_mixer -lSDL -lasound \
>+-		-lGL -lGLU -lpthread -lm -ldl
>++		-lGL -lGLU -lpthread -lm
>  
>- #--------------------------------------------------------------------
>+ endif
>  
>diff -ruN blockout.orig/files/patch-gif.c blockout/files/patch-gif.c
>--- blockout.orig/files/patch-gif.c	2014-12-03 05:29:20.000000000 +0600
>+++ blockout/files/patch-gif.c	1970-01-01 07:00:00.000000000 +0700
>@@ -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 <stdio.h>
>--#include <malloc.h>
>-+#include <stdlib.h>
>- #include <memory.h>
>- #include "gif.h"
>- 
>diff -ruN blockout.orig/files/patch-gif.cpp blockout/files/patch-gif.cpp
>--- blockout.orig/files/patch-gif.cpp	1970-01-01 07:00:00.000000000 +0700
>+++ blockout/files/patch-gif.cpp	2015-08-30 12:37:12.000000000 +0600
>@@ -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 <stdio.h>
>+-#include <malloc.h>
>++#include <stdlib.h>
>+ #include <memory.h>
>+ #include <string.h>
>+ #include "gif.h"
>diff -ruN blockout.orig/pkg-plist blockout/pkg-plist
>--- blockout.orig/pkg-plist	2014-12-03 05:29:20.000000000 +0600
>+++ blockout/pkg-plist	2015-08-30 12:36:48.000000000 +0600
>@@ -1,5 +1,4 @@
> bin/blockout
>-%%DATADIR%%/images/allPieces.png
> %%DATADIR%%/images/background.png
> %%DATADIR%%/images/background2.png
> %%DATADIR%%/images/background3.png
>@@ -28,8 +27,9 @@
> %%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

Flags:

devel: maintainer-approval+

Actions: View | Diff

Attachments on bug 203057: 160954