ports/70771: Maintainer update of games/duke3d

Sat Aug 21 12:50:24 UTC 2004

>Number:         70771
>Category:       ports
>Synopsis:       Maintainer update of games/duke3d
>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:   Sat Aug 21 12:50:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     No Name
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD skatecity 4.10-STABLE FreeBSD 4.10-STABLE #0: Sun Aug 15 16:14:46 CEST 2004 arundel at skatecity:/usr/obj/usr/src/sys/ARUNDEL i386


	
>Description:
	Updates port to a more recent cvs snapshot and adds maintainers new e-mail address.
>How-To-Repeat:
	
>Fix:

--- output-duke3d begins here ---
diff -ruN /usr/ports/games/duke3d/Makefile /usr/ports/custom/duke3d/Makefile
--- /usr/ports/games/duke3d/Makefile	Sat Aug 21 04:01:38 2004
+++ /usr/ports/custom/duke3d/Makefile	Thu Aug 19 19:55:16 2004
@@ -2,15 +2,14 @@
 # Date Created:				18 September 2003
 # Whom:					<arundel at gmx.net>
 #
-# $FreeBSD: ports/games/duke3d/Makefile,v 1.6 2004/08/20 22:22:46 pav Exp $
+# $FreeBSD: ports/games/duke3d/Makefile,v 1.4 2004/05/12 07:17:44 linimon Exp $
 
 PORTNAME=	duke3d
-PORTVERSION=	20012306
-PORTREVISION=	1
+PORTVERSION=	20041505
 CATEGORIES=	games
-MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/
+MASTER_SITES=	http://520061600655-0001.bei.t-online.de/ports/${PORTNAME}/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	arundel at h3c.de
 COMMENT=	Icculus Duke Nukem 3D port for various Operating Systems
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
@@ -28,12 +27,14 @@
 PROG_FILES=	${WRKSRC}/source/${PORTNAME} ${WRKSRC}/source/buildengine/build
 DOC_FILES=	README BUILDLIC.TXT CONTRIB TODO CHANGELOG ../../readme.txt ../../gnu.txt
 
-OPTIONS=	DOSBOX "Dependency on dosbox (config editor use it)" on
+pre-everything::
+.ifndef(WITHOUT_DOSBOX)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Define WITHOUT_DOSBOX to disable the dependency on dosbox."
+	@${ECHO_MSG} "Then however you will not be able to change the Duke3D config."
+	@${ECHO_MSG} ""
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_DOSBOX)
-RUN_DEPENDS+=	dosbox:${PORTSDIR}/emulators/dosbox
+RUN_DEPENDS=	${LOCALBASE}/bin/dosbox:${PORTSDIR}/emulators/dosbox
 .endif
 
 post-patch:
@@ -76,4 +77,4 @@
 .endif
 	@${SED} -e 's|%%DOCSDIR%%|${DOCSDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/games/duke3d/distinfo /usr/ports/custom/duke3d/distinfo
--- /usr/ports/games/duke3d/distinfo	Sun Apr 18 21:22:45 2004
+++ /usr/ports/custom/duke3d/distinfo	Sat May 15 21:55:00 2004
@@ -1,2 +1,2 @@
-MD5 (duke3d-20012306.tar.gz) = 943f283602acf4569d66fcef3135f11f
-SIZE (duke3d-20012306.tar.gz) = 1787957
+MD5 (duke3d-20041505.tar.gz) = 169258698712de95f21cc085c62924c2
+SIZE (duke3d-20041505.tar.gz) = 1788037
diff -ruN /usr/ports/games/duke3d/files/fix.sh /usr/ports/custom/duke3d/files/fix.sh
--- /usr/ports/games/duke3d/files/fix.sh	Sat Jun 26 04:02:05 2004
+++ /usr/ports/custom/duke3d/files/fix.sh	Sat May 15 21:24:59 2004
@@ -40,5 +40,3 @@
 cp -f testdata/defs.con ./DEFS.CON
 cp -f testdata/game.con ./GAME.CON
 cp -f testdata/user.con ./USER.CON
-
-echo Three files successfully copied
diff -ruN /usr/ports/games/duke3d/files/patch-aa /usr/ports/custom/duke3d/files/patch-aa
--- /usr/ports/games/duke3d/files/patch-aa	Sun Apr 18 21:22:45 2004
+++ /usr/ports/custom/duke3d/files/patch-aa	Sat May 15 21:48:39 2004
@@ -1,6 +1,6 @@
---- source/buildengine/Makefile.orig	Sat Mar 13 22:12:13 2004
-+++ source/buildengine/Makefile	Sat Mar 13 22:46:31 2004
-@@ -100,7 +100,7 @@
+--- source/buildengine/Makefile.orig	Sat May 15 21:35:12 2004
++++ source/buildengine/Makefile		Sat May 15 21:37:08 2004
+@@ -106,7 +106,7 @@
    SDL_LDFLAGS := $(shell sdl-config --libs)
  endif
  
@@ -9,12 +9,12 @@
  
  # Uncomment to use the Intel compiler (v6.0)
  # Note: Version 6.0   Build 020312Z fails to compile engine.c
-@@ -194,9 +194,9 @@
+@@ -200,9 +200,9 @@
  
  ENGINEDIR = .
  ASMFLAGS = -f $(ASMOBJFMT) $(ASMDEFS)
 -LINKER = gcc
--CFLAGS += $(USE_ASM) -funsigned-char -O2 -DPLATFORM_UNIX -g -Wall $(SDL_CFLAGS) -fno-omit-frame-pointer
+-CFLAGS += $(USE_ASM) -funsigned-char -O3 -DPLATFORM_UNIX -g -Wall $(SDL_CFLAGS) -fno-omit-frame-pointer
 -LDFLAGS += -g $(SDL_LDFLAGS)
 +LINKER = $(CC)
 +CFLAGS += %%CFLAGS%% $(USE_ASM) -funsigned-char -DPLATFORM_UNIX -Wall $(SDL_CFLAGS) -fno-omit-frame-pointer
diff -ruN /usr/ports/games/duke3d/files/patch-ab /usr/ports/custom/duke3d/files/patch-ab
--- /usr/ports/games/duke3d/files/patch-ab	Sun Apr 18 21:22:45 2004
+++ /usr/ports/custom/duke3d/files/patch-ab	Sat May 15 21:41:41 2004
@@ -1,20 +1,17 @@
-*** source/buildengine/mmulti.c.orig	Sat Jun  7 08:58:45 2003
---- source/buildengine/mmulti.c	Thu Sep 18 02:24:25 2003
-***************
-*** 916,929 ****
-      if (!set_socket_blockmode(0))
-          return(0);
-  
--     #if !PLATFORM_WIN32 && !PLATFORM_MACOSX
--     {
--         /* Linux-specific. */
--         int flags = 1;
--         setsockopt(udpsocket, SOL_IP, IP_RECVERR, &flags, sizeof (flags));
--     }
--     #endif
-- 
-      memset(&addr, '\0', sizeof (addr));
-      addr.sin_family = AF_INET;
-      addr.sin_addr.s_addr = htonl(ip);
---- 916,921 ----
-
+--- source/buildengine/mmulti.c.orig	Sat May 15 21:39:44 2004
++++ source/buildengine/mmulti.c		Sat May 15 21:41:04 2004
+@@ -916,14 +916,6 @@
+     if (!set_socket_blockmode(0))
+         return(0);
+ 
+-    #if !PLATFORM_WIN32 && !PLATFORM_MACOSX && !PLATFORM_SOLARIS
+-    {
+-        /* Linux-specific. */
+-        int flags = 1;
+-        setsockopt(udpsocket, SOL_IP, IP_RECVERR, &flags, sizeof (flags));
+-    }
+-    #endif
+-
+     memset(&addr, '\0', sizeof (addr));
+     addr.sin_family = AF_INET;
+     addr.sin_addr.s_addr = htonl(ip);
diff -ruN /usr/ports/games/duke3d/files/patch-ac /usr/ports/custom/duke3d/files/patch-ac
--- /usr/ports/games/duke3d/files/patch-ac	Sun Apr 18 21:22:45 2004
+++ /usr/ports/custom/duke3d/files/patch-ac	Sat May 15 22:10:31 2004
@@ -1,12 +1,17 @@
---- source/Makefile.orig	Sat Mar 13 22:51:27 2004
-+++ source/Makefile	Sat Mar 13 22:53:11 2004
-@@ -86,15 +86,14 @@
+---  source/Makefile.orig	Sat May 15 22:08:43 2004
++++  source/Makefile		Sat May 15 22:09:47 2004
+@@ -91,20 +91,14 @@
  	BUILDOBJS += buildengine/a.o
  endif
  
 -CC = gcc
 -CFLAGS = -c -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused $(EXTRACFLAGS) -funsigned-char
+-
+-ifeq ($(strip $(macosx)),true)
+-OPTIMIZE = -O3 -mdynamic-no-pic -falign-loops=16
+-else
 -OPTIMIZE = -O2
+-endif
 +#CC = gcc
 +CFLAGS = -c %%CFLAGS%% $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused $(EXTRACFLAGS) -funsigned-char
  
@@ -19,12 +24,3 @@
  
  # !!! FIXME: Do we even need this? It doesn't fly on MacOS X.  --ryan.
  #LDLIBS += -Wl,-E
-@@ -103,7 +102,7 @@
- 
- 
- %.o : %.c
--	$(CC) $(CFLAGS) $(OPTIMIZE) -o $@ $<
-+	$(CC) $(CFLAGS) -o $@ $<
- 
- # Animation playback crashes due to optimization error on MacOS X. --ryan.
- ifeq ($(strip $(macosx)),true)
--- output-duke3d ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

