- Update to newer snapshot

- Reclaim maintainership

PR:		ports/70771
Submitted by:	No Name <arundel@h3c.de>

8 files changed, 48 insertions, 46 deletions

diff --git a/games/duke3d/Makefile b/games/duke3d/Makefile
index f31fa91e6675..4ba07783e960 100644
--- a/games/duke3d/Makefile
+++ b/games/duke3d/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 
 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@FreeBSD.org
+MAINTAINER=	arundel@h3c.de
 COMMENT=	Icculus Duke Nukem 3D port for various Operating Systems
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
diff --git a/games/duke3d/distinfo b/games/duke3d/distinfo
index a7037aee8247..ff8c94ce4484 100644
--- a/games/duke3d/distinfo
+++ b/games/duke3d/distinfo
@@ -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 --git a/games/duke3d/files/fix.sh b/games/duke3d/files/fix.sh
index 15d0f7a2f3ac..3638c9694267 100644
--- a/games/duke3d/files/fix.sh
+++ b/games/duke3d/files/fix.sh
@@ -40,5 +40,3 @@ fi
 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 --git a/games/duke3d/files/patch-aa b/games/duke3d/files/patch-aa
index 7b90c698cd10..3fa015c3439b 100644
--- a/games/duke3d/files/patch-aa
+++ b/games/duke3d/files/patch-aa
@@ -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 --git a/games/duke3d/files/patch-ab b/games/duke3d/files/patch-ab
index 4f4426579c41..a4b4378c2872 100644
--- a/games/duke3d/files/patch-ab
+++ b/games/duke3d/files/patch-ab
@@ -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 --git a/games/duke3d/files/patch-ac b/games/duke3d/files/patch-ac
index 076a0c3c4383..385b525605a9 100644
--- a/games/duke3d/files/patch-ac
+++ b/games/duke3d/files/patch-ac
@@ -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)
diff --git a/games/duke3d/files/patch-source-astub.c b/games/duke3d/files/patch-source-astub.c
new file mode 100644
index 000000000000..8af5044eefd7
--- /dev/null
+++ b/games/duke3d/files/patch-source-astub.c
@@ -0,0 +1,12 @@
+--- source/astub.c.orig	Sat Aug 21 16:45:37 2004
++++ source/astub.c	Sat Aug 21 16:52:30 2004
+@@ -134,6 +134,9 @@
+     };
+ extern char buildkeys[NUMKEYS];
+ 
++void PrintStatus(char *string,int num,char x,char y,char color);
++void SpriteName(short spritenum, char *lo2);
++void Ver();
+ 
+ 
+ 
diff --git a/games/duke3d/pkg-plist b/games/duke3d/pkg-plist
index f847923b6151..ef263a1d9008 100644
--- a/games/duke3d/pkg-plist
+++ b/games/duke3d/pkg-plist
@@ -16,4 +16,4 @@ bin/duke3d
 %%PORTDOCS%%%%DOCSDIR%%/gnu.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm duke3d/testdata
-@unexec rmdir duke3d 2> /dev/null || true
+@unexec rmdir %D/duke3d 2> /dev/null || true