- Update to 1.5.3

5 files changed, 9 insertions, 45 deletions

diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile
index 1d89b1a325bd..eb7852bf2eb6 100644
--- a/games/redeclipse/Makefile
+++ b/games/redeclipse/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redeclipse
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
@@ -12,7 +12,7 @@ COMMENT=	Single-player and multi-player first-person ego-shooter
 LICENSE=	MIT ZLIB
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	redeclipse-data>=1.5.0:${PORTSDIR}/games/redeclipse-data
+RUN_DEPENDS=	redeclipse-data>=1.5.3:${PORTSDIR}/games/redeclipse-data
 
 BROKEN_sparc64=	does not build on sparc64
 
@@ -52,12 +52,6 @@ DEDICATED_PLIST_FILES=	bin/${PORTNAME}_server libexec/${PORTNAME}_server
 OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fomit-frame-pointer -ffast-math
 OPTIMIZED_CFLAGS_CXXFLAGS=	-O3 -fomit-frame-pointer -ffast-math
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1100000
-USE_GCC=	yes	# clang < 3.6.1 dies, see https://llvm.org/bugs/show_bug.cgi?id=23010
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|CLIENT_PCH=.*|CLIENT_PCH=|' ${WRKSRC}/src/Makefile
 
@@ -75,4 +69,4 @@ do-install-DEDICATED-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_server ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}_server_bsd ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}_server
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/redeclipse/distinfo b/games/redeclipse/distinfo
index f958d116d60e..99e17dc8d896 100644
--- a/games/redeclipse/distinfo
+++ b/games/redeclipse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (red-eclipse-base-v1.5.0_GH0.tar.gz) = 1b860e796d46d8bacf56ac4d15b87c11e547167f3abe659da4139bc1ce922def
-SIZE (red-eclipse-base-v1.5.0_GH0.tar.gz) = 10825073
+SHA256 (red-eclipse-base-v1.5.3_GH0.tar.gz) = 94b0475c7c161d4fdb59a9ebe0d740ec07b1934abf348d78d4f127f369d912f8
+SIZE (red-eclipse-base-v1.5.3_GH0.tar.gz) = 10276808
diff --git a/games/redeclipse/files/patch-src_Makefile b/games/redeclipse/files/patch-src_Makefile
index cb9acca9d1f7..9be9a614207c 100644
--- a/games/redeclipse/files/patch-src_Makefile
+++ b/games/redeclipse/files/patch-src_Makefile
@@ -1,25 +1,13 @@
---- 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 @@
+--- src/Makefile.orig	2015-07-18 02:54:17 UTC
++++ src/Makefile
+@@ -80,8 +80,8 @@ else
  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
++CLIENT_LIBS= -Lenet -lenet -L${LOCALBASE}/lib -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
deleted file mode 100644
index 33ea6a49d925..000000000000
--- a/games/redeclipse/files/patch-src_enet_Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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
deleted file mode 100644
index 5b8a4dfaff7e..000000000000
--- a/games/redeclipse/files/patch-src_shared_geom.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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); }