From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 21 04:40:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 A8A63371 for ; Tue, 21 Jan 2014 04:40:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 820801F2D for ; Tue, 21 Jan 2014 04:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s0L4e1j8060670 for ; Tue, 21 Jan 2014 04:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s0L4e1XR060669; Tue, 21 Jan 2014 04:40:01 GMT (envelope-from gnats) Resent-Date: Tue, 21 Jan 2014 04:40:01 GMT Resent-Message-Id: <201401210440.s0L4e1XR060669@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5ABF62AF for ; Tue, 21 Jan 2014 04:36:09 +0000 (UTC) Received: from smtpout6.timeweb.ru (smtpout6.timeweb.ru [92.53.117.39]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 147171F06 for ; Tue, 21 Jan 2014 04:36:08 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1W5T4C-0001OJ-1V; Tue, 21 Jan 2014 08:36:00 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id AA43B5DA; Tue, 21 Jan 2014 08:35:59 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 7E3F418862; Tue, 21 Jan 2014 08:35:59 +0400 (MSK) Message-Id: <20140121043559.7E3F418862@hades.panopticon> Date: Tue, 21 Jan 2014 08:35:59 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/185955: [PATCH] games/armagetron: fix build on 10.x Cc: ianthetechie@gmail.com X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jan 2014 04:40:01 -0000 >Number: 185955 >Category: ports >Synopsis: [PATCH] games/armagetron: fix build on 10.x >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jan 21 04:40:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Fix build on 10.x - Support staging - Use new LIB_DEPENDS syntax - Convert USE_GMAKE to USES Port maintainer (ianthetechie@gmail.com) is cc'd. Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- armagetron-0.2.8.2.1_7.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 340547) +++ Makefile (working copy) @@ -12,15 +12,15 @@ MAINTAINER= ianthetechie@gmail.com COMMENT= A multiplayer networked Tron clone in 3D -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-etc --disable-initscripts CXXFLAGS+= ${CFLAGS} -I${LOCALBASE}/include BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - xml2.5:${PORTSDIR}/textproc/libxml2 +LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng.so:${PORTSDIR}/graphics/png \ + libxml2.so:${PORTSDIR}/textproc/libxml2 OPTIONS_DEFINE= MUSIC ARMA_SERVER_ONLY MUSIC_DESC= Compile in support for background music @@ -28,7 +28,6 @@ OPTIONS_DEFAULT= MUSIC -NO_STAGE= yes .include .if ${PORT_OPTIONS:MARMA_SERVER_ONLY} Index: files/patch-src-network-nNetwork.h =================================================================== --- files/patch-src-network-nNetwork.h (revision 0) +++ files/patch-src-network-nNetwork.h (working copy) @@ -0,0 +1,18 @@ +--- src/network/nNetwork.h.orig 2006-05-13 18:17:31.000000000 +0400 ++++ src/network/nNetwork.h 2014-01-21 03:43:27.673781684 +0400 +@@ -466,7 +466,6 @@ + template void BinWrite (const T &x){ + for(unsigned int i=0;i(&x))[i]); +- return *this; + } + + bool End(){return readOut>=static_cast(data.Len());} +@@ -478,7 +477,6 @@ + template void BinRead (const T &x){ + for(unsigned int i=0;i(&x)[i]); +- return *this; + } + + Property changes on: files/patch-src-network-nNetwork.h ___________________________________________________________________ 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: files/patch-src-tools-tDirectories.cpp =================================================================== --- files/patch-src-tools-tDirectories.cpp (revision 0) +++ files/patch-src-tools-tDirectories.cpp (working copy) @@ -0,0 +1,34 @@ +--- src/tools/tDirectories.cpp.orig 2006-06-03 00:38:09.000000000 +0400 ++++ src/tools/tDirectories.cpp 2014-01-21 04:04:51.106693362 +0400 +@@ -469,6 +469,7 @@ + class tPathConfig: public tPath + { + public: ++ tPathConfig() {} + private: + void Paths ( tArray< tString >& paths ) const + { +@@ -500,6 +501,7 @@ + class tPathData: public tPath + { + public: ++ tPathData() {} + private: + void Paths ( tArray< tString >& paths ) const + { +@@ -521,6 +523,7 @@ + class tPathVar: public tPath + { + public: ++ tPathVar() {} + private: + void Paths ( tArray< tString >& paths ) const + { +@@ -547,6 +550,7 @@ + class tPathScreenshot: public tPath + { + public: ++ tPathScreenshot() {} + private: + void Paths ( tArray< tString >& paths ) const + { Property changes on: files/patch-src-tools-tDirectories.cpp ___________________________________________________________________ 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 Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: files/patch-src-tools-tDirectories.h =================================================================== --- files/patch-src-tools-tDirectories.h (revision 0) +++ files/patch-src-tools-tDirectories.h (working copy) @@ -0,0 +1,10 @@ +--- src/tools/tDirectories.h.orig 2006-05-13 18:17:31.000000000 +0400 ++++ src/tools/tDirectories.h 2014-01-21 04:05:08.261691701 +0400 +@@ -55,6 +55,7 @@ + + class tPathResource: public tPath { + public: ++ tPathResource() {} + tString GetWritePath(const char *filename) const; + tString GetIncluded() const; //!< returns the path to the included resources + private: Property changes on: files/patch-src-tools-tDirectories.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property 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 Index: files/patch-src-tools-tList.h =================================================================== --- files/patch-src-tools-tList.h (revision 0) +++ files/patch-src-tools-tList.h (working copy) @@ -0,0 +1,11 @@ +--- src/tools/tList.h.orig 2005-05-19 10:25:11.000000000 +0400 ++++ src/tools/tList.h 2014-01-21 03:42:56.488783879 +0400 +@@ -149,7 +149,7 @@ + } + (*this)[this->Len()-1] = NULL; + +- SetLen(this->Len()-1); ++ this->SetLen(this->Len()-1); + + if ( REFERENCE ) + { Property changes on: files/patch-src-tools-tList.h ___________________________________________________________________ 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 --- armagetron-0.2.8.2.1_7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: