From owner-svn-ports-head@FreeBSD.ORG Sun Mar 10 04:24:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 967E8659; Sun, 10 Mar 2013 04:24:38 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 73EF6AE8; Sun, 10 Mar 2013 04:24:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2A4OcFk045779; Sun, 10 Mar 2013 04:24:38 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2A4Obs5045774; Sun, 10 Mar 2013 04:24:37 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201303100424.r2A4Obs5045774@svn.freebsd.org> From: Dmitry Marakasov Date: Sun, 10 Mar 2013 04:24:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313801 - in head/games/openlierox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Mar 2013 04:24:38 -0000 Author: amdmi3 Date: Sun Mar 10 04:24:37 2013 New Revision: 313801 URL: http://svnweb.freebsd.org/changeset/ports/313801 Log: - Update to 0.59_beta10 Added: head/games/openlierox/files/patch-src-common-Debug_DumpCallstack.cpp (contents, props changed) head/games/openlierox/files/patch-src-common-SystemFunctions.cpp (contents, props changed) head/games/openlierox/files/patch-src-gusanos-objects_list.h (contents, props changed) Deleted: head/games/openlierox/files/patch-src-gusanos-blitters-mmx.h Modified: head/games/openlierox/Makefile head/games/openlierox/distinfo Modified: head/games/openlierox/Makefile ============================================================================== --- head/games/openlierox/Makefile Sun Mar 10 04:17:01 2013 (r313800) +++ head/games/openlierox/Makefile Sun Mar 10 04:24:37 2013 (r313801) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openlierox -DISTVERSION= 0.59_beta9 -PORTREVISION= 3 +DISTVERSION= 0.59_beta10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/} DISTNAME= OpenLieroX_${DISTVERSION}.src @@ -21,6 +20,7 @@ USE_SDL= sdl image USE_GNOME= libxml2 MAKE_JOBS_SAFE= yes USE_OPENAL= yes +USE_GCC= 4.6+ CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include @@ -30,7 +30,8 @@ USE_CMAKE= yes CMAKE_ARGS= -DHAWKNL_BUILTIN=YES \ -DLIBZIP_BUILTIN=YES \ -DBREAKPAD=NO \ - -DSYSTEM_DATA_DIR="${DATADIR}" + -DSYSTEM_DATA_DIR="${DATADIR}" \ + -DHASBFD=NO WRKSRC= ${WRKDIR}/OpenLieroX @@ -42,11 +43,16 @@ PLIST_FILES= bin/openlierox \ share/pixmaps/OpenLieroX.svg PLIST_DIRSTRY= share/applications -OPTIONS= DEDICATED_ONLY "Build dedicated server only" off +OPTIONS_DEFINE= DEDICATED_ONLY DOCS +DEDICATED_ONLY_DESC=Build dedicated server only -.include +.include -.if defined(WITH_DEDICATED_ONLY) +.if ${OSVERSION} < 700000 +IGNORE= does not build on 7.x +.endif + +.if ${PORT_OPTIONS:MDEDICATED_ONLY} BROKEN= does not build CMAKE_ARGS+= -DDEDICATED_ONLY=YES .else @@ -55,7 +61,8 @@ USE_SDL+= mixer .endif post-patch: - @${REINPLACE_CMD} -e 's|-mt||; s|EXEC_PROGRAM.*OLXVER)|SET(OLXVER "${DISTVERSION}")|; \ + @${REINPLACE_CMD} -e 's|boost_signals-mt|boost_signals boost_system|; \ + s|EXEC_PROGRAM.*OLXVER)|SET(OLXVER "${DISTVERSION}")|; \ s|/usr/local|${LOCALBASE}|' ${WRKSRC}/CMakeOlxCommon.cmake @${FIND} ${WRKSRC} \( -name "*.cpp" -o -name "*.h" -o -name "*.cc" \) -print0 | ${XARGS} -0 -n1 \ ${REINPLACE_CMD} -e '/include.*curl\/types.h/ d' @@ -71,9 +78,9 @@ do-install: ${MKDIR} ${DATADIR} cd ${WRKSRC}/share/gamedir && ${COPYTREE_SHARE} . ${DATADIR}/ .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}/ .endif -.include +.include Modified: head/games/openlierox/distinfo ============================================================================== --- head/games/openlierox/distinfo Sun Mar 10 04:17:01 2013 (r313800) +++ head/games/openlierox/distinfo Sun Mar 10 04:24:37 2013 (r313801) @@ -1,2 +1,2 @@ -SHA256 (OpenLieroX_0.59_beta9.src.tar.bz2) = a5c05cca11f44d22d3f9af832c13dd55a9a0309e9f80a0e6b5d2bcb9fca160ac -SIZE (OpenLieroX_0.59_beta9.src.tar.bz2) = 100913507 +SHA256 (OpenLieroX_0.59_beta10.src.tar.bz2) = 5f4bcc83c7f90fae716820ac9c4c6ee266c143abc55ce6b9efd0603b7c1d057c +SIZE (OpenLieroX_0.59_beta10.src.tar.bz2) = 103956181 Added: head/games/openlierox/files/patch-src-common-Debug_DumpCallstack.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openlierox/files/patch-src-common-Debug_DumpCallstack.cpp Sun Mar 10 04:24:37 2013 (r313801) @@ -0,0 +1,20 @@ +--- src/common/Debug_DumpCallstack.cpp.orig 2012-04-17 04:26:14.000000000 +0400 ++++ src/common/Debug_DumpCallstack.cpp 2012-12-14 23:19:15.525963503 +0400 +@@ -11,6 +11,8 @@ + #include "util/macros.h" + #include + #include ++#include ++#include + + #ifndef HAVE_EXECINFO + # if defined(__linux__) +@@ -25,8 +27,6 @@ + #if HAVE_EXECINFO + + #include +-#include +-#include + + #if HASBFD + Added: head/games/openlierox/files/patch-src-common-SystemFunctions.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openlierox/files/patch-src-common-SystemFunctions.cpp Sun Mar 10 04:24:37 2013 (r313801) @@ -0,0 +1,15 @@ +--- src/common/SystemFunctions.cpp.orig 2012-04-17 04:26:14.000000000 +0400 ++++ src/common/SystemFunctions.cpp 2012-12-14 23:18:03.318932050 +0400 +@@ -63,8 +63,10 @@ + #if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 + #define HAVE_PTHREAD_NAME + // glibc 2.12 introduced this +-#elif __GLIBC_PREREQ(2,12) +-#define HAVE_PTHREAD_NAME ++#elif defined(__GLIBC_PREREQ) ++# if __GLIBC_PREREQ(2,12) ++# define HAVE_PTHREAD_NAME ++# endif + #endif + #endif + Added: head/games/openlierox/files/patch-src-gusanos-objects_list.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openlierox/files/patch-src-gusanos-objects_list.h Sun Mar 10 04:24:37 2013 (r313801) @@ -0,0 +1,10 @@ +--- src/gusanos/objects_list.h.orig 2012-12-14 23:03:07.488932193 +0400 ++++ src/gusanos/objects_list.h 2012-12-14 23:06:22.329933269 +0400 +@@ -4,6 +4,7 @@ + //#include "game/CGameObject.h" + #include + #include ++#include + + static const int RENDER_LAYERS_AMMOUNT = 10; + static const int COLLISION_LAYERS_AMMOUNT = 10;