From owner-svn-ports-all@FreeBSD.ORG Mon Jun 23 14:56:16 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2F64476; Mon, 23 Jun 2014 14:56:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B37C020DC; Mon, 23 Jun 2014 14:56:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5NEuGUE077242; Mon, 23 Jun 2014 14:56:16 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5NEuGmW077239; Mon, 23 Jun 2014 14:56:16 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201406231456.s5NEuGmW077239@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 23 Jun 2014 14:56:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358966 - in head/games/vegastrike: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2014 14:56:16 -0000 Author: danfe Date: Mon Jun 23 14:56:15 2014 New Revision: 358966 URL: http://svnweb.freebsd.org/changeset/ports/358966 QAT: https://qat.redports.org/buildarchive/r358966/ Log: - BROKEN statement in r358925 is misleading: it seem that Boost is the one to blame: in v1.53 they had the following change in their headers: - explicit shared_array(T * p = 0): px(p), pn(p, deleter()) + shared_array() BOOST_NOEXCEPT : px( 0 ), pn() { } + template + explicit shared_array( Y * p ): px( p ), pn( p, checked_array_deleter() ) + { + boost::detail::sp_assert_convertible< Y[], T[] >(); + } The solution is pretty simple: use default constructor instead of NULL when initializing a shared_array; it was the default anyway [1] - Add missing `pkgconfig' to USES, otherwise it won't find GTK+2 - Cleanup Makefile, sort the knobs, trim USE_GL (glut implies gl and glu) - Transfer maintainership to games@ team - Reword COMMENT and port description; add LICENSE (GPLv2) while here [1] http://www.luxrender.net/mantis/view.php?id=1368 Modified: head/games/vegastrike/Makefile head/games/vegastrike/files/patch-c++ head/games/vegastrike/pkg-descr Modified: head/games/vegastrike/Makefile ============================================================================== --- head/games/vegastrike/Makefile Mon Jun 23 14:43:21 2014 (r358965) +++ head/games/vegastrike/Makefile Mon Jun 23 14:56:15 2014 (r358966) @@ -5,13 +5,13 @@ PORTNAME= vegastrike PORTVERSION= 0.5.1.r1 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.5.1/ -DISTNAME= vegastrike-src-${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/ +DISTNAME= ${PORTNAME}-src-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= Opensource 3D space simulator +MAINTAINER= games@FreeBSD.org +COMMENT= Open source 3D space simulator -BROKEN= Does not build with any modern compiler +LICENSE= GPLv2 RUN_DEPENDS= ${DATADIR}/vegastrike.ico:${PORTSDIR}/games/vegastrike-data LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ @@ -19,18 +19,19 @@ LIB_DEPENDS= libboost_python.so:${PORTSD libvorbis.so:${PORTSDIR}/audio/libvorbis \ libogg.so:${PORTSDIR}/audio/libogg +USES= dos2unix gmake openal:al pkgconfig tar:bzip2 GNU_CONFIGURE= yes -USES= dos2unix gmake openal:al tar:bzip2 USE_PYTHON= yes USE_SDL= sdl +USE_GL= glut USE_XORG= sm ice xi x11 xext xrender xinerama xi xrandr xcursor \ xcomposite xdamage xfixes -USE_GL= gl glu glut USE_GNOME= gtk20 +DOS2UNIX_GLOB= *.cpp *.h +EXTRACT_AFTER_ARGS= --exclude boost + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -DOS2UNIX_GLOB= *.cpp *.h -EXTRACT_AFTER_ARGS+=--exclude boost # cegui and ffmpeg are not used yet CONFIGURE_ARGS= --disable-cegui --disable-ffmpeg \ @@ -39,7 +40,6 @@ CONFIGURE_ARGS= --disable-cegui --disabl --enable-flags="${CXXFLAGS}" PLIST_FILES= bin/vegastrike bin/vssetup bin/vegaserver - PORTDOCS= README OPTIONS_DEFINE= MESHER @@ -50,13 +50,13 @@ MESHER_LIB_DEPENDS= libOgreMain.so:${POR MESHER_CONFIGURE_ENABLE= ogre post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \ - s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -E 's,/usr/(local|X11R6),${LOCALBASE},' \ + ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${PLIST_FILES:S|bin|${WRKSRC}|} \ ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/games/vegastrike/files/patch-c++ ============================================================================== --- head/games/vegastrike/files/patch-c++ Mon Jun 23 14:43:21 2014 (r358965) +++ head/games/vegastrike/files/patch-c++ Mon Jun 23 14:56:15 2014 (r358966) @@ -31,3 +31,14 @@ + static int hash_int( const double aye ) { return ( (int) ( ( (aye < 0) ? (aye +--- src/networking/lowlevel/packetmem.cpp.orig 2014-06-23 21:30:46 +0800 ++++ src/networking/lowlevel/packetmem.cpp 2014-06-23 21:31:01 +0800 +@@ -102,7 +102,7 @@ void PacketMem::inner_set( void* buffer, + } + else + { +- _buffer.reset( 0 ); ++ _buffer.reset(); + _len = 0; + } + } Modified: head/games/vegastrike/pkg-descr ============================================================================== --- head/games/vegastrike/pkg-descr Mon Jun 23 14:43:21 2014 (r358965) +++ head/games/vegastrike/pkg-descr Mon Jun 23 14:56:15 2014 (r358966) @@ -1,15 +1,12 @@ -Vega Strike is an OpenSource 3d Space Simulator. Work is proceeding -on both the Vega Strike game engine and a Vega Strike Universe game -data set. Both engine and data are in a playable state, but still -under development. Each release serves as a beta for both engine -and data. +Vega Strike is an open source, 3D space simulator. Work is proceeding on +both the Vega Strike game engine and a Vega Strike Universe game data set. +Both engine and data are in a playable state, but still under development. +Each release serves as a beta for both engine and data. Current features +include: -The project goal is, at version 1.0, is to be a generic space -simulator. Currently developed features include: + * Trading + * Exploration + * Plenty of shoot 'em up action + * Preliminary multiplayer deathmatch (testing server only) -* Trading -* Exploration -* Plenty of shoot 'em up action -* Preliminary multiplayer Deathmatch (testing server only) - -WWW: http://vegastrike.sourceforge.net +WWW: http://vegastrike.sourceforge.net/