Attachment #117360 for bug #159442

View | Details | Raw Unified | Return to bug 159442
Collapse All | Expand All




#

PORTNAME=	edge
PORTVERSION=	1.35
PORTREVISION=	7
CATEGORIES=	games
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=	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

LICENSE=	GPLv2 GPLv3
LICENSE_COMB=	dual

WRKSRC=		${WRKDIR}/Edge-${PORTVERSION}-source

USE_BZIP2=	yes
USE_SDL=	sdl
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|^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}/edge.linux ${PREFIX}/bin/${PORTNAME}
	@${MKDIR} ${DMDIR}
	${INSTALL_DATA} ${WRKDIR}/Edge-${PORTVERSION}/edge.wad ${DMDIR}
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKDIR}/Edge-${PORTVERSION}/*.txt ${DOCSDIR}
.endif

.include "${.CURDIR}/../doom-data/Makefile.include"

Lines 1-4 Link Here

(-)games/edge/distinfo (-4 / +4 lines)
1	SHA256 (edge-1.29-source.tar.gz) = 9ddf455dc2706a6d0efbe22da7a2fb0871a986af85d87c3b48cd5e9239f086a1	1	SHA256 (Edge-1.35-source.tar.bz2) = 7b42cac6eb93f61ddb4a29571e7a9ca4565ea1912c37007798c91d554a77274e
2	SIZE (edge-1.29-source.tar.gz) = 5513212	2	SIZE (Edge-1.35-source.tar.bz2) = 3919677
3	SHA256 (edge-1.29-linux.tar.gz) = 59f5447fc0f6b8d0bb947f764035f02005f481cd08abf1e219d1555888c7b15f	3	SHA256 (Edge-1.35-linux.tar.gz) = fd405424a3858b211bc5ff45bffc261ebca7ae91d3fd0a34a74e47d6d7f6f125
4	SIZE (edge-1.29-linux.tar.gz) = 1918394	4	SIZE (Edge-1.35-linux.tar.gz) = 1957577




--- 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:

Lines 1-11 Link Here

(-)games/edge/files/patch-src__e_main.cc (-6 / +6 lines)
1	--- ./src/e_main.cc.orig Thu Jun 21 00:04:22 2007	1	--- src/e_main.cc.orig 2008-08-23 18:00:36.000000000 +0900
2	+++ ./src/e_main.cc Wed Dec 5 23:35:20 2007	2	+++ src/e_main.cc 2009-04-14 04:42:02.000000000 +0900
3	@@ -1110,6 +1110,8 @@	3	@@ -936,6 +936,8 @@
4		4
5	if (s && epi::the_filesystem->IsDir(s))	5	if (s && epi::FS_IsDir(s))
6	iwad_dir.Set(s);	6	iwad_dir = std::string(s);
7	+ else	7	+ else
8	+ iwad_dir.Set("%%DMDIR%%");	8	+ iwad_dir = std::string("%%DMDIR%%");
9	}	9	}
10		10
11	// Should the IWAD directory not be set by now, then we	11	// Should the IWAD directory not be set by now, then we

Line 0 Link Here

(-)games/edge/files/patch-src__i_net.cc (+11 lines)
	1	--- src/i_net.cc.orig 2009-10-19 12:12:43.000000000 +0900
	2	+++ src/i_net.cc 2011-07-29 02:27:29.000000000 +0900
	3	@@ -29,7 +29,7 @@
	4
	5	bool nonet = true;
	6
	7	-#ifdef LINUX
	8	+#ifdef __linux__
	9	#include <linux/if.h>
	10	#include <linux/sockios.h>
	11	#endif




--- 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
 
-#ifdef MACOSX
+#ifndef __linux__
 #include <net/if.h>
 #else
 #include <linux/netdevice.h> 

Lines 1-5 Link Here

(-)games/edge/pkg-plist (-5 lines)
1	bin/edge
2	%%DMDIR%%/edge.wad
3	%%PORTDOCS%%%%DOCSDIR%%/Changelog-129.txt
4	%%PORTDOCS%%%%DOCSDIR%%/Edge-Readme.txt
5	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 159442

Lines 6-41 Link Here

(-)games/edge/Makefile (-16 / +43 lines)
6	#	6	#
7		7
8	PORTNAME= edge	8	PORTNAME= edge
9	PORTVERSION= 1.29	9	PORTVERSION= 1.35
10	PORTREVISION= 7
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION} \
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-source	12	SF/${PORTNAME}/EDGE%20Binaries/${PORTVERSION}:wad
14	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	13	DISTFILES= Edge-${PORTVERSION}-source${EXTRACT_SUFX} \
15	${PORTNAME}-${PORTVERSION}-linux${EXTRACT_SUFX}	14	Edge-${PORTVERSION}-linux.tar.gz:wad
		15	EXTRACT_ONLY= Edge-${PORTVERSION}-source${EXTRACT_SUFX}
16		16
17	MAINTAINER= ports@FreeBSD.org	17	MAINTAINER= ports@FreeBSD.org
18	COMMENT= DOOM style engine aimed at the Total Conversion developer	18	COMMENT= DOOM style engine aimed at the Total Conversion developer
19		19
20	LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \	20	LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
		21	GLEW.1:${PORTSDIR}/graphics/glew \
21	jpeg.11:${PORTSDIR}/graphics/jpeg \	22	jpeg.11:${PORTSDIR}/graphics/jpeg \
22	png.6:${PORTSDIR}/graphics/png \	23	png.6:${PORTSDIR}/graphics/png
23	vorbis.4:${PORTSDIR}/audio/libvorbis
24		24
25	USE_SCONS= yes	25	LICENSE= GPLv2 GPLv3
		26	LICENSE_COMB= dual
		27
		28	WRKSRC= ${WRKDIR}/Edge-${PORTVERSION}-source
		29
		30	USE_BZIP2= yes
26	USE_SDL= sdl	31	USE_SDL= sdl
27	SCONS_ARGS= release=true	32	USE_GMAKE= yes
		33	MAKEFILE= Makefile.linux
		34	MAKE_JOBS_SAFE= yes
		35
		36	PORTDOCS= *
		37	PLIST_FILES= bin/edge %%DMDIR%%/edge.wad
		38	PLIST_DIRSTRY= %%DMDIR%%
		39
		40	CFLAGS+= -ffast-math
		41
		42	post-extract:
		43	@${TAR} -C ${WRKDIR} \
		44	--exclude "License.txt" \
		45	--exclude "edge_linux" \
		46	--exclude "demo-*" \
		47	--exclude "*.zip" \
		48	-x -f ${DISTDIR}/Edge-${PORTVERSION}-linux.tar.gz
28		49
29	post-patch:	50	post-patch:
30	@${REINPLACE_CMD} -e 's\|%%DMDIR%%\|${DMDIR}\|;' ${WRKSRC}/src/e_main.cc	51	@${REINPLACE_CMD} -e \
31	@${REINPLACE_CMD} -e 's\|%%PTHREAD_LIBS%%\|${PTHREAD_LIBS}\|;' ${WRKSRC}/SConstruct	52	's\|^CC=\|CC?=\| ; \
		53	s\|^CXX=\|CXX?=\| ; \
		54	s\|^CFLAGS=\|CFLAGS?=\| ; \
		55	s\|-L$$(LIBDIR)/glew-1.4/lib\|\|' ${WRKSRC}/Makefile.linux
		56	@${REINPLACE_CMD} -e \
		57	's\|%%DMDIR%%\|${DMDIR}\|' ${WRKSRC}/src/e_main.cc
32		58
33	do-install:	59	do-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/gledge32 ${PREFIX}/bin/${PORTNAME}	60	${INSTALL_PROGRAM} ${WRKSRC}/edge.linux ${PREFIX}/bin/${PORTNAME}
35	${INSTALL_DATA} ${WRKDIR}/edge.wad ${DMDIR}	61	@${MKDIR} ${DMDIR}
		62	${INSTALL_DATA} ${WRKDIR}/Edge-${PORTVERSION}/edge.wad ${DMDIR}
36	.if !defined(NOPORTDOCS)	63	.if !defined(NOPORTDOCS)
37	${MKDIR} ${DOCSDIR}	64	${MKDIR} ${DOCSDIR}
38	${INSTALL_DATA} ${WRKDIR}/*.txt ${DOCSDIR}	65	${INSTALL_DATA} ${WRKDIR}/Edge-${PORTVERSION}/*.txt ${DOCSDIR}
39	.endif	66	.endif
40		67
41	.include "${.CURDIR}/../doom-data/Makefile.include"	68	.include "${.CURDIR}/../doom-data/Makefile.include"

Lines 1-25 Link Here

(-)games/edge/files/patch-SConstruct (-25 lines)
1	--- SConstruct.orig 2007-06-06 15:07:47.000000000 +0200
2	+++ SConstruct 2010-03-12 11:00:55.000000000 +0100
3	@@ -27,6 +27,14 @@
4	if build_info['cross']:
5	base_env.Tool('crossmingw', toolpath=['build'])
6
7	+# Respect CC, CXX, CCFLAGS, CPPPATH and LIBPATH command-line parameters.
8	+for key in ['CC', 'CXX']:
9	+ if key in ARGUMENTS:
10	+ base_env[key] = ARGUMENTS[key]
11	+for key in ['CCFLAGS', 'CPPPATH', 'LIBPATH']:
12	+ if key in ARGUMENTS:
13	+ base_env[key] = Split(ARGUMENTS[key])
14	+
15	# warnings
16	base_env.Append(CCFLAGS = ['-Wall'])
17
18	@@ -100,6 +108,7 @@
19	env.ParseConfig('#linux_lib/fltk-1.1.7/fltk-config --cflags')
20	env.Append(LIBPATH = ['#linux_lib/fltk-1.1.7/lib'])
21	env.Append(LIBS = ['fltk', 'fltk_images'])
22	+ env.Append(LINKFLAGS = ['%%PTHREAD_LIBS%%'])
23
24	# HawkNL
25	if 0:

Lines 1-14 Link Here

(-)games/edge/files/patch-src__unx_net.cc (-11 / +17 lines)
1	--- ./src/unx_net.cc.orig Sat Nov 25 05:25:10 2006	1	--- src/unx_net.cc.orig 2009-10-19 12:14:58.000000000 +0900
2	+++ ./src/unx_net.cc Wed Dec 5 23:19:09 2007	2	+++ src/unx_net.cc 2011-07-29 02:18:56.000000000 +0900
3	@@ -36,7 +36,11 @@	3	@@ -27,7 +27,7 @@
4	#define htons htons_FUCK	4	#include <sys/ioctl.h>
		5
		6	// -AJA- 2005/04/01: Yet another work-around for the huge pile of shit called C++
		7	-#ifndef MACOSX
		8	+#ifdef __linux__
		9	#define ntohl ntohl_CRUD
		10	#define ntohs ntohs_CRUD
		11	#define htonl htonl_CRUD
		12	@@ -36,7 +36,7 @@
5		13
6	#include <arpa/inet.h>	14	#include <arpa/inet.h>
7	+#ifdef __FreeBSD__
8	+#include <net/if.h>
9	+#else
10	#include <linux/netdevice.h>
11	+#endif
12		15
13	// possible: <linux/if.h>	16	-#ifdef MACOSX
14	// <linux/sockios.h>	17	+#ifndef __linux__
		18	#include <net/if.h>
		19	#else
		20	#include <linux/netdevice.h>