6 files changed, 64 insertions, 44 deletions

diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile
index e86c8c41d559..f32589e2d92d 100644
--- a/games/redeclipse/Makefile
+++ b/games/redeclipse/Makefile
@@ -2,11 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	redeclipse
-PORTVERSION=	1.4
-PORTREVISION=	3
+PORTVERSION=	1.5.0
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*/\1/}
-DISTNAME=	${PORTNAME}_${PORTVERSION}_nix
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Single-player and multi-player first-person ego-shooter
@@ -14,24 +11,21 @@ COMMENT=	Single-player and multi-player first-person ego-shooter
 LICENSE_COMB=	multi
 LICENSE=	MIT ZLIB
 
-MANUAL_PACKAGE_BUILD=	huge (734MiB)
+RUN_DEPENDS=	redeclipse-data>=1.5.0:${PORTSDIR}/games/redeclipse-data
 
-USES=		tar:bzip2 gmake
-GNU_CONFIGURE=	yes
-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}
+USE_GITHUB=	yes
+GH_ACCOUNT=	red-eclipse
+GH_PROJECT=	base
+GH_TAGNAME=	v${PORTVERSION}
 
-ALL_TARGET=	libenet
+USES=		gmake
+BUILD_WRKSRC=	${WRKSRC}/src
+USE_GCC=	yes	# clang dies, see https://llvm.org/bugs/show_bug.cgi?id=23010
 
 SUB_FILES=	${PLIST_FILES:Mbin/*:T}
 
-PORTDATA=	game data
 PORTDOCS=	*
-PLIST_DIRS=	%%DATADIR%%/data/brush
+PORTDATA=	*
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
 OPTIONS_MULTI=	COMPONENTS
@@ -46,8 +40,9 @@ CLIENT_PLIST_FILES=		bin/${PORTNAME} libexec/${PORTNAME} \
 DEDICATED_DESC=	Build dedicated server
 DEDICATED_ALL_TARGET=		server
 DEDICATED_PLIST_FILES=		bin/${PORTNAME}_server libexec/${PORTNAME}_server
-OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fomit-frame-pointer
-OPTIMIZED_CFLAGS_CXXFLAGS=	-O3 -fomit-frame-pointer
+
+OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fomit-frame-pointer -ffast-math
+OPTIMIZED_CFLAGS_CXXFLAGS=	-O3 -fomit-frame-pointer -ffast-math
 
 .include <bsd.port.options.mk>
 
@@ -64,19 +59,22 @@ DESKTOP_ENTRIES="Red Eclipse" \
 		""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|CLIENT_PCH=.*|CLIENT_PCH=|' ${WRKSRC}/src/Makefile
+
 do-install:
 .for f in ${PLIST_FILES:Mbin/*}
 	${INSTALL_SCRIPT} ${WRKDIR}/${f:T} ${STAGEDIR}${PREFIX}/${f}
 .endfor
 .for f in ${PLIST_FILES:Mlibexec/*}
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f:T} \
-		${STAGEDIR}${PREFIX}/${f:H}
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f:T}_bsd \
+		${STAGEDIR}${PREFIX}/${f}
 .endfor
 .if ${PORT_OPTIONS:MCLIENT}
 	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}.ico \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 .endif
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} config ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/games/redeclipse/distinfo b/games/redeclipse/distinfo
index ce8e5cd094b9..2daf5ffe33d8 100644
--- a/games/redeclipse/distinfo
+++ b/games/redeclipse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redeclipse_1.4_nix.tar.bz2) = a0dfc527b0f437170a423b55df68a97e1b6e60d8c9fb6c842519b6670c1e69bf
-SIZE (redeclipse_1.4_nix.tar.bz2) = 678617164
+SHA256 (red-eclipse-base-1.5.0-v1.5.0_GH0.tar.gz) = 1b860e796d46d8bacf56ac4d15b87c11e547167f3abe659da4139bc1ce922def
+SIZE (red-eclipse-base-1.5.0-v1.5.0_GH0.tar.gz) = 10825073
diff --git a/games/redeclipse/files/patch-src-core.mk b/games/redeclipse/files/patch-src-core.mk
deleted file mode 100644
index 8171278c6e52..000000000000
--- a/games/redeclipse/files/patch-src-core.mk
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/core.mk.orig	2013-03-21 23:45:14.000000000 +0400
-+++ src/core.mk	2013-04-16 21:14:33.351621428 +0400
-@@ -3,7 +3,6 @@
- APPSERVER=$(APPNAME)_server
- 
- #CXXFLAGS= -ggdb3
--CXXFLAGS= -O3 -fomit-frame-pointer
- override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
- 
- PLATFORM= $(shell uname -s)
-@@ -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) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
-+CLIENT_LIBS= -Lenet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
diff --git a/games/redeclipse/files/patch-src_Makefile b/games/redeclipse/files/patch-src_Makefile
new file mode 100644
index 000000000000..cb9acca9d1f7
--- /dev/null
+++ b/games/redeclipse/files/patch-src_Makefile
@@ -0,0 +1,25 @@
+--- src/Makefile.orig	2015-03-22 02:34:16.000000000 +0300
++++ src/Makefile	2015-03-24 22:21:53.223966000 +0300
+@@ -3,10 +3,9 @@
+ APPSERVER=$(APPNAME)_server
+ 
+ #CXXFLAGS= -ggdb3
+-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ 
+-PLATFORM= $(shell gcc -dumpmachine)
++PLATFORM= $(shell ${CC} -dumpmachine)
+ 
+ ifeq (,$(PLATFORM_BIN))
+ ifneq (,$(findstring arm,$(PLATFORM)))
+@@ -80,8 +79,8 @@
+ BIN_SUFFIX=_native
+ endif
+ endif
+-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
++CLIENT_LIBS= -Lenet -lenet -L${LOCALBASE}/include -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
+ endif
+ ifneq (,$(findstring linux,$(PLATFORM)))
+ CLIENT_LIBS+= -lrt
diff --git a/games/redeclipse/files/patch-src_enet_Makefile b/games/redeclipse/files/patch-src_enet_Makefile
new file mode 100644
index 000000000000..33ea6a49d925
--- /dev/null
+++ b/games/redeclipse/files/patch-src_enet_Makefile
@@ -0,0 +1,7 @@
+--- src/enet/Makefile.orig	2015-03-22 02:34:16.000000000 +0300
++++ src/enet/Makefile	2015-03-24 22:15:46.907606000 +0300
+@@ -1,4 +1,3 @@
+-CFLAGS=-O3 -fomit-frame-pointer
+ override CFLAGS:= $(CFLAGS) -Iinclude $(shell ./check_cflags.sh $(CC) $(CFLAGS))
+ 
+ OBJS= \
diff --git a/games/redeclipse/files/patch-src_shared_geom.h b/games/redeclipse/files/patch-src_shared_geom.h
new file mode 100644
index 000000000000..5b8a4dfaff7e
--- /dev/null
+++ b/games/redeclipse/files/patch-src_shared_geom.h
@@ -0,0 +1,11 @@
+--- src/shared/geom.h.orig	2015-03-22 02:34:16.000000000 +0300
++++ src/shared/geom.h	2015-03-24 22:25:25.797675000 +0300
+@@ -1135,7 +1135,7 @@
+     bvec &max(const bvec &o)   { x = ::max(x, o.x); y = ::max(y, o.y); z = ::max(z, o.z); return *this; }
+     bvec &min(int f)        { x = ::min(int(x), f); y = ::min(int(y), f); z = ::min(int(z), f); return *this; }
+     bvec &max(int f)        { x = ::max(int(x), f); y = ::max(int(y), f); z = ::max(int(z), f); return *this; }
+-    bvec &abs() { x = fabs(x); y = fabs(y); z = fabs(z); return *this; }
++    bvec &abs() { /* always positive */ return *this; }
+     bvec &clamp(int l, int h) { x = ::clamp(int(x), l, h); y = ::clamp(int(y), l, h); z = ::clamp(int(z), l, h); return *this; }
+ 
+     vec tovec() const { return vec(x*(2.0f/255.0f)-1.0f, y*(2.0f/255.0f)-1.0f, z*(2.0f/255.0f)-1.0f); }