Date: Thu, 4 Aug 2011 03:21:36 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/159442: Update port: games/edge to 1.35 Message-ID: <20110804032136.9e571cbd.tkato432@yahoo.com> Resent-Message-ID: <201108031840.p73IeJXQ075492@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159442 >Category: ports >Synopsis: Update port: games/edge to 1.35 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 03 18:40:19 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 1.35 New file: files/patch-src__i_net.cc Remove file: files/patch-SConstruct pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/games/edge/Makefile games/edge/Makefile --- /usr/ports/games/edge/Makefile 2010-06-07 16:11:59.000000000 +0900 +++ games/edge/Makefile 2011-07-29 02:41:43.000000000 +0900 @@ -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 \ +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 -USE_SCONS= yes +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual + +WRKSRC= ${WRKDIR}/Edge-${PORTVERSION}-source + +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 -urN /usr/ports/games/edge/distinfo games/edge/distinfo --- /usr/ports/games/edge/distinfo 2011-07-04 02:02:53.000000000 +0900 +++ games/edge/distinfo 2011-07-29 02:10:29.000000000 +0900 @@ -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 -urN /usr/ports/games/edge/files/patch-SConstruct games/edge/files/patch-SConstruct --- /usr/ports/games/edge/files/patch-SConstruct 2010-03-25 04:40:19.000000000 +0900 +++ games/edge/files/patch-SConstruct 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/games/edge/files/patch-src__e_main.cc games/edge/files/patch-src__e_main.cc --- /usr/ports/games/edge/files/patch-src__e_main.cc 2007-12-18 02:53:59.000000000 +0900 +++ games/edge/files/patch-src__e_main.cc 2009-04-14 04:42:18.000000000 +0900 @@ -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 -urN /usr/ports/games/edge/files/patch-src__i_net.cc games/edge/files/patch-src__i_net.cc --- /usr/ports/games/edge/files/patch-src__i_net.cc 1970-01-01 09:00:00.000000000 +0900 +++ games/edge/files/patch-src__i_net.cc 2011-07-29 02:28:01.000000000 +0900 @@ -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 -urN /usr/ports/games/edge/files/patch-src__unx_net.cc games/edge/files/patch-src__unx_net.cc --- /usr/ports/games/edge/files/patch-src__unx_net.cc 2007-12-18 02:53:59.000000000 +0900 +++ games/edge/files/patch-src__unx_net.cc 2011-07-29 02:19:18.000000000 +0900 @@ -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 -urN /usr/ports/games/edge/pkg-plist games/edge/pkg-plist --- /usr/ports/games/edge/pkg-plist 2007-12-18 02:53:59.000000000 +0900 +++ games/edge/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,5 +0,0 @@ -bin/edge -%%DMDIR%%/edge.wad -%%PORTDOCS%%%%DOCSDIR%%/Changelog-129.txt -%%PORTDOCS%%%%DOCSDIR%%/Edge-Readme.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110804032136.9e571cbd.tkato432>