ports/185955: [PATCH] games/armagetron: fix build on 10.x

Dmitry Marakasov amdmi3 at amdmi3.ru
Tue Jan 21 04:40:01 UTC 2014 

>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 at 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 at 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 <bsd.port.options.mk>
 
 .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<class T> void BinWrite (const T &x){
+         for(unsigned int i=0;i<sizeof(T)/2;i++)
+             Write((reinterpret_cast<const unsigned short *>(&x))[i]);
+-        return *this;
+     }
+ 
+ bool End(){return readOut>=static_cast<unsigned int>(data.Len());}
+@@ -478,7 +477,6 @@
+     template<class T> void BinRead (const T &x){
+         for(unsigned int i=0;i<sizeof(T)/2;i++)
+             Read(reinterpret_cast<unsigned short *>(&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:

More information about the freebsd-ports-bugs mailing list