Index: branches/2015Q2/games/assaultcube/Makefile =================================================================== --- branches/2015Q2/games/assaultcube/Makefile (revision 388541) +++ branches/2015Q2/games/assaultcube/Makefile (revision 388542) @@ -1,82 +1,92 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= assaultcube PORTVERSION= 1.2.0.2 PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION} DISTNAME= AssaultCube_v${PORTVERSION} MAINTAINER= lightside@gmx.com COMMENT= Total conversion of the FPS game called Cube LICENSE= ACUBE CUBE MIT OTHER LICENSE_COMB= multi LICENSE_NAME_ACUBE= AssaultCube ZLIB-like license with additions LICENSE_NAME_CUBE= Cube game engine ZLIB-like license with additions LICENSE_NAME_OTHER= various package licences LICENSE_FILE_ACUBE= ${WRKSRC}/source/README.txt LICENSE_FILE_CUBE= ${WRKSRC}/source/README_CUBEENGINE.txt LICENSE_FILE_OTHER= ${WRKSRC}/docs/package_copyrights.txt LICENSE_PERMS_ACUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_CUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept USES= gmake tar:bzip2 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 SUB_FILES= ${PLIST_FILES:Mbin/*:T} PORTDATA= config packages scripts PORTDOCS= * PLIST_DIRS= %%DATADIR%%/packages/maps/servermaps/incoming OPTIONS_DEFINE= DOCS OPTIONS_MULTI= BUILD OPTIONS_MULTI_BUILD= CLIENT DEDICATED MASTER OPTIONS_DEFAULT= CLIENT DEDICATED CLIENT_DESC= Build client CLIENT_USES= gettext-runtime openal:al CLIENT_USE= GL=gl SDL=image,sdl XORG=x11 CLIENT_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ libcurl.so:${PORTSDIR}/ftp/curl CLIENT_ALL_TARGET= client CLIENT_PLIST_FILES= bin/${PORTNAME}_client libexec/${PORTNAME}_client \ share/pixmaps/${PORTNAME}.png DEDICATED_DESC= Build dedicated server DEDICATED_ALL_TARGET= server DEDICATED_PLIST_FILES= bin/${PORTNAME}_server libexec/${PORTNAME}_server MASTER_DESC= Build master server MASTER_ALL_TARGET= master MASTER_PLIST_FILES= bin/${PORTNAME}_master libexec/${PORTNAME}_master .include .if ${PORT_OPTIONS:MCLIENT} DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \ "${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}_client" \ "Game;" false .endif +post-patch: .SILENT + ${REINPLACE_CMD} -e '/^CXXFLAGS=/d ; /^CXX=/d ; /^CLIENT_PCH/d ; \ + /^INCLUDES=/s|$$| -I$$(LOCALBASE)/include| ; \ + s|-I/usr/include || ; \ + s|sdl-config|$$(SDL_CONFIG)| ; \ + s|$$(USRLIB)|$$(LOCALBASE)/lib| ; \ + /^CLIENT_LIBS=/s|$$| -lintl| ; \ + /^SERVER_LIBS=/s|$$| -L$$(LOCALBASE)/lib|' \ + ${BUILD_WRKSRC}/Makefile + do-install: .for f in ${PLIST_FILES:Mbin/*} ${INSTALL_SCRIPT} ${WRKDIR}/${f:T} ${STAGEDIR}${PREFIX}/${f} .endfor .for f in ${PLIST_FILES:Mlibexec/*} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f:T:S/${PORTNAME}/ac/} \ ${STAGEDIR}${PREFIX}/${f} .endfor .if ${PORT_OPTIONS:MCLIENT} ${INSTALL_DATA} ${WRKSRC}/docs/images/icon.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}) (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Index: branches/2015Q2/games/assaultcube/files/patch-source_src_Makefile =================================================================== --- branches/2015Q2/games/assaultcube/files/patch-source_src_Makefile (revision 388541) +++ branches/2015Q2/games/assaultcube/files/patch-source_src_Makefile (nonexistent) @@ -1,35 +0,0 @@ ---- source/src/Makefile.orig 2013-10-29 13:20:58.000000000 +0400 -+++ source/src/Makefile 2013-10-29 17:00:06.000000000 +0400 -@@ -1,9 +1,7 @@ --CXXFLAGS= -O3 -fomit-frame-pointer --CXX=clang++ # Use clang++, as g++ optimizations cause crashes... - override CXXFLAGS+= -Wall -fsigned-char - - PLATFORM= $(shell uname -s) --PLATFORM_PREFIX=native -+PLATFORM_PREFIX=FreeBSD - - INCLUDES= -I. -Ibot -I../enet/include - -@@ -22,8 +20,8 @@ - else - USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) - # override CXXFLAGS+= -rdynamic # clang++ doesn't use this... --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 - endif - - CLIENT_OBJS= \ -@@ -87,8 +85,8 @@ - SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include - SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm - else --SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) --SERVER_LIBS= -L../enet/.libs -lenet -lz -+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include -+SERVER_LIBS= -L../enet/.libs -lenet -lz -L${LOCALBASE}/lib - endif - - SERVER_OBJS= \ Property changes on: branches/2015Q2/games/assaultcube/files/patch-source_src_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q2/games/assaultcube/files/patch-source_enet_unix.c =================================================================== --- branches/2015Q2/games/assaultcube/files/patch-source_enet_unix.c (nonexistent) +++ branches/2015Q2/games/assaultcube/files/patch-source_enet_unix.c (revision 388542) @@ -0,0 +1,20 @@ +--- source/enet/unix.c.orig 2013-10-22 18:57:22 UTC ++++ source/enet/unix.c +@@ -97,7 +97,7 @@ enet_address_set_host (ENetAddress * add + char buffer [2048]; + int errnum; + +-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum); + #else + hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum); +@@ -150,7 +150,7 @@ enet_address_get_host (const ENetAddress + + in.s_addr = address -> host; + +-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum); + #else + hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum); Property changes on: branches/2015Q2/games/assaultcube/files/patch-source_enet_unix.c ___________________________________________________________________ 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: branches/2015Q2/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp =================================================================== --- branches/2015Q2/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp (revision 388541) +++ branches/2015Q2/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp (revision 388542) @@ -1,11 +1,11 @@ ---- source/src/bot/bot_waypoint.cpp.orig 2013-11-10 22:50:03.000000000 +0400 -+++ source/src/bot/bot_waypoint.cpp 2015-02-13 07:33:14.000000000 +0400 +--- source/src/bot/bot_waypoint.cpp.orig 2013-11-10 18:50:03 UTC ++++ source/src/bot/bot_waypoint.cpp @@ -848,7 +848,7 @@ if (!pWP) { - conoutf("Error: Couldnīt find near waypoint"); + conoutf("Error: Couldn't find near waypoint"); return; } Index: branches/2015Q2/games/assaultcube/files/patch-source_src_console.h =================================================================== --- branches/2015Q2/games/assaultcube/files/patch-source_src_console.h (revision 388541) +++ branches/2015Q2/games/assaultcube/files/patch-source_src_console.h (revision 388542) @@ -1,17 +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 +--- source/src/console.h.orig 2013-10-09 08:27:31 UTC ++++ source/src/console.h @@ -127,7 +127,7 @@ } }; -/** WIP ALERT */ +/** WIP ALERT *//* struct textinputbuffer_wip { string buf; @@ -257,4 +257,4 @@ return false; } }; - +*/ Index: branches/2015Q2/games/assaultcube/files/patch-source_src_master.cpp =================================================================== --- branches/2015Q2/games/assaultcube/files/patch-source_src_master.cpp (revision 388541) +++ branches/2015Q2/games/assaultcube/files/patch-source_src_master.cpp (revision 388542) @@ -1,11 +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 +--- source/src/master.cpp.orig 2013-10-09 08:27:37 UTC ++++ source/src/master.cpp @@ -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 buf; buf.setsize(0); a.answer = genchallenge(u->pubkey, seed, sizeof(seed), buf); Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 388541) +++ branches/2015Q2 (revision 388542) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r385392