ports/182889: [MAINTAINER] games/assaultcube: Update to v1.2.0.0
Sender Ghost
lightside at gmx.com
Thu Oct 10 23:40:01 UTC 2013
>Number: 182889
>Category: ports
>Synopsis: [MAINTAINER] games/assaultcube: Update to v1.2.0.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 10 23:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Sender Ghost
>Release: FreeBSD 9.2-RELEASE
>Organization:
>Environment:
>Description:
Patch to update games/assaultcube port from 1.1.0.4 to 1.2.0.0 version.
Look following link for changes:
http://assault.cubers.net/docs/history.html
Also changed launcher scripts and removed the need to create symlinks for data files (as games/redeclipse port's maintainer did).
Added STAGEDIR support.
Tested on GCC v4.2 and v4.8, Clang v3.3 (including with "-std=c++11" compiler option).
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN assaultcube.orig/Makefile assaultcube/Makefile
--- assaultcube.orig/Makefile 2013-09-20 21:36:33.000000000 +0400
+++ assaultcube/Makefile 2013-10-11 02:49:48.000000000 +0400
@@ -2,12 +2,11 @@
# $FreeBSD: games/assaultcube/Makefile 327730 2013-09-20 17:36:33Z bapt $
PORTNAME= assaultcube
-PORTVERSION= 1.1.0.4
-PORTREVISION= 4
+PORTVERSION= 1.2.0.0
+PORTREVISION= 0
CATEGORIES= games
MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
-DISTFILES= AssaultCube_v${PORTVERSION}_source${EXTRACT_SUFX} \
- AssaultCube_v${PORTVERSION}${EXTRACT_SUFX}
+DISTNAME= AssaultCube_v${PORTVERSION}
MAINTAINER= lightside at gmx.com
COMMENT= Total conversion of the FPS game called Cube
@@ -29,7 +28,7 @@
USE_GMAKE= yes
GNU_CONFIGURE= yes
ALL_TARGET= libenet
-WRKSRC= ${WRKDIR}/${PORTVERSION}
+WRKSRC= ${WRKDIR}/AssaultCube_v${PORTVERSION}
CONFIGURE_ARGS= --enable-shared=no --enable-static=yes
CONFIGURE_WRKSRC= ${WRKSRC}/source/enet
BUILD_WRKSRC= ${WRKSRC}/source/src
@@ -45,10 +44,10 @@
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
@@ -75,16 +74,16 @@
do-install:
.for f in ${ACUBE_BIN}
- ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ac_${f} ${PREFIX}/libexec/${PORTNAME}_${f}
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ac_${f} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}_${f}
.endfor
.if !defined(NOPORTDATA)
- ${MKDIR} ${DATADIR}
- cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
+ ${MKDIR} ${STAGEDIR}${DATADIR}
+ cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
.endif
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.endif
post-install:
diff -ruN assaultcube.orig/distinfo assaultcube/distinfo
--- assaultcube.orig/distinfo 2012-07-14 17:54:48.000000000 +0400
+++ assaultcube/distinfo 2013-10-11 02:41:03.000000000 +0400
@@ -1,4 +1,2 @@
-SHA256 (AssaultCube_v1.1.0.4.tar.bz2) = fea2056aa7262617b96b06ea0b85422bcec54d88cd88689c2c73ade3bd0ba029
-SIZE (AssaultCube_v1.1.0.4.tar.bz2) = 47051151
-SHA256 (AssaultCube_v1.1.0.4_source.tar.bz2) = 045925610c54b2764a79286aeb1942df2cc5ce52b710c26b447eea69fa6b1129
-SIZE (AssaultCube_v1.1.0.4_source.tar.bz2) = 2560572
+SHA256 (AssaultCube_v1.2.0.0.tar.bz2) = 90b4a7278645d3297f3031b77f9ce3d9a059c2edd6b465fe4c9b0d7514b06a61
+SIZE (AssaultCube_v1.2.0.0.tar.bz2) = 52756452
diff -ruN assaultcube.orig/files/assaultcube_client.in assaultcube/files/assaultcube_client.in
--- assaultcube.orig/files/assaultcube_client.in 2012-07-14 17:54:48.000000000 +0400
+++ assaultcube/files/assaultcube_client.in 2013-10-01 06:50:01.000000000 +0400
@@ -1,25 +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
-# ~/.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} "$@"
+CUBE_OPTIONS="--home=${HOME}/.assaultcube --init"
+cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_client ${CUBE_OPTIONS} "$@"
diff -ruN assaultcube.orig/files/assaultcube_master.in assaultcube/files/assaultcube_master.in
--- assaultcube.orig/files/assaultcube_master.in 2012-07-14 17:54:48.000000000 +0400
+++ assaultcube/files/assaultcube_master.in 2013-10-01 06:40:30.000000000 +0400
@@ -1,25 +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
-# ~/.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=
-
-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} "$@"
+cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_master ${CUBE_OPTIONS} "$@"
diff -ruN assaultcube.orig/files/assaultcube_server.in assaultcube/files/assaultcube_server.in
--- assaultcube.orig/files/assaultcube_server.in 2012-07-14 17:54:48.000000000 +0400
+++ assaultcube/files/assaultcube_server.in 2013-10-01 06:40:29.000000000 +0400
@@ -1,25 +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
-# ~/.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=
-
-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} "$@"
+cd %%DATADIR%% && exec %%PREFIX%%/libexec/assaultcube_server ${CUBE_OPTIONS} "$@"
diff -ruN assaultcube.orig/files/patch-source_src_Makefile assaultcube/files/patch-source_src_Makefile
--- assaultcube.orig/files/patch-source_src_Makefile 2012-07-14 17:54:48.000000000 +0400
+++ assaultcube/files/patch-source_src_Makefile 2013-10-11 02:20:08.000000000 +0400
@@ -1,29 +1,27 @@
---- source/src/Makefile.orig 2010-11-15 00:46:24.000000000 +0600
-+++ source/src/Makefile 2010-11-30 07:29:06.000000000 +0600
-@@ -1,9 +1,8 @@
- //CXX=g++-gcc-4.2.3
+--- 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 @@
-CXXFLAGS= -O3 -fomit-frame-pointer
override CXXFLAGS+= -Wall -fsigned-char
PLATFORM= $(shell uname -s)
-PLATFORM_PREFIX=native
-+PLATFORM_PREFIX= FreeBSD
++PLATFORM_PREFIX=FreeBSD
INCLUDES= -I. -Ibot -I../enet/include
-@@ -24,9 +23,9 @@
+@@ -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_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -idirafter ../include
- # -lSDL_ttf
--CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile
-+CLIENT_LIBS= -L../enet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lz -lGL -lopenal -lvorbisfile -lintl
+-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
endif
CLIENT_OBJS= \
-@@ -92,8 +91,8 @@
+@@ -86,8 +85,8 @@
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
else
diff -ruN assaultcube.orig/files/patch-source_src_console.h assaultcube/files/patch-source_src_console.h
--- assaultcube.orig/files/patch-source_src_console.h 1970-01-01 03:00:00.000000000 +0300
+++ assaultcube/files/patch-source_src_console.h 2013-10-11 02:23:55.000000000 +0400
@@ -0,0 +1,17 @@
+--- source/src/console.h.orig 2013-10-09 12:27:31.000000000 +0400
++++ source/src/console.h 2013-10-11 02:23:35.000000000 +0400
+@@ -127,7 +127,7 @@
+ }
+ };
+
+-/** WIP ALERT */
++/** WIP ALERT *//*
+ struct textinputbuffer_wip
+ {
+ string buf;
+@@ -257,4 +257,4 @@
+ return false;
+ }
+ };
+-
++*/
diff -ruN assaultcube.orig/files/patch-source_src_master.cpp assaultcube/files/patch-source_src_master.cpp
--- assaultcube.orig/files/patch-source_src_master.cpp 1970-01-01 03:00:00.000000000 +0300
+++ assaultcube/files/patch-source_src_master.cpp 2013-10-11 02:27:04.000000000 +0400
@@ -0,0 +1,11 @@
+--- source/src/master.cpp.orig 2013-10-09 12:27:37.000000000 +0400
++++ source/src/master.cpp 2013-10-11 02:26:24.000000000 +0400
+@@ -510,7 +510,7 @@
+ authreq &a = c.authreqs.add();
+ a.reqtime = servtime;
+ a.id = id;
+- uint seed[3] = { starttime, servtime, randomMT() };
++ uint seed[3] = { (uint)starttime, servtime, randomMT() };
+ static vector<char> buf;
+ buf.setsize(0);
+ a.answer = genchallenge(u->pubkey, seed, sizeof(seed), buf);
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list