Index: head/games/assaultcube/Makefile =================================================================== --- head/games/assaultcube/Makefile (revision 332587) +++ head/games/assaultcube/Makefile (revision 332588) @@ -1,94 +1,107 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= assaultcube -PORTVERSION= 1.2.0.0 +PORTVERSION= 1.2.0.1 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_COMB= multi LICENSE= ACUBE CUBE MIT OTHER LICENSE_NAME_ACUBE= AssaultCube ZLIB-like license with additions LICENSE_FILE_ACUBE= ${WRKSRC}/source/README.txt LICENSE_PERMS_ACUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_NAME_CUBE= Cube game engine ZLIB-like license with additions LICENSE_FILE_CUBE= ${WRKSRC}/source/README_CUBEENGINE.txt LICENSE_PERMS_CUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_NAME_OTHER= various package licences LICENSE_FILE_OTHER= ${WRKSRC}/docs/package_copyrights.txt LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept USE_BZIP2= yes USE_OPENAL= al USES= gmake 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 -PORTDATA= config demos packages +PORTDATA= config packages scripts PORTDOCS= * 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 .if ${PORT_OPTIONS:MCLIENT} LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl USES+= gettext USE_GL= yes USE_SDL= image mixer sdl ALL_TARGET+= client SUB_FILES+= ${PORTNAME}_client ACUBE_BIN+= client DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \ - "${DATADIR}/packages/misc/startscreen.png" "${PORTNAME}_client" \ + "${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}_client" \ "Game;" false .endif .if ${PORT_OPTIONS:MDEDICATED} ALL_TARGET+= server SUB_FILES+= ${PORTNAME}_server ACUBE_BIN+= server .endif .if ${PORT_OPTIONS:MMASTER} ALL_TARGET+= master SUB_FILES+= ${PORTNAME}_master ACUBE_BIN+= master .endif +pre-install: .SILENT +.if !defined(NOPORTDATA) + # Current STAGEDIR doesn't create empty directories for package, + # in case of dynamically generated TMPPLIST, where these directories exist + ${RMDIR} ${WRKSRC}/packages/maps/servermaps/incoming +.endif + 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 +.if ${PORT_OPTIONS:MCLIENT} + ${INSTALL_DATA} ${WRKSRC}/docs/images/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png +.endif post-install: .for f in ${ACUBE_BIN} @${ECHO_CMD} bin/${PORTNAME}_${f} >> ${TMPPLIST} @${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST} .endfor +.if ${PORT_OPTIONS:MCLIENT} + @${ECHO_CMD} share/pixmaps/${PORTNAME}.png >> ${TMPPLIST} +.endif .include Index: head/games/assaultcube/distinfo =================================================================== --- head/games/assaultcube/distinfo (revision 332587) +++ head/games/assaultcube/distinfo (revision 332588) @@ -1,2 +1,2 @@ -SHA256 (AssaultCube_v1.2.0.0.tar.bz2) = 90b4a7278645d3297f3031b77f9ce3d9a059c2edd6b465fe4c9b0d7514b06a61 -SIZE (AssaultCube_v1.2.0.0.tar.bz2) = 52756452 +SHA256 (AssaultCube_v1.2.0.1.tar.bz2) = b5e0a30fe038fed292138268077ce916dcff0690edc1ce2f06330b4132345001 +SIZE (AssaultCube_v1.2.0.1.tar.bz2) = 53143395 Property changes on: head/games/assaultcube/distinfo ___________________________________________________________________ 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: head/games/assaultcube/files/patch-source_src_Makefile =================================================================== --- head/games/assaultcube/files/patch-source_src_Makefile (revision 332587) +++ head/games/assaultcube/files/patch-source_src_Makefile (revision 332588) @@ -1,34 +1,35 @@ ---- 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 @@ +--- 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 -@@ -21,8 +20,8 @@ +@@ -22,8 +20,8 @@ else USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) - override CXXFLAGS+= -rdynamic + # 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= \ -@@ -86,8 +85,8 @@ +@@ -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: head/games/assaultcube/files/patch-source_src_Makefile ___________________________________________________________________ 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