Update to 1.35

PR:		159442
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

7 files changed, 81 insertions, 67 deletions

diff --git a/games/edge/Makefile b/games/edge/Makefile
index fffffdf55bad..cb8c40d52253 100644
--- a/games/edge/Makefile
+++ b/games/edge/Makefile
@@ -6,36 +6,63 @@
 #
 
 PORTNAME=	edge
-PORTVERSION=	1.29
-PORTREVISION=	7
+PORTVERSION=	1.35
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-source
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}-linux${EXTRACT_SUFX}
+MASTER_SITES=	SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION} \
+		SF/${PORTNAME}/EDGE%20Binaries/${PORTVERSION}:wad
+DISTFILES=	Edge-${PORTVERSION}-source${EXTRACT_SUFX} \
+		Edge-${PORTVERSION}-linux.tar.gz:wad
+EXTRACT_ONLY=	Edge-${PORTVERSION}-source${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DOOM style engine aimed at the Total Conversion developer
 
-LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
+LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
+		GLEW.1:${PORTSDIR}/graphics/glew \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+		png.6:${PORTSDIR}/graphics/png
+
+WRKSRC=		${WRKDIR}/Edge-${PORTVERSION}-source
 
-USE_SCONS=	yes
+USE_BZIP2=	yes
 USE_SDL=	sdl
-SCONS_ARGS=	release=true
+USE_GMAKE=	yes
+MAKEFILE=	Makefile.linux
+MAKE_JOBS_SAFE=	yes
+
+PORTDOCS=	*
+PLIST_FILES=	bin/edge %%DMDIR%%/edge.wad
+PLIST_DIRSTRY=	%%DMDIR%%
+
+CFLAGS+=	-ffast-math
+
+post-extract:
+	@${TAR} -C ${WRKDIR} \
+		--exclude "License.txt" \
+		--exclude "edge_linux" \
+		--exclude "demo-*" \
+		--exclude "*.zip" \
+		-x -f ${DISTDIR}/Edge-${PORTVERSION}-linux.tar.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%DMDIR%%|${DMDIR}|;' ${WRKSRC}/src/e_main.cc
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|;' ${WRKSRC}/SConstruct
+	@${REINPLACE_CMD} -e \
+		's|^CC=|CC?=| ; \
+		 s|^CXX=|CXX?=| ; \
+		 s|^CFLAGS=|CFLAGS?=| ; \
+		 s|-L$$(LIBDIR)/glew-1.4/lib||' ${WRKSRC}/Makefile.linux
+	@${REINPLACE_CMD} -e \
+		's|%%DMDIR%%|${DMDIR}|' ${WRKSRC}/src/e_main.cc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gledge32 ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA} ${WRKDIR}/edge.wad ${DMDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/edge.linux ${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${DMDIR}
+	${INSTALL_DATA} ${WRKDIR}/Edge-${PORTVERSION}/edge.wad ${DMDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/*.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/Edge-${PORTVERSION}/*.txt ${DOCSDIR}
 .endif
 
 .include "${.CURDIR}/../doom-data/Makefile.include"
diff --git a/games/edge/distinfo b/games/edge/distinfo
index 9d8bb8f8db7a..ffc977ba44e1 100644
--- a/games/edge/distinfo
+++ b/games/edge/distinfo
@@ -1,4 +1,4 @@
-SHA256 (edge-1.29-source.tar.gz) = 9ddf455dc2706a6d0efbe22da7a2fb0871a986af85d87c3b48cd5e9239f086a1
-SIZE (edge-1.29-source.tar.gz) = 5513212
-SHA256 (edge-1.29-linux.tar.gz) = 59f5447fc0f6b8d0bb947f764035f02005f481cd08abf1e219d1555888c7b15f
-SIZE (edge-1.29-linux.tar.gz) = 1918394
+SHA256 (Edge-1.35-source.tar.bz2) = 7b42cac6eb93f61ddb4a29571e7a9ca4565ea1912c37007798c91d554a77274e
+SIZE (Edge-1.35-source.tar.bz2) = 3919677
+SHA256 (Edge-1.35-linux.tar.gz) = fd405424a3858b211bc5ff45bffc261ebca7ae91d3fd0a34a74e47d6d7f6f125
+SIZE (Edge-1.35-linux.tar.gz) = 1957577
diff --git a/games/edge/files/patch-SConstruct b/games/edge/files/patch-SConstruct
deleted file mode 100644
index d30a717887aa..000000000000
--- a/games/edge/files/patch-SConstruct
+++ /dev/null
@@ -1,25 +0,0 @@
---- SConstruct.orig	2007-06-06 15:07:47.000000000 +0200
-+++ SConstruct	2010-03-12 11:00:55.000000000 +0100
-@@ -27,6 +27,14 @@
- if build_info['cross']:
-   base_env.Tool('crossmingw', toolpath=['build'])
- 
-+# Respect CC, CXX, CCFLAGS, CPPPATH and LIBPATH command-line parameters.
-+for key in ['CC', 'CXX']:
-+  if key in ARGUMENTS:
-+    base_env[key] = ARGUMENTS[key]
-+for key in ['CCFLAGS', 'CPPPATH', 'LIBPATH']:
-+  if key in ARGUMENTS:
-+    base_env[key] = Split(ARGUMENTS[key])
-+
- # warnings
- base_env.Append(CCFLAGS = ['-Wall'])
- 
-@@ -100,6 +108,7 @@
-     env.ParseConfig('#linux_lib/fltk-1.1.7/fltk-config --cflags')
-     env.Append(LIBPATH = ['#linux_lib/fltk-1.1.7/lib'])
-     env.Append(LIBS = ['fltk', 'fltk_images'])
-+    env.Append(LINKFLAGS = ['%%PTHREAD_LIBS%%'])
- 
- # HawkNL
- if 0:
diff --git a/games/edge/files/patch-src__e_main.cc b/games/edge/files/patch-src__e_main.cc
index 9d233fcc7448..409ac3d46f0c 100644
--- a/games/edge/files/patch-src__e_main.cc
+++ b/games/edge/files/patch-src__e_main.cc
@@ -1,11 +1,11 @@
---- ./src/e_main.cc.orig	Thu Jun 21 00:04:22 2007
-+++ ./src/e_main.cc	Wed Dec  5 23:35:20 2007
-@@ -1110,6 +1110,8 @@
+--- src/e_main.cc.orig	2008-08-23 18:00:36.000000000 +0900
++++ src/e_main.cc	2009-04-14 04:42:02.000000000 +0900
+@@ -936,6 +936,8 @@
  
-         if (s && epi::the_filesystem->IsDir(s))
-             iwad_dir.Set(s);
+         if (s && epi::FS_IsDir(s))
+             iwad_dir = std::string(s);
 +        else
-+            iwad_dir.Set("%%DMDIR%%");
++            iwad_dir = std::string("%%DMDIR%%");
      }
  
      // Should the IWAD directory not be set by now, then we
diff --git a/games/edge/files/patch-src__i_net.cc b/games/edge/files/patch-src__i_net.cc
new file mode 100644
index 000000000000..5def065f4f52
--- /dev/null
+++ b/games/edge/files/patch-src__i_net.cc
@@ -0,0 +1,11 @@
+--- src/i_net.cc.orig	2009-10-19 12:12:43.000000000 +0900
++++ src/i_net.cc	2011-07-29 02:27:29.000000000 +0900
+@@ -29,7 +29,7 @@
+ 
+ bool nonet = true;
+ 
+-#ifdef LINUX
++#ifdef __linux__
+ #include <linux/if.h>
+ #include <linux/sockios.h>
+ #endif
diff --git a/games/edge/files/patch-src__unx_net.cc b/games/edge/files/patch-src__unx_net.cc
index 2b057fccfcc5..d76e0faf8917 100644
--- a/games/edge/files/patch-src__unx_net.cc
+++ b/games/edge/files/patch-src__unx_net.cc
@@ -1,14 +1,20 @@
---- ./src/unx_net.cc.orig	Sat Nov 25 05:25:10 2006
-+++ ./src/unx_net.cc	Wed Dec  5 23:19:09 2007
-@@ -36,7 +36,11 @@
- #define htons  htons_FUCK
+--- src/unx_net.cc.orig	2009-10-19 12:14:58.000000000 +0900
++++ src/unx_net.cc	2011-07-29 02:18:56.000000000 +0900
+@@ -27,7 +27,7 @@
+ #include <sys/ioctl.h>
+ 
+ // -AJA- 2005/04/01: Yet another work-around for the huge pile of shit called C++
+-#ifndef MACOSX
++#ifdef __linux__
+ #define ntohl  ntohl_CRUD
+ #define ntohs  ntohs_CRUD
+ #define htonl  htonl_CRUD
+@@ -36,7 +36,7 @@
  
  #include <arpa/inet.h>
-+#ifdef __FreeBSD__
-+#include <net/if.h>
-+#else
- #include <linux/netdevice.h> 
-+#endif
  
- // possible: <linux/if.h>
- //           <linux/sockios.h>
+-#ifdef MACOSX
++#ifndef __linux__
+ #include <net/if.h>
+ #else
+ #include <linux/netdevice.h> 
diff --git a/games/edge/pkg-plist b/games/edge/pkg-plist
deleted file mode 100644
index 2a9f0c729f32..000000000000
--- a/games/edge/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/edge
-%%DMDIR%%/edge.wad
-%%PORTDOCS%%%%DOCSDIR%%/Changelog-129.txt
-%%PORTDOCS%%%%DOCSDIR%%/Edge-Readme.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%