Date: Wed, 5 Aug 2009 23:39:46 +0200 (CEST) From: Olivier Smedts <olivier@gid0.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137466: [maintainer-update] [patch] unbreak and update games/eduke32 Message-ID: <200908052139.n75Ldk2F031013@q.gid0.org> Resent-Message-ID: <200908052200.n75M0DVo034369@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137466 >Category: ports >Synopsis: [maintainer-update] [patch] unbreak and update games/eduke32 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Aug 05 22:00:12 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Olivier Smedts >Release: FreeBSD 8.0-BETA2 amd64 >Organization: >Environment: System: FreeBSD q.gid0.org 8.0-BETA2 FreeBSD 8.0-BETA2 #0 r196050M: Mon Aug 3 17:15:04 CEST 2009 root@q.gid0.org:/work/obj/work/src/sys/QUAD amd64 >Description: - make fetchable again - update to latest version and patchset - improve description of OPTIONS >How-To-Repeat: # make fetch ===> Vulnerability check disabled, database not found ===> Found saved configuration for eduke32-20080709 => eduke32_src_20080924.zip doesn't seem to exist in /usr/ports/distfiles/. => Attempting to fetch from http://wiki.eduke32.com/stuff/source_code/. fetch: http://wiki.eduke32.com/stuff/source_code/eduke32_src_20080924.zip: Moved Permanently >Fix: Apply attached patch. Thanks ! --- eduke32-patch begins here --- diff -rNu games/eduke32.orig/Makefile games/eduke32/Makefile --- games/eduke32.orig/Makefile 2009-08-05 23:13:50.000000000 +0200 +++ games/eduke32/Makefile 2009-08-05 23:19:35.000000000 +0200 @@ -5,11 +5,13 @@ # $FreeBSD: ports/games/eduke32/Makefile,v 1.20 2009/07/06 21:25:45 naddy Exp $ PORTNAME= eduke32 -PORTVERSION= 20080924 -PORTREVISION= 1 +PORTVERSION= 20090313 +DISTVERSION= 20090131 CATEGORIES= games -MASTER_SITES= http://wiki.eduke32.com/stuff/source_code/ -DISTFILES= ${PORTNAME}_src_${PORTVERSION}${EXTRACT_SUFX} +MASTER_SITES= http://dukeworld.duke4.net/eduke32/source_code/ +DISTFILES= ${PORTNAME}_src_${DISTVERSION}${EXTRACT_SUFX} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= ${PORTNAME}_src_${PORTVERSION}.diff MAINTAINER= olivier@gid0.org COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke @@ -19,11 +21,11 @@ USE_GL= gl USE_GNOME= gtk20 USE_SDL= mixer sdl -WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}_src_${DISTVERSION} -OPTIONS= MIDI "Enable MIDI support" On \ +OPTIONS= MIDI "Enable original MIDI music support" On \ TIMIDITYPLUS "Use Timidity++ instead of Timidity" Off \ - VORBIS "Enable Ogg Vorbis support" On + VORBIS "Enable Ogg Vorbis music files support" On .include "${.CURDIR}/../duke3d-data/Makefile.include" @@ -63,8 +61,8 @@ s|/usr/X11R6|${LOCALBASE}|; \ s|sdl-config|${SDL_CONFIG}|' \ ${WRKSRC}/Makefile \ - ${WRKSRC}/../build/Makefile \ - ${WRKSRC}/../build/Makefile.shared + ${WRKSRC}/build/Makefile \ + ${WRKSRC}/build/Makefile.shared @${REINPLACE_CMD} -e 's|LINUX|BSD|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|/usr/share/games/eduke32|${DN3DDIR}|' \ ${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c diff -rNu games/eduke32.orig/distinfo games/eduke32/distinfo --- games/eduke32.orig/distinfo 2009-08-05 23:13:50.000000000 +0200 +++ games/eduke32/distinfo 2009-03-15 18:25:59.000000000 +0100 @@ -1,3 +1,6 @@ -MD5 (eduke32_src_20080924.zip) = 3bba448c5b8fb9d6e34e2000e2155eed -SHA256 (eduke32_src_20080924.zip) = d9645cd3fdf8a4009253ee9524602678b339a9a631cb686a45d64ae417e75c32 -SIZE (eduke32_src_20080924.zip) = 1664585 +MD5 (eduke32_src_20090131.zip) = cf5eb51de024f28e8b24aae2702d459e +SHA256 (eduke32_src_20090131.zip) = e6b8cc2c7e0c32a6aa5a64359be8b8c494dcae08dda87e1de718c030426ef74d +SIZE (eduke32_src_20090131.zip) = 1694234 +MD5 (eduke32_src_20090313.diff) = fd9fa13146c9a31b2eb709aff93a4afa +SHA256 (eduke32_src_20090313.diff) = de13b9600868b98195c18a138fe6dd27fd29f054035ec966d03d28a220b472be +SIZE (eduke32_src_20090313.diff) = 113568 diff -rNu games/eduke32.orig/files/patch-build-src-mmulti_unstable.c games/eduke32/files/patch-build-src-mmulti_unstable.c --- games/eduke32.orig/files/patch-build-src-mmulti_unstable.c 1970-01-01 01:00:00.000000000 +0100 +++ games/eduke32/files/patch-build-src-mmulti_unstable.c 2009-02-02 23:28:21.000000000 +0100 @@ -0,0 +1,15 @@ +--- build/src/mmulti_unstable.c.orig 2009-02-02 23:21:58.000000000 +0100 ++++ build/src/mmulti_unstable.c 2009-02-02 23:27:30.000000000 +0100 +@@ -971,7 +971,11 @@ + { + /* !!! FIXME: Might be Linux (not Unix, not BSD, not WinSock) specific. */ + int32_t flags = 1; +- setsockopt(udpsocket, SOL_IP, IP_RECVERR, &flags, sizeof(flags)); ++ int sol_ip; ++ struct protoent *pent; ++ pent = getprotobyname ("ip"); ++ sol_ip = (pent != NULL) ? pent->p_proto : 0; ++ setsockopt(udpsocket, sol_ip, SO_ERROR, &flags, sizeof(flags)); + } + #endif + diff -rNu games/eduke32.orig/files/patch-source-jaudiolib-dsl.c games/eduke32/files/patch-source-jaudiolib-dsl.c --- games/eduke32.orig/files/patch-source-jaudiolib-dsl.c 1970-01-01 01:00:00.000000000 +0100 +++ games/eduke32/files/patch-source-jaudiolib-dsl.c 2009-02-02 23:15:35.000000000 +0100 @@ -0,0 +1,10 @@ +--- source/jaudiolib/dsl.c.orig 2009-02-02 23:13:40.000000000 +0100 ++++ source/jaudiolib/dsl.c 2009-02-02 23:13:53.000000000 +0100 +@@ -22,6 +22,7 @@ + */ + #include <stdlib.h> + #include <string.h> ++#include <sys/types.h> + + #include "dsl.h" + #include "compat.h" --- eduke32-patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908052139.n75Ldk2F031013>