Attachment #152957 for bug #197605

View | Details | Raw Unified | Return to bug 197605 | Differences between

and this patch





PORTNAME=	assaultcube
PORTVERSION=	1.2.0.2
PORTREVISION=	3
CATEGORIES=	games
MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
DISTNAME=	AssaultCube_v${PORTVERSION}

LICENSE_PERMS_CUBE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LICENSE_PERMS_OTHER=	dist-mirror pkg-mirror auto-accept

LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet

USES=		gmake openal:al tar:bzip2
EXTRACT_AFTER_ARGS=--exclude enet
ALL_TARGET=	# empty
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 packages scripts




--- source/src/Makefile.orig	2013-10-29 13:20:58.000000000 +0400
+++ source/src/Makefile	2013-10-29 17:00:06.000000000 +0400
@@ -1,11 +1,9 @@
-CXXFLAGS= -O3 -fomit-frame-pointer
-CXX=clang++	# Use clang++, as g++ optimizations cause crashes...
 override CXXFLAGS+= -Wall -fsigned-char

-PLATFORM_PREFIX=native
+PLATFORM_PREFIX=FreeBSD
 
-INCLUDES= -I. -Ibot -I../enet/include
+INCLUDES= -I. -Ibot -I${LOCALBASE}/include
 
 STRIP=
 ifeq (,$(findstring -g,$(CXXFLAGS)))
@@ -22,8 +20,8 @@
 else
 USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)

 # 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) `${SDL_CONFIG} --cflags` -idirafter ../include
+CLIENT_LIBS= -L${LOCALBASE}/lib -lenet -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
 endif
 
 CLIENT_OBJS= \
@@ -88,7 +86,7 @@
 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_LIBS= -L${LOCALBASE}/lib -lenet -lz
+SERVER_LIBS= -L../enet/.libs -lenet -lz -L${LOCALBASE}/lib
 endif
 
 SERVER_OBJS= \
@@ -118,8 +116,7 @@
 ../enet/Makefile:
 	cd ../enet; ./configure --enable-shared=no --enable-static=yes
 
-libenet: ../enet/Makefile
-	-$(MAKE) -C ../enet all
+libenet: ${LOCALBASE}/lib/libenet.so
 
 clean-enet: ../enet/Makefile
 	$(MAKE) -C ../enet/ clean





PORTNAME=	cube
DISTVERSION=	2005_08_29
PORTREVISION=	15
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
DISTFILES=	${CUBE_DATA} ${CUBE_SRC}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	OpenGL 3D FPS (first person shooter) game

LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet

USES=		dos2unix gmake
EXTRACT_AFTER_ARGS=--exclude enet
ALL_TARGET=	#
USE_XORG=	x11






PORTNAME=	bloodfrontier
DISTVERSION=	B2
PORTREVISION=	10
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/Blood%20Frontier%20Beta%202
DISTNAME=	${PORTNAME}-${DISTVERSION}-linux


LICENSE=	ZLIB

LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet

USES=		tar:bzip2 gmake
EXTRACT_AFTER_ARGS=--exclude enet
CONFIGURE_WRKSRC=	${WRKSRC}/src/enet
BUILD_WRKSRC=	${WRKSRC}/src
WRKSRC=		${WRKDIR}/${PORTNAME}
USE_XORG=	x11

ALL_TARGET=	${BINARIES}

SUB_FILES=	bfclient bfserver





--- src/Makefile.orig	2009-11-25 11:52:58 UTC
+++ src/Makefile
@@ -1,11 +1,10 @@
 #CXXFLAGS= -ggdb3
-CXXFLAGS= -O3 -fomit-frame-pointer
 override CXXFLAGS+= -Wall -fsigned-char
 
 PLATFORM= $(shell uname -s)
 PLATFORM_SUFFIX= 
 
-INCLUDES= -Ishared -Iengine -Igame -Ienet/include
+INCLUDES= -Ishared -Iengine -Igame -I${LOCALBASE}/include
 
 STRIP=
 ifeq (,$(findstring -g,$(CXXFLAGS)))
@@ -21,8 +20,8 @@ WINDRES= windres
 CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -Iinclude
 CLIENT_LIBS= -mwindows -lmingw32 -Llib -lSDLmain -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
 else
-CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) `${SDL_CONFIG} --cflags`
+CLIENT_LIBS= -L${LOCALBASE}/lib -lenet `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
 endif
 ifeq ($(PLATFORM),Linux)
 CLIENT_LIBS+= -lrt
@@ -90,7 +89,7 @@ SERVER_INCLUDES= -DSTANDALONE -DMASTERSE
 SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
 else
 SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES)
-SERVER_LIBS= -Lenet -lenet -lz
+SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
 endif
 SERVER_OBJS= \
     shared/crypto-standalone.o \
@@ -107,8 +106,7 @@ default: all
 enet/Makefile:
 	cd enet; chmod +x ./configure; ./configure
 
-libenet: enet/Makefile
-	$(MAKE)	-C enet/ all
+libenet: ${LOCALBASE}/lib/libenet.so
 
 clean-enet: enet/Makefile
 	$(MAKE) -C enet/ clean




--- src/engine/client.cpp.orig	2009-12-03 14:33:27 UTC
+++ src/engine/client.cpp
@@ -102,11 +102,19 @@ void connectserv(const char *name, int p
 		address.host = ENET_HOST_BROADCAST;
 	}
 
+#if ENET_VERSION > 130
+	if(!clienthost) clienthost = enet_host_create(NULL, 2, 0, rate, rate);
+#else
 	if(!clienthost) clienthost = enet_host_create(NULL, 2, rate, rate);
+#endif
 
 	if(clienthost)
 	{
+#if ENET_VERSION > 130
+		connpeer = enet_host_connect(clienthost, &address, client::numchannels(), 0);
+#else
 		connpeer = enet_host_connect(clienthost, &address, client::numchannels());
+#endif
 		enet_host_flush(clienthost);
 		connmillis = totalmillis;
 		connattempts = 0;




--- src/engine/server.cpp.orig	2009-12-03 14:33:27 UTC
+++ src/engine/server.cpp
@@ -745,7 +745,11 @@ void setupserver()
 	{
 		if(enet_address_set_host(&address, serverip) < 0) conoutf("\frWARNING: server address not resolved");
 	}
+#if ENET_VERSION > 130
+	serverhost = enet_host_create(&address, serverclients + server::reserveclients(), 0, 0, serveruprate);
+#else
 	serverhost = enet_host_create(&address, serverclients + server::reserveclients(), 0, serveruprate);
+#endif
 	if(!serverhost)
 	{
 		conoutf("\frcould not create server socket");





PORTNAME=	redeclipse
PORTVERSION=	1.4
PORTREVISION=	3
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*/\1/}
DISTNAME=	${PORTNAME}_${PORTVERSION}_nix

LICENSE_COMB=	multi
LICENSE=	MIT ZLIB

LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet

MANUAL_PACKAGE_BUILD=	huge

USES=		tar:bzip2 gmake
EXTRACT_AFTER_ARGS=--exclude enet
CONFIGURE_WRKSRC=	${WRKSRC}/src/enet
CONFIGURE_ARGS=	--enable-shared=no --enable-static=yes
USE_AUTOTOOLS=	aclocal automake autoconf:env
AUTOMAKE_ARGS=	-ia
BUILD_WRKSRC=	${WRKSRC}/src
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

ALL_TARGET=	# empty

SUB_FILES=	${PORTNAME} ${PORTNAME}_server





 override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
 
 PLATFORM= $(shell uname -s)
@@ -28,7 +27,7 @@
 CXX_TEMP:=$(CXX)
 override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
 
-INCLUDES= -Ishared -Iengine -Igame -Ienet/include $(APPFLAGS)
+INCLUDES= -Ishared -Iengine -Igame -I${LOCALBASE}/include $(APPFLAGS)
 
 
 STRIP=
@@ -65,8 +64,8 @@
 CLIENT_INCLUDES= $(INCLUDES) -Iinclude
 CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm

 else
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags`
+CLIENT_LIBS= -L${LOCALBASE}/lib -lenet -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
 endif
 ifeq ($(PLATFORM),Linux)
 CLIENT_LIBS+= -lrt
@@ -137,7 +136,7 @@
 SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 else
 SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -Lenet/.libs -lenet -lz
+SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
 endif
 SERVER_OBJS= \
 	shared/crypto-standalone.o \
@@ -155,8 +154,7 @@
 enet/Makefile:
 	cd enet; ./configure --enable-shared=no --enable-static=yes
 
-libenet: enet/Makefile
-	$(MAKE) -C enet/ all
+libenet: ${LOCALBASE}/lib/libenet.so
 
 clean-enet: enet/Makefile
 	$(MAKE) -C enet/ clean

Lines 3-9 Link Here

(-)games/sauerbraten/Makefile (-10 / +5 lines)
3		3
4	PORTNAME= sauerbraten	4	PORTNAME= sauerbraten
5	PORTVERSION= 20130203	5	PORTVERSION= 20130203
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2013_01_04	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2013_01_04
9	DISTNAME= ${PORTNAME}_2013_02_03_collect_edition_linux	9	DISTNAME= ${PORTNAME}_2013_02_03_collect_edition_linux
Lines 14-27 COMMENT= First person shooter based on Cube Link Here
14	LICENSE= MIT ZLIB	14	LICENSE= MIT ZLIB
15	LICENSE_COMB= multi	15	LICENSE_COMB= multi
16		16
		17	LIB_DEPENDS= libenet.so:${PORTSDIR}/net/enet
		18
17	USES= gmake tar:bzip2	19	USES= gmake tar:bzip2
18	GNU_CONFIGURE= yes	20	EXTRACT_AFTER_ARGS=--exclude enet
19	CONFIGURE_ENV= ACLOCAL=true AUTOCONF=true AUTOMAKE=true
20	CONFIGURE_WRKSRC= ${WRKSRC}/src/enet
21	CONFIGURE_ARGS= --enable-shared=no --enable-static=yes
22	BUILD_WRKSRC= ${WRKSRC}/src	21	BUILD_WRKSRC= ${WRKSRC}/src
23	WRKSRC= ${WRKDIR}/${PORTNAME}	22	WRKSRC= ${WRKDIR}/${PORTNAME}
24	ALL_TARGET= libenet	23	ALL_TARGET= # empty
25		24
26	PORTDATA= data packages	25	PORTDATA= data packages
27	PORTDOCS= *	26	PORTDOCS= *
Lines 65-74 post-extract: Link Here
65	@${FIND} ${WRKSRC} -type d -name CVS -type d -print0 \| \	64	@${FIND} ${WRKSRC} -type d -name CVS -type d -print0 \| \
66	${XARGS} -0 ${RM} -R	65	${XARGS} -0 ${RM} -R
67		66
68	post-patch:
69	@${REINPLACE_CMD} -Ee '/^#define (HAS_GETHOSTBY(NAME\|ADDR)_R) 1/d' \
70	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
71
72	do-install:	67	do-install:
73	.for f in ${SAUER_BIN}	68	.for f in ${SAUER_BIN}
74	${INSTALL_SCRIPT} ${WRKDIR}/sauer_${f} ${STAGEDIR}${PREFIX}/bin	69	${INSTALL_SCRIPT} ${WRKDIR}/sauer_${f} ${STAGEDIR}${PREFIX}/bin




--- src/Makefile	2012-08-28 00:30:07.000000000 -0500
+++ src/Makefile	2013-03-24 00:38:04.000000000 -0500
@@ -1,10 +1,9 @@
-CXXFLAGS= -O3 -fomit-frame-pointer
 override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
 

-PLATFORM_PREFIX= native
+PLATFORM_PREFIX= FreeBSD
 
-INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
+INCLUDES= -Ishared -Iengine -Ifpsgame -I${LOCALBASE}/include
 
 STRIP=
 ifeq (,$(findstring -g,$(CXXFLAGS)))
@@ -36,8 +35,8 @@
 endif
 CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm

 else	
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags`
+CLIENT_LIBS= -L${LOCALBASE}/lib -lenet `${SDL_CONFIG} --libs` -lX11 -lSDL_image -lSDL_mixer -lz -lGL
 endif
 ifeq ($(PLATFORM),Linux)
 CLIENT_LIBS+= -lrt
@@ -106,7 +105,7 @@
 SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 else
 SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -Lenet/.libs -lenet -lz
+SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
 MASTER_LIBS= $(SERVER_LIBS)
 endif
 SERVER_OBJS= \
@@ -138,8 +137,7 @@
 enet/Makefile:
 	cd enet; ./configure --enable-shared=no --enable-static=yes
 	
-libenet: enet/Makefile
-	$(MAKE)	-C enet/ all
+libenet: ${LOCALBASE}/lib/libenet.so
 
 clean-enet: enet/Makefile
 	$(MAKE) -C enet/ clean

Return to bug 197605

Lines 3-9 Link Here

(-)games/assaultcube/Makefile (-5 / +5 lines)
3		3
4	PORTNAME= assaultcube	4	PORTNAME= assaultcube
5	PORTVERSION= 1.2.0.2	5	PORTVERSION= 1.2.0.2
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION}	8	MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
9	DISTNAME= AssaultCube_v${PORTVERSION}	9	DISTNAME= AssaultCube_v${PORTVERSION}
Lines 23-34 LICENSE_PERMS_ACUBE= dist-mirror dist-sell pkg-mir Link Here
23	LICENSE_PERMS_CUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	23	LICENSE_PERMS_CUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
24	LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept	24	LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept
25		25
		26	LIB_DEPENDS= libenet.so:${PORTSDIR}/net/enet
		27
26	USES= gmake openal:al tar:bzip2	28	USES= gmake openal:al tar:bzip2
27	GNU_CONFIGURE= yes	29	EXTRACT_AFTER_ARGS=--exclude enet
28	ALL_TARGET= libenet	30	ALL_TARGET= # empty
29	WRKSRC= ${WRKDIR}/AssaultCube_v${PORTVERSION}	31	WRKSRC= ${WRKDIR}/AssaultCube_v${PORTVERSION}
30	CONFIGURE_ARGS= --enable-shared=no --enable-static=yes
31	CONFIGURE_WRKSRC= ${WRKSRC}/source/enet
32	BUILD_WRKSRC= ${WRKSRC}/source/src	32	BUILD_WRKSRC= ${WRKSRC}/source/src
33		33
34	PORTDATA= config packages scripts	34	PORTDATA= config packages scripts

Lines 1-6 Link Here

(-)games/assaultcube/files/patch-source_src_Makefile (-9 / +20 lines)
1	--- source/src/Makefile.orig 2013-10-29 13:20:58.000000000 +0400	1	--- source/src/Makefile.orig 2013-10-29 13:20:58.000000000 +0400
2	+++ source/src/Makefile 2013-10-29 17:00:06.000000000 +0400	2	+++ source/src/Makefile 2013-10-29 17:00:06.000000000 +0400
3	@@ -1,9 +1,7 @@	3	@@ -1,11 +1,9 @@
4	-CXXFLAGS= -O3 -fomit-frame-pointer	4	-CXXFLAGS= -O3 -fomit-frame-pointer
5	-CXX=clang++ # Use clang++, as g++ optimizations cause crashes...	5	-CXX=clang++ # Use clang++, as g++ optimizations cause crashes...
6	override CXXFLAGS+= -Wall -fsigned-char	6	override CXXFLAGS+= -Wall -fsigned-char
Lines 9-16 Link Here
9	-PLATFORM_PREFIX=native	9	-PLATFORM_PREFIX=native
10	+PLATFORM_PREFIX=FreeBSD	10	+PLATFORM_PREFIX=FreeBSD
11		11
12	INCLUDES= -I. -Ibot -I../enet/include	12	-INCLUDES= -I. -Ibot -I../enet/include
		13	+INCLUDES= -I. -Ibot -I${LOCALBASE}/include
13		14
		15	STRIP=
		16	ifeq (,$(findstring -g,$(CXXFLAGS)))
14	@@ -22,8 +20,8 @@	17	@@ -22,8 +20,8 @@
15	else	18	else
16	USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)	19	USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
Lines 17-35 Link Here
17	# override CXXFLAGS+= -rdynamic # clang++ doesn't use this...	20	# override CXXFLAGS+= -rdynamic # clang++ doesn't use this...
18	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include	21	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
19	-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl	22	-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
20	+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include	23	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -idirafter ../include
21	+CLIENT_LIBS= -L../enet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl	24	+CLIENT_LIBS= -L${LOCALBASE}/lib -lenet -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
22	endif	25	endif
23		26
24	CLIENT_OBJS= \	27	CLIENT_OBJS= \
25	@@ -87,8 +85,8 @@	28	@@ -88,7 +86,7 @@
26	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
27	SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm	29	SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
28	else	30	else
29	-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)	31	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
30	-SERVER_LIBS= -L../enet/.libs -lenet -lz	32	-SERVER_LIBS= -L../enet/.libs -lenet -lz
31	+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include	33	+SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
32	+SERVER_LIBS= -L../enet/.libs -lenet -lz -L${LOCALBASE}/lib
33	endif	34	endif
34		35
35	SERVER_OBJS= \	36	SERVER_OBJS= \
		37	@@ -118,8 +116,7 @@
		38	../enet/Makefile:
		39	cd ../enet; ./configure --enable-shared=no --enable-static=yes
		40
		41	-libenet: ../enet/Makefile
		42	- -$(MAKE) -C ../enet all
		43	+libenet: ${LOCALBASE}/lib/libenet.so
		44
		45	clean-enet: ../enet/Makefile
		46	$(MAKE) -C ../enet/ clean

Lines 3-9 Link Here

(-)games/cube/Makefile (-2 / +3 lines)
3		3
4	PORTNAME= cube	4	PORTNAME= cube
5	DISTVERSION= 2005_08_29	5	DISTVERSION= 2005_08_29
6	PORTREVISION= 14	6	PORTREVISION= 15
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
9	DISTFILES= ${CUBE_DATA} ${CUBE_SRC}	9	DISTFILES= ${CUBE_DATA} ${CUBE_SRC}
Lines 11-19 DISTFILES= ${CUBE_DATA} ${CUBE_SRC} Link Here
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= OpenGL 3D FPS (first person shooter) game	12	COMMENT= OpenGL 3D FPS (first person shooter) game
13		13
14	BUILD_DEPENDS= ${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet	14	LIB_DEPENDS= libenet.so:${PORTSDIR}/net/enet
15		15
16	USES= dos2unix gmake	16	USES= dos2unix gmake
		17	EXTRACT_AFTER_ARGS=--exclude enet
17	ALL_TARGET= #	18	ALL_TARGET= #
18	USE_XORG= x11	19	USE_XORG= x11
19		20

Lines 3-9 Link Here

(-)games/bloodfrontier/Makefile (-4 / +5 lines)
3		3
4	PORTNAME= bloodfrontier	4	PORTNAME= bloodfrontier
5	DISTVERSION= B2	5	DISTVERSION= B2
6	PORTREVISION= 9	6	PORTREVISION= 10
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/Blood%20Frontier%20Beta%202	8	MASTER_SITES= SF/${PORTNAME}/Blood%20Frontier%20Beta%202
9	DISTNAME= ${PORTNAME}-${DISTVERSION}-linux	9	DISTNAME= ${PORTNAME}-${DISTVERSION}-linux
Lines 13-26 COMMENT= Single- and multi-player first-person sho Link Here
13		13
14	LICENSE= ZLIB	14	LICENSE= ZLIB
15		15
		16	LIB_DEPENDS= libenet.so:${PORTSDIR}/net/enet
		17
16	USES= tar:bzip2 gmake	18	USES= tar:bzip2 gmake
17	GNU_CONFIGURE= yes	19	EXTRACT_AFTER_ARGS=--exclude enet
18	CONFIGURE_WRKSRC= ${WRKSRC}/src/enet
19	BUILD_WRKSRC= ${WRKSRC}/src	20	BUILD_WRKSRC= ${WRKSRC}/src
20	WRKSRC= ${WRKDIR}/${PORTNAME}	21	WRKSRC= ${WRKDIR}/${PORTNAME}
21	USE_XORG= x11	22	USE_XORG= x11
22		23
23	ALL_TARGET= libenet ${BINARIES}	24	ALL_TARGET= ${BINARIES}
24		25
25	SUB_FILES= bfclient bfserver	26	SUB_FILES= bfclient bfserver
26		27

Lines 1-19 Link Here

(-)games/bloodfrontier/files/patch-src-Makefile (-6 / +32 lines)
1	--- src/Makefile.orig 2009-11-25 14:52:58.000000000 +0300	1	--- src/Makefile.orig 2009-11-25 11:52:58 UTC
2	+++ src/Makefile 2013-09-14 03:43:17.632226100 +0400	2	+++ src/Makefile
3	@@ -1,5 +1,4 @@	3	@@ -1,11 +1,10 @@
4	#CXXFLAGS= -ggdb3	4	#CXXFLAGS= -ggdb3
5	-CXXFLAGS= -O3 -fomit-frame-pointer	5	-CXXFLAGS= -O3 -fomit-frame-pointer
6	override CXXFLAGS+= -Wall -fsigned-char	6	override CXXFLAGS+= -Wall -fsigned-char
7		7
8	PLATFORM= $(shell uname -s)	8	PLATFORM= $(shell uname -s)
9	@@ -21,8 +20,8 @@	9	PLATFORM_SUFFIX=
		10
		11	-INCLUDES= -Ishared -Iengine -Igame -Ienet/include
		12	+INCLUDES= -Ishared -Iengine -Igame -I${LOCALBASE}/include
		13
		14	STRIP=
		15	ifeq (,$(findstring -g,$(CXXFLAGS)))
		16	@@ -21,8 +20,8 @@ WINDRES= windres
10	CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -Iinclude	17	CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -Iinclude
11	CLIENT_LIBS= -mwindows -lmingw32 -Llib -lSDLmain -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm	18	CLIENT_LIBS= -mwindows -lmingw32 -Llib -lSDLmain -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
12	else	19	else
13	-CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`	20	-CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
14	-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL	21	-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
15	+CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`	22	+CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) `${SDL_CONFIG} --cflags`
16	+CLIENT_LIBS= -Lenet -lenet -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11	23	+CLIENT_LIBS= -L${LOCALBASE}/lib -lenet `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
17	endif	24	endif
18	ifeq ($(PLATFORM),Linux)	25	ifeq ($(PLATFORM),Linux)
19	CLIENT_LIBS+= -lrt	26	CLIENT_LIBS+= -lrt
		27	@@ -90,7 +89,7 @@ SERVER_INCLUDES= -DSTANDALONE -DMASTERSE
		28	SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
		29	else
		30	SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES)
		31	-SERVER_LIBS= -Lenet -lenet -lz
		32	+SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
		33	endif
		34	SERVER_OBJS= \
		35	shared/crypto-standalone.o \
		36	@@ -107,8 +106,7 @@ default: all
		37	enet/Makefile:
		38	cd enet; chmod +x ./configure; ./configure
		39
		40	-libenet: enet/Makefile
		41	- $(MAKE) -C enet/ all
		42	+libenet: ${LOCALBASE}/lib/libenet.so
		43
		44	clean-enet: enet/Makefile
		45	$(MAKE) -C enet/ clean

Line 0 Link Here

(-)games/bloodfrontier/files/patch-src_engine_client.cpp (+22 lines)
	1	--- src/engine/client.cpp.orig 2009-12-03 14:33:27 UTC
	2	+++ src/engine/client.cpp
	3	@@ -102,11 +102,19 @@ void connectserv(const char *name, int p
	4	address.host = ENET_HOST_BROADCAST;
	5	}
	6
	7	+#if ENET_VERSION > 130
	8	+ if(!clienthost) clienthost = enet_host_create(NULL, 2, 0, rate, rate);
	9	+#else
	10	if(!clienthost) clienthost = enet_host_create(NULL, 2, rate, rate);
	11	+#endif
	12
	13	if(clienthost)
	14	{
	15	+#if ENET_VERSION > 130
	16	+ connpeer = enet_host_connect(clienthost, &address, client::numchannels(), 0);
	17	+#else
	18	connpeer = enet_host_connect(clienthost, &address, client::numchannels());
	19	+#endif
	20	enet_host_flush(clienthost);
	21	connmillis = totalmillis;
	22	connattempts = 0;

Line 0 Link Here

(-)games/bloodfrontier/files/patch-src_engine_server.cpp (+14 lines)
	1	--- src/engine/server.cpp.orig 2009-12-03 14:33:27 UTC
	2	+++ src/engine/server.cpp
	3	@@ -745,7 +745,11 @@ void setupserver()
	4	{
	5	if(enet_address_set_host(&address, serverip) < 0) conoutf("\frWARNING: server address not resolved");
	6	}
	7	+#if ENET_VERSION > 130
	8	+ serverhost = enet_host_create(&address, serverclients + server::reserveclients(), 0, 0, serveruprate);
	9	+#else
	10	serverhost = enet_host_create(&address, serverclients + server::reserveclients(), 0, serveruprate);
	11	+#endif
	12	if(!serverhost)
	13	{
	14	conoutf("\frcould not create server socket");

Lines 3-9 Link Here

(-)games/redeclipse/Makefile (-7 / +5 lines)
3		3
4	PORTNAME= redeclipse	4	PORTNAME= redeclipse
5	PORTVERSION= 1.4	5	PORTVERSION= 1.4
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*/\1/}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*/\1/}
9	DISTNAME= ${PORTNAME}_${PORTVERSION}_nix	9	DISTNAME= ${PORTNAME}_${PORTVERSION}_nix
Lines 14-31 COMMENT= Single-player and multi-player first-pers Link Here
14	LICENSE_COMB= multi	14	LICENSE_COMB= multi
15	LICENSE= MIT ZLIB	15	LICENSE= MIT ZLIB
16		16
		17	LIB_DEPENDS= libenet.so:${PORTSDIR}/net/enet
		18
17	MANUAL_PACKAGE_BUILD= huge	19	MANUAL_PACKAGE_BUILD= huge
18		20
19	USES= tar:bzip2 gmake	21	USES= tar:bzip2 gmake
20	GNU_CONFIGURE= yes	22	EXTRACT_AFTER_ARGS=--exclude enet
21	CONFIGURE_WRKSRC= ${WRKSRC}/src/enet
22	CONFIGURE_ARGS= --enable-shared=no --enable-static=yes
23	USE_AUTOTOOLS= aclocal automake autoconf:env
24	AUTOMAKE_ARGS= -ia
25	BUILD_WRKSRC= ${WRKSRC}/src	23	BUILD_WRKSRC= ${WRKSRC}/src
26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	24	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27		25
28	ALL_TARGET= libenet	26	ALL_TARGET= # empty
29		27
30	SUB_FILES= ${PORTNAME} ${PORTNAME}_server	28	SUB_FILES= ${PORTNAME} ${PORTNAME}_server
31		29

Lines 8-13 Link Here

(-)games/redeclipse/files/patch-src-core.mk (-2 / +30 lines)
8	override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti	8	override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
9		9
10	PLATFORM= $(shell uname -s)	10	PLATFORM= $(shell uname -s)
		11	@@ -28,7 +27,7 @@
		12	CXX_TEMP:=$(CXX)
		13	override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
		14
		15	-INCLUDES= -Ishared -Iengine -Igame -Ienet/include $(APPFLAGS)
		16	+INCLUDES= -Ishared -Iengine -Igame -I${LOCALBASE}/include $(APPFLAGS)
		17
		18
		19	STRIP=
11	@@ -65,8 +64,8 @@	20	@@ -65,8 +64,8 @@
12	CLIENT_INCLUDES= $(INCLUDES) -Iinclude	21	CLIENT_INCLUDES= $(INCLUDES) -Iinclude
13	CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm	22	CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
Lines 14-21 Link Here
14	else	23	else
15	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`	24	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
16	-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL	25	-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
17	+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`	26	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags`
18	+CLIENT_LIBS= -Lenet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL	27	+CLIENT_LIBS= -L${LOCALBASE}/lib -lenet -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
19	endif	28	endif
20	ifeq ($(PLATFORM),Linux)	29	ifeq ($(PLATFORM),Linux)
21	CLIENT_LIBS+= -lrt	30	CLIENT_LIBS+= -lrt
		31	@@ -137,7 +136,7 @@
		32	SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
		33	else
		34	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
		35	-SERVER_LIBS= -Lenet/.libs -lenet -lz
		36	+SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
		37	endif
		38	SERVER_OBJS= \
		39	shared/crypto-standalone.o \
		40	@@ -155,8 +154,7 @@
		41	enet/Makefile:
		42	cd enet; ./configure --enable-shared=no --enable-static=yes
		43
		44	-libenet: enet/Makefile
		45	- $(MAKE) -C enet/ all
		46	+libenet: ${LOCALBASE}/lib/libenet.so
		47
		48	clean-enet: enet/Makefile
		49	$(MAKE) -C enet/ clean

Lines 1-6 Link Here

(-)games/sauerbraten/files/patch-src_Makefile (-9 / +20 lines)
1	--- src/Makefile 2012-08-28 00:30:07.000000000 -0500	1	--- src/Makefile 2012-08-28 00:30:07.000000000 -0500
2	+++ src/Makefile 2013-03-24 00:38:04.000000000 -0500	2	+++ src/Makefile 2013-03-24 00:38:04.000000000 -0500
3	@@ -1,8 +1,7 @@	3	@@ -1,10 +1,9 @@
4	-CXXFLAGS= -O3 -fomit-frame-pointer	4	-CXXFLAGS= -O3 -fomit-frame-pointer
5	override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti	5	override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
6		6
Lines 8-15 Link Here
8	-PLATFORM_PREFIX= native	8	-PLATFORM_PREFIX= native
9	+PLATFORM_PREFIX= FreeBSD	9	+PLATFORM_PREFIX= FreeBSD
10		10
11	INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include	11	-INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
		12	+INCLUDES= -Ishared -Iengine -Ifpsgame -I${LOCALBASE}/include
12		13
		14	STRIP=
		15	ifeq (,$(findstring -g,$(CXXFLAGS)))
13	@@ -36,8 +35,8 @@	16	@@ -36,8 +35,8 @@
14	endif	17	endif
15	CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm	18	CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
Lines 16-34 Link Here
16	else	19	else
17	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`	20	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
18	-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL	21	-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
19	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include	22	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags`
20	+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lX11 -lSDL_image -lSDL_mixer -lz -lGL	23	+CLIENT_LIBS= -L${LOCALBASE}/lib -lenet `${SDL_CONFIG} --libs` -lX11 -lSDL_image -lSDL_mixer -lz -lGL
21	endif	24	endif
22	ifeq ($(PLATFORM),Linux)	25	ifeq ($(PLATFORM),Linux)
23	CLIENT_LIBS+= -lrt	26	CLIENT_LIBS+= -lrt
24	@@ -105,8 +104,8 @@	27	@@ -106,7 +105,7 @@
25	SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
26	MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm	28	MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
27	else	29	else
28	-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)	30	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
29	-SERVER_LIBS= -Lenet/.libs -lenet -lz	31	-SERVER_LIBS= -Lenet/.libs -lenet -lz
30	+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include	32	+SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
31	+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
32	MASTER_LIBS= $(SERVER_LIBS)	33	MASTER_LIBS= $(SERVER_LIBS)
33	endif	34	endif
34	SERVER_OBJS= \	35	SERVER_OBJS= \
		36	@@ -138,8 +137,7 @@
		37	enet/Makefile:
		38	cd enet; ./configure --enable-shared=no --enable-static=yes
		39
		40	-libenet: enet/Makefile
		41	- $(MAKE) -C enet/ all
		42	+libenet: ${LOCALBASE}/lib/libenet.so
		43
		44	clean-enet: enet/Makefile
		45	$(MAKE) -C enet/ clean