Attachment 130961 Details for Bug 174989 – patch.txt

patch.txt

patch.txt (text/plain; charset=UTF-8), 8.80 KB, created by lightside on 2013-02-04 07:37:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2013-02-04 07:37:52 UTC

Size: 8.80 KB

patch

obsolete

>diff -ruN sauerbraten.orig/Makefile sauerbraten/Makefile
>--- sauerbraten.orig/Makefile	2012-11-17 09:57:51.000000000 +0400
>+++ sauerbraten/Makefile	2013-02-04 11:27:11.000000000 +0400
>@@ -6,15 +6,18 @@
> #
> 
> PORTNAME=	sauerbraten
>-PORTVERSION=	20100728
>-PORTREVISION=	2
>+PORTVERSION=	20130203
>+PORTREVISION=	0
> CATEGORIES=	games
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
>-DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
>+DISTNAME=	${PORTNAME}_2013_02_03_collect_edition_linux
> 
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	First person shooter based on Cube
> 
>+LICENSE_COMB=	multi
>+LICENSE=	MIT ZLIB
>+
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> USE_BZIP2=	yes
>@@ -31,31 +34,35 @@
> PORTDATA=	data packages
> PORTDOCS=	*
> 
>-OPTIONS=	CLIENT "Build client" on \
>-		DEDICATED "Build dedicated server" on \
>-		MASTER "Build master server" off
>-
>-SUB_FILES=	sauer_client sauer_master sauer_server pkg-message
>+OPTIONS_DEFINE=	DOCS
>+OPTIONS_MULTI=	BUILD
>+OPTIONS_MULTI_BUILD=	CLIENT DEDICATED MASTER
>+OPTIONS_DEFAULT=	CLIENT DEDICATED
>+CLIENT_DESC=	Build client
>+DEDICATED_DESC=	Build dedicated server
>+MASTER_DESC=	Build master server
> 
>-.include <bsd.port.pre.mk>
>+SUB_FILES=	sauer_client sauer_master sauer_server
> 
>-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && defined(WITHOUT_MASTER)
>-IGNORE=		needs at least one executable (CLIENT, DEDICATED or MASTER)
>-.endif
>+.include <bsd.port.options.mk>
> 
>-.if !defined(WITHOUT_CLIENT)
>+.if ${PORT_OPTIONS:MCLIENT}
> USE_GL=		yes
> USE_SDL=	image mixer sdl
> ALL_TARGET+=	client
> SAUER_BIN+=	client
>+
>+DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
>+		"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
>+		"Game;" false
> .endif
> 
>-.if !defined(WITHOUT_DEDICATED)
>+.if ${PORT_OPTIONS:MDEDICATED}
> ALL_TARGET+=	server
> SAUER_BIN+=	server
> .endif
> 
>-.if !defined(WITHOUT_MASTER)
>+.if ${PORT_OPTIONS:MMASTER}
> ALL_TARGET+=	master
> SAUER_BIN+=	master
> .endif
>@@ -77,7 +84,7 @@
> 	${MKDIR} ${DATADIR}
> 	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
> .endif
>-.if !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
> 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
> .endif
>@@ -87,8 +94,5 @@
> 	@${ECHO_CMD} bin/sauer_${f} >> ${TMPPLIST}
> 	@${ECHO_CMD} libexec/sauer_${f} >> ${TMPPLIST}
> .endfor
>-	@${ECHO_CMD}
>-	@${CAT} ${PKGMESSAGE}
>-	@${ECHO_CMD}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN sauerbraten.orig/distinfo sauerbraten/distinfo
>--- sauerbraten.orig/distinfo	2011-01-20 18:37:46.000000000 +0300
>+++ sauerbraten/distinfo	2013-02-04 11:31:20.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
>-SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
>+SHA256 (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e
>+SIZE (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 589941180
>diff -ruN sauerbraten.orig/files/patch-src_Makefile sauerbraten/files/patch-src_Makefile
>--- sauerbraten.orig/files/patch-src_Makefile	2011-01-20 18:37:47.000000000 +0300
>+++ sauerbraten/files/patch-src_Makefile	2013-01-24 18:55:35.000000000 +0400
>@@ -1,8 +1,8 @@
>---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
>-+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
>+--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
>++++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
> @@ -1,8 +1,7 @@
> -CXXFLAGS= -O3 -fomit-frame-pointer
>- override CXXFLAGS+= -Wall -fsigned-char
>+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
>  
>  PLATFORM= $(shell uname -s)
> -PLATFORM_PREFIX= native
>@@ -10,25 +10,25 @@
>  
>  INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
>  
>-@@ -20,8 +19,8 @@
>- CLIENT_INCLUDES= $(INCLUDES) -Iinclude
>- CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
>+@@ -36,8 +35,8 @@
>+ endif
>+ CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
>  else	
> -CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
>--CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
>+-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
> +CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
>-+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL
>++CLIENT_LIBS= -Lenet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
>  endif
>  ifeq ($(PLATFORM),Linux)
>  CLIENT_LIBS+= -lrt
>-@@ -90,8 +89,8 @@
>- SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude
>- SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
>+@@ -105,8 +104,8 @@
>+ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
>+ MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
>  else
> -SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
> -SERVER_LIBS= -Lenet/.libs -lenet -lz
> +SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
> +SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
>+ MASTER_LIBS= $(SERVER_LIBS)
>  endif
>  SERVER_OBJS= \
>- 	shared/crypto-standalone.o \
>diff -ruN sauerbraten.orig/files/pkg-message.in sauerbraten/files/pkg-message.in
>--- sauerbraten.orig/files/pkg-message.in	2006-12-29 21:22:15.000000000 +0300
>+++ sauerbraten/files/pkg-message.in	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>-###############################################################################
>-
>-1) First time, sauerbraten creates a ~/.sauerbraten directory with symlinks.
>-2) Config files are in the ~/.sauerbraten directory.
>-3) If you want add new bindings into ~/.sauerbraten/config.cfg, see
>-
>-   %%DATADIR%%/data/keymap.cfg.
>-
>-4) Enjoy it ;)
>-
>-###############################################################################
>diff -ruN sauerbraten.orig/files/sauer_client.in sauerbraten/files/sauer_client.in
>--- sauerbraten.orig/files/sauer_client.in	2006-08-14 19:29:20.000000000 +0400
>+++ sauerbraten/files/sauer_client.in	2013-01-24 19:22:02.000000000 +0400
>@@ -1,18 +1,4 @@
> #!/bin/sh
> 
>-# The executable needs to be run from its data directory, and needs to store
>-# configuration in it. We therefore mirror the data directory hierarchy in
>-# ~/.sauerbraten, and create symlinks to the data files.
>-
>-if [ -d ~/.sauerbraten ]
>-then
>-	echo "Using existing ~/.sauerbraten directory."
>-else
>-	echo "Creating ~/.sauerbraten directory."
>-	cd %%DATADIR%% || exit 1
>-	find * -type d -exec mkdir -p ~/.sauerbraten/{} \;
>-	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sauerbraten/{} \; 2>/dev/null
>-fi
>-
>-cd ~/.sauerbraten || exit 1
>-exec %%PREFIX%%/libexec/sauer_client "$@"
>+SAUER_OPTIONS="-q${HOME}/.sauerbraten"
>+cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_client ${SAUER_OPTIONS} "$@"
>diff -ruN sauerbraten.orig/files/sauer_master.in sauerbraten/files/sauer_master.in
>--- sauerbraten.orig/files/sauer_master.in	2011-01-20 18:37:47.000000000 +0300
>+++ sauerbraten/files/sauer_master.in	2013-01-24 19:22:36.000000000 +0400
>@@ -1,18 +1,4 @@
> #!/bin/sh
> 
>-# The executable needs to be run from its data directory, and needs to store
>-# configuration in it. We therefore mirror the data directory hierarchy in
>-# ~/.sauerbraten, and create symlinks to the data files.
>-
>-if [ -d ~/.sauerbraten ]
>-then
>-	echo "Using existing ~/.sauerbraten directory."
>-else
>-	echo "Creating ~/.sauerbraten directory."
>-	cd %%DATADIR%% || exit 1
>-	find * -type d -exec mkdir -p ~/.sauerbraten/{} \;
>-	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sauerbraten/{} \; 2>/dev/null
>-fi
>-
>-cd ~/.sauerbraten || exit 1
>-exec %%PREFIX%%/libexec/sauer_master "$@"
>+SAUER_OPTIONS="-q${HOME}/.sauerbraten"
>+cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_master ${SAUER_OPTIONS} "$@"
>diff -ruN sauerbraten.orig/files/sauer_server.in sauerbraten/files/sauer_server.in
>--- sauerbraten.orig/files/sauer_server.in	2006-08-14 19:29:20.000000000 +0400
>+++ sauerbraten/files/sauer_server.in	2013-01-24 19:22:38.000000000 +0400
>@@ -1,18 +1,4 @@
> #!/bin/sh
> 
>-# The executable needs to be run from its data directory, and needs to store
>-# configuration in it. We therefore mirror the data directory hierarchy in
>-# ~/.sauerbraten, and create symlinks to the data files.
>-
>-if [ -d ~/.sauerbraten ]
>-then
>-	echo "Using existing ~/.sauerbraten directory."
>-else
>-	echo "Creating ~/.sauerbraten directory."
>-	cd %%DATADIR%% || exit 1
>-	find * -type d -exec mkdir -p ~/.sauerbraten/{} \;
>-	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sauerbraten/{} \; 2>/dev/null
>-fi
>-
>-cd ~/.sauerbraten || exit 1
>-exec %%PREFIX%%/libexec/sauer_server "$@"
>+SAUER_OPTIONS="-q${HOME}/.sauerbraten"
>+cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_server ${SAUER_OPTIONS} "$@"

Actions: View

Attachments on bug 174989: 130955 | 130956 | 130957 | 130958 | 130959 | 130960 | 130961