Attachment #137407 for bug #182889

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




# $FreeBSD: games/assaultcube/Makefile 327730 2013-09-20 17:36:33Z bapt $

PORTNAME=	assaultcube
PORTVERSION=	1.2.0.0
PORTREVISION=	0
CATEGORIES=	games
MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
DISTNAME=	AssaultCube_v${PORTVERSION}
		AssaultCube_v${PORTVERSION}${EXTRACT_SUFX}

MAINTAINER=	lightside@gmx.com
COMMENT=	Total conversion of the FPS game called Cube

USE_GMAKE=	yes
GNU_CONFIGURE=	yes
ALL_TARGET=	libenet
WRKSRC=		${WRKDIR}/AssaultCube_v${PORTVERSION}
CONFIGURE_ARGS=	--enable-shared=no --enable-static=yes
CONFIGURE_WRKSRC=	${WRKSRC}/source/enet
BUILD_WRKSRC=	${WRKSRC}/source/src

DEDICATED_DESC=	Build dedicated server
MASTER_DESC=	Build master server

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MCLIENT}
LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
USES+=		gettext
USE_GL=		yes
USE_SDL=	image mixer sdl


do-install:
.for f in ${ACUBE_BIN}
	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ac_${f} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}_${f}
.endfor
.if !defined(NOPORTDATA)
	${MKDIR} ${STAGEDIR}${DATADIR}
	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
.endif
.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.endif

post-install:

Lines 1-4 Link Here

(-)assaultcube/distinfo (-4 / +2 lines)
1	SHA256 (AssaultCube_v1.1.0.4.tar.bz2) = fea2056aa7262617b96b06ea0b85422bcec54d88cd88689c2c73ade3bd0ba029	1	SHA256 (AssaultCube_v1.2.0.0.tar.bz2) = 90b4a7278645d3297f3031b77f9ce3d9a059c2edd6b465fe4c9b0d7514b06a61
2	SIZE (AssaultCube_v1.1.0.4.tar.bz2) = 47051151	2	SIZE (AssaultCube_v1.2.0.0.tar.bz2) = 52756452
3	SHA256 (AssaultCube_v1.1.0.4_source.tar.bz2) = 045925610c54b2764a79286aeb1942df2cc5ce52b710c26b447eea69fa6b1129
4	SIZE (AssaultCube_v1.1.0.4_source.tar.bz2) = 2560572




#!/bin/sh

CUBE_OPTIONS="--home=${HOME}/.assaultcube --init"
cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_client ${CUBE_OPTIONS} "$@"
# ~/.XXX, and create symlinks to the data files, but the configuration files
# are copied, and write permission for the user is added to them.

APPNAME="assaultcube"
CUBE_OPTIONS="--home=${HOME}/.${APPNAME} --init"

if [ -d ~/.$APPNAME ]
then
	echo "Using existing ~/.$APPNAME directory."
else
	echo "Creating ~/.$APPNAME directory."
	cd %%DATADIR%% || exit 1
	find * -type d -exec mkdir -p ~/.$APPNAME/{} \;
	find * -type f -name "*.cfg" \
	    -exec cp %%DATADIR%%/{} ~/.$APPNAME/{} \; \
	    -exec chmod u+w ~/.$APPNAME/{} \; 2>/dev/null
	find * -type f -exec ln -s %%DATADIR%%/{} ~/.$APPNAME/{} \; 2>/dev/null
fi

cd ~/.$APPNAME || exit 1
exec %%PREFIX%%/libexec/${APPNAME}_client ${CUBE_OPTIONS} "$@"




#!/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
# ~/.XXX, and create symlinks to the data files, but the configuration files
# are copied, and write permission for the user is added to them.

APPNAME="assaultcube"
CUBE_OPTIONS=
cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_master ${CUBE_OPTIONS} "$@"
if [ -d ~/.$APPNAME ]
then
	echo "Using existing ~/.$APPNAME directory."
else
	echo "Creating ~/.$APPNAME directory."
	cd %%DATADIR%% || exit 1
	find * -type d -exec mkdir -p ~/.$APPNAME/{} \;
	find * -type f -name "*.cfg" \
	    -exec cp %%DATADIR%%/{} ~/.$APPNAME/{} \; \
	    -exec chmod u+w ~/.$APPNAME/{} \; 2>/dev/null
	find * -type f -exec ln -s %%DATADIR%%/{} ~/.$APPNAME/{} \; 2>/dev/null
fi

cd ~/.$APPNAME || exit 1
exec %%PREFIX%%/libexec/${APPNAME}_master ${CUBE_OPTIONS} "$@"




#!/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
# ~/.XXX, and create symlinks to the data files, but the configuration files
# are copied, and write permission for the user is added to them.

APPNAME="assaultcube"
CUBE_OPTIONS=
cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_server ${CUBE_OPTIONS} "$@"
if [ -d ~/.$APPNAME ]
then
	echo "Using existing ~/.$APPNAME directory."
else
	echo "Creating ~/.$APPNAME directory."
	cd %%DATADIR%% || exit 1
	find * -type d -exec mkdir -p ~/.$APPNAME/{} \;
	find * -type f -name "*.cfg" \
	    -exec cp %%DATADIR%%/{} ~/.$APPNAME/{} \; \
	    -exec chmod u+w ~/.$APPNAME/{} \; 2>/dev/null
	find * -type f -exec ln -s %%DATADIR%%/{} ~/.$APPNAME/{} \; 2>/dev/null
fi

cd ~/.$APPNAME || exit 1
exec %%PREFIX%%/libexec/${APPNAME}_server ${CUBE_OPTIONS} "$@"




--- source/src/Makefile.orig	2013-10-09 23:35:27.000000000 +0400
+++ source/src/Makefile	2013-10-11 02:18:50.000000000 +0400
@@ -1,8 +1,7 @@
 //CXX=g++-gcc-4.2.3
-CXXFLAGS= -O3 -fomit-frame-pointer
 override CXXFLAGS+= -Wall -fsigned-char
 
 PLATFORM= $(shell uname -s)
-PLATFORM_PREFIX=native
+PLATFORM_PREFIX=FreeBSD
 
 INCLUDES= -I. -Ibot -I../enet/include
 
@@ -21,8 +20,8 @@
 else
 USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
 override CXXFLAGS+= -rdynamic
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
+CLIENT_LIBS= -L../enet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
+CLIENT_LIBS= -L../enet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lz -lGL -lopenal -lvorbisfile -lintl
 endif
 
 CLIENT_OBJS= \
@@ -86,8 +85,8 @@
 SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
 SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
 else

Line 0 Link Here

(-)assaultcube/files/patch-source_src_console.h (+17 lines)
	1	--- source/src/console.h.orig 2013-10-09 12:27:31.000000000 +0400
	2	+++ source/src/console.h 2013-10-11 02:23:35.000000000 +0400
	3	@@ -127,7 +127,7 @@
	4	}
	5	};
	6
	7	-/** WIP ALERT */
	8	+/** WIP ALERT //
	9	struct textinputbuffer_wip
	10	{
	11	string buf;
	12	@@ -257,4 +257,4 @@
	13	return false;
	14	}
	15	};
	16	-
	17	+*/

Line 0 Link Here

(-)assaultcube/files/patch-source_src_master.cpp (+11 lines)
	1	--- source/src/master.cpp.orig 2013-10-09 12:27:37.000000000 +0400
	2	+++ source/src/master.cpp 2013-10-11 02:26:24.000000000 +0400
	3	@@ -510,7 +510,7 @@
	4	authreq &a = c.authreqs.add();
	5	a.reqtime = servtime;
	6	a.id = id;
	7	- uint seed[3] = { starttime, servtime, randomMT() };
	8	+ uint seed[3] = { (uint)starttime, servtime, randomMT() };
	9	static vector<char> buf;
	10	buf.setsize(0);
	11	a.answer = genchallenge(u->pubkey, seed, sizeof(seed), buf);

Return to bug 182889

Lines 2-13 Link Here

(-)assaultcube/Makefile (-12 / +11 lines)
2	# $FreeBSD: games/assaultcube/Makefile 327730 2013-09-20 17:36:33Z bapt $	2	# $FreeBSD: games/assaultcube/Makefile 327730 2013-09-20 17:36:33Z bapt $
3		3
4	PORTNAME= assaultcube	4	PORTNAME= assaultcube
5	PORTVERSION= 1.1.0.4	5	PORTVERSION= 1.2.0.0
6	PORTREVISION= 4	6	PORTREVISION= 0
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION}	8	MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
9	DISTFILES= AssaultCube_v${PORTVERSION}_source${EXTRACT_SUFX} \	9	DISTNAME= AssaultCube_v${PORTVERSION}
10	AssaultCube_v${PORTVERSION}${EXTRACT_SUFX}
11		10
12	MAINTAINER= lightside@gmx.com	11	MAINTAINER= lightside@gmx.com
13	COMMENT= Total conversion of the FPS game called Cube	12	COMMENT= Total conversion of the FPS game called Cube
Lines 29-35 Link Here
29	USE_GMAKE= yes	28	USE_GMAKE= yes
30	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
31	ALL_TARGET= libenet	30	ALL_TARGET= libenet
32	WRKSRC= ${WRKDIR}/${PORTVERSION}	31	WRKSRC= ${WRKDIR}/AssaultCube_v${PORTVERSION}
33	CONFIGURE_ARGS= --enable-shared=no --enable-static=yes	32	CONFIGURE_ARGS= --enable-shared=no --enable-static=yes
34	CONFIGURE_WRKSRC= ${WRKSRC}/source/enet	33	CONFIGURE_WRKSRC= ${WRKSRC}/source/enet
35	BUILD_WRKSRC= ${WRKSRC}/source/src	34	BUILD_WRKSRC= ${WRKSRC}/source/src
Lines 45-54 Link Here
45	DEDICATED_DESC= Build dedicated server	44	DEDICATED_DESC= Build dedicated server
46	MASTER_DESC= Build master server	45	MASTER_DESC= Build master server
47		46
48	NO_STAGE= yes
49	.include <bsd.port.options.mk>	47	.include <bsd.port.options.mk>
50		48
51	.if ${PORT_OPTIONS:MCLIENT}	49	.if ${PORT_OPTIONS:MCLIENT}
		50	LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
52	USES+= gettext	51	USES+= gettext
53	USE_GL= yes	52	USE_GL= yes
54	USE_SDL= image mixer sdl	53	USE_SDL= image mixer sdl
Lines 75-90 Link Here
75		74
76	do-install:	75	do-install:
77	.for f in ${ACUBE_BIN}	76	.for f in ${ACUBE_BIN}
78	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${PREFIX}/bin	77	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin
79	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ac_${f} ${PREFIX}/libexec/${PORTNAME}_${f}	78	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ac_${f} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}_${f}
80	.endfor	79	.endfor
81	.if !defined(NOPORTDATA)	80	.if !defined(NOPORTDATA)
82	${MKDIR} ${DATADIR}	81	${MKDIR} ${STAGEDIR}${DATADIR}
83	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}	82	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
84	.endif	83	.endif
85	.if ${PORT_OPTIONS:MDOCS}	84	.if ${PORT_OPTIONS:MDOCS}
86	${MKDIR} ${DOCSDIR}	85	${MKDIR} ${STAGEDIR}${DOCSDIR}
87	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}	86	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
88	.endif	87	.endif
89		88
90	post-install:	89	post-install:

Lines 1-25 Link Here

(-)assaultcube/files/assaultcube_client.in (-23 / +2 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	# The executable needs to be run from its data directory, and needs to store	3	CUBE_OPTIONS="--home=${HOME}/.assaultcube --init"
4	# configuration in it. We therefore mirror the data directory hierarchy in	4	cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_client ${CUBE_OPTIONS} "$@"
5	# ~/.XXX, and create symlinks to the data files, but the configuration files
6	# are copied, and write permission for the user is added to them.
7
8	APPNAME="assaultcube"
9	CUBE_OPTIONS="--home=${HOME}/.${APPNAME} --init"
10
11	if [ -d ~/.$APPNAME ]
12	then
13	echo "Using existing ~/.$APPNAME directory."
14	else
15	echo "Creating ~/.$APPNAME directory."
16	cd %%DATADIR%% \|\| exit 1
17	find * -type d -exec mkdir -p ~/.$APPNAME/{} \;
18	find * -type f -name "*.cfg" \
19	-exec cp %%DATADIR%%/{} ~/.$APPNAME/{} \; \
20	-exec chmod u+w ~/.$APPNAME/{} \; 2>/dev/null
21	find * -type f -exec ln -s %%DATADIR%%/{} ~/.$APPNAME/{} \; 2>/dev/null
22	fi
23
24	cd ~/.$APPNAME \|\| exit 1
25	exec %%PREFIX%%/libexec/${APPNAME}_client ${CUBE_OPTIONS} "$@"

Lines 1-25 Link Here

(-)assaultcube/files/assaultcube_master.in (-22 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	# The executable needs to be run from its data directory, and needs to store
4	# configuration in it. We therefore mirror the data directory hierarchy in
5	# ~/.XXX, and create symlinks to the data files, but the configuration files
6	# are copied, and write permission for the user is added to them.
7
8	APPNAME="assaultcube"
9	CUBE_OPTIONS=	3	CUBE_OPTIONS=
10		4	cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_master ${CUBE_OPTIONS} "$@"
11	if [ -d ~/.$APPNAME ]
12	then
13	echo "Using existing ~/.$APPNAME directory."
14	else
15	echo "Creating ~/.$APPNAME directory."
16	cd %%DATADIR%% \|\| exit 1
17	find * -type d -exec mkdir -p ~/.$APPNAME/{} \;
18	find * -type f -name "*.cfg" \
19	-exec cp %%DATADIR%%/{} ~/.$APPNAME/{} \; \
20	-exec chmod u+w ~/.$APPNAME/{} \; 2>/dev/null
21	find * -type f -exec ln -s %%DATADIR%%/{} ~/.$APPNAME/{} \; 2>/dev/null
22	fi
23
24	cd ~/.$APPNAME \|\| exit 1
25	exec %%PREFIX%%/libexec/${APPNAME}_master ${CUBE_OPTIONS} "$@"

Lines 1-25 Link Here

(-)assaultcube/files/assaultcube_server.in (-22 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	# The executable needs to be run from its data directory, and needs to store
4	# configuration in it. We therefore mirror the data directory hierarchy in
5	# ~/.XXX, and create symlinks to the data files, but the configuration files
6	# are copied, and write permission for the user is added to them.
7
8	APPNAME="assaultcube"
9	CUBE_OPTIONS=	3	CUBE_OPTIONS=
10		4	cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_server ${CUBE_OPTIONS} "$@"
11	if [ -d ~/.$APPNAME ]
12	then
13	echo "Using existing ~/.$APPNAME directory."
14	else
15	echo "Creating ~/.$APPNAME directory."
16	cd %%DATADIR%% \|\| exit 1
17	find * -type d -exec mkdir -p ~/.$APPNAME/{} \;
18	find * -type f -name "*.cfg" \
19	-exec cp %%DATADIR%%/{} ~/.$APPNAME/{} \; \
20	-exec chmod u+w ~/.$APPNAME/{} \; 2>/dev/null
21	find * -type f -exec ln -s %%DATADIR%%/{} ~/.$APPNAME/{} \; 2>/dev/null
22	fi
23
24	cd ~/.$APPNAME \|\| exit 1
25	exec %%PREFIX%%/libexec/${APPNAME}_server ${CUBE_OPTIONS} "$@"

Lines 1-29 Link Here

(-)assaultcube/files/patch-source_src_Makefile (-11 / +9 lines)
1	--- source/src/Makefile.orig 2010-11-15 00:46:24.000000000 +0600	1	--- source/src/Makefile.orig 2013-10-09 23:35:27.000000000 +0400
2	+++ source/src/Makefile 2010-11-30 07:29:06.000000000 +0600	2	+++ source/src/Makefile 2013-10-11 02:18:50.000000000 +0400
3	@@ -1,9 +1,8 @@	3	@@ -1,8 +1,7 @@
4	//CXX=g++-gcc-4.2.3
5	-CXXFLAGS= -O3 -fomit-frame-pointer	4	-CXXFLAGS= -O3 -fomit-frame-pointer
6	override CXXFLAGS+= -Wall -fsigned-char	5	override CXXFLAGS+= -Wall -fsigned-char
7		6
8	PLATFORM= $(shell uname -s)	7	PLATFORM= $(shell uname -s)
9	-PLATFORM_PREFIX=native	8	-PLATFORM_PREFIX=native
10	+PLATFORM_PREFIX= FreeBSD	9	+PLATFORM_PREFIX=FreeBSD
11		10
12	INCLUDES= -I. -Ibot -I../enet/include	11	INCLUDES= -I. -Ibot -I../enet/include
13		12
14	@@ -24,9 +23,9 @@	13	@@ -21,8 +20,8 @@
15	else	14	else
16	USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)	15	USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
17	override CXXFLAGS+= -rdynamic	16	override CXXFLAGS+= -rdynamic
18	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include	17	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
19	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -idirafter ../include	18	-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
20	# -lSDL_ttf	19	+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
21	-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile	20	+CLIENT_LIBS= -L../enet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
22	+CLIENT_LIBS= -L../enet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lz -lGL -lopenal -lvorbisfile -lintl
23	endif	21	endif
24		22
25	CLIENT_OBJS= \	23	CLIENT_OBJS= \
26	@@ -92,8 +91,8 @@	24	@@ -86,8 +85,8 @@
27	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include	25	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
28	SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm	26	SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
29	else	27	else