- Update to version 1.9.0b4.

- Use SF macro in MASTER_SITES.
- Take maintainership.
- Remove ONLY_FOR_ARCHS=i386.
- Clean-up.
- Convert to OPTIONS.
- Add wrapper script and note it in pkg-message.
- Remove patch to avoid sound delay problems.

7 files changed, 73 insertions, 96 deletions

diff --git a/games/deng/Makefile b/games/deng/Makefile
index 53c5b6a9002e..cae63d793757 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -6,66 +6,64 @@
 #
 
 PORTNAME=	deng
-PORTVERSION=	1.9.0b3
+PORTVERSION=	1.9.0b4
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/-beta/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	An enhanced Doom, Heretic and Hexen source port
 
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity
+RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" \
-		CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include"
-USE_SDL=	sdl mixer net
 USE_GL=		yes
 USE_LDCONFIG=	yes
-ONLY_FOR_ARCHS=	i386
+USE_SDL=	sdl mixer net
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+		`${SDL_CONFIG} --cflags`"
+CONFIGURE_SCRIPT=	../configure
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
+BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/Build
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+OPTIONS=	OPENAL "Build OpenAL sound plugin" off
 
-SUB_FILES=	pkg-message
-SUB_LIST=	"PREFIX=${PREFIX}" "DOCSDIR=${DOCSDIR}"
+SUB_FILES=	${PORTNAME} pkg-message
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/games/doom-data/Makefile.include"
 
-.if exists(${LOCALBASE}/lib/libopenal.so.0) || defined(WITH_OPENAL)
-WITH_OPENAL=	yes
+.if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so.0)
 LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
-.endif
-
-.if !defined(WITH_OPENAL)
-PLIST_SUB=	WITH_OPENAL="@comment "
+PLIST_SUB=	OPENAL=""
 .else
-PLIST_SUB=	WITH_OPENAL=""
-.endif
-
-.ifndef (WITH_OPENAL)
-pre-everything::
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Optionally define WITH_OPENAL=yes to build OpenAL sound plugin"
-	@${ECHO_CMD} ""
+PLIST_SUB=	OPENAL="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -E -i '' -e 's/-Wunused-.+ / /g; \
-				 s/SDL(\\|\/)//g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name '*.[ch]' | \
-		${XARGS} ${REINPLACE_CMD} -i '' -E -e 's/SDL(\\|\/)//g'
+	@${REINPLACE_CMD} -Ee \
+		's,-Wunused-variable -Wunused-function ,,; \
+		 s,SDL(\\|/),,' \
+		 ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${FIND} ${PATCH_WRKSRC} -name '*.[ch]' -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -Ee 's,SDL(\\|/),,'
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Doc/*.txt ${DOCSDIR}
-.	for i in jDoom jHeretic jHexen
+.for i in jDoom jHeretic jHexen
 		@${MKDIR} ${DOCSDIR}/${i}
 		${INSTALL_DATA} ${WRKSRC}/Doc/${i}/*.txt ${DOCSDIR}/${i}
-.	endfor
+.endfor
 .endif
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/games/deng/distinfo b/games/deng/distinfo
index 4604d2bef02b..5ea2389e1d99 100644
--- a/games/deng/distinfo
+++ b/games/deng/distinfo
@@ -1,3 +1,3 @@
-MD5 (deng-1.9.0-beta3.tar.gz) = 581fefd6165dd4104b25656a6b9f31b4
-SHA256 (deng-1.9.0-beta3.tar.gz) = a52dca759ab48a14548f255f955c10602a6591aa48687993dd4b6131723ce5fb
-SIZE (deng-1.9.0-beta3.tar.gz) = 3224025
+MD5 (deng-1.9.0-beta4.tar.gz) = b2bec9a475eee1438f55ebde00b3d13f
+SHA256 (deng-1.9.0-beta4.tar.gz) = 643fbd1a5be0db8ca1884ee389e111f2a7cfa61a2ee3acb4ed0f08a1b38660ae
+SIZE (deng-1.9.0-beta4.tar.gz) = 4433485
diff --git a/games/deng/files/deng.in b/games/deng/files/deng.in
new file mode 100644
index 000000000000..1074e62cc32f
--- /dev/null
+++ b/games/deng/files/deng.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# The program creates the configuration files in the current directory, so we
+# enter ~/.deng and then run it from there.
+
+test -d ~/.deng || mkdir ~/.deng
+cd ~/.deng || exit 1
+exec %%PREFIX%%/bin/doomsday "$@"
diff --git a/games/deng/files/patch-Src_dd__pinit.c b/games/deng/files/patch-Src_dd__pinit.c
index 468e5e81063f..e1a3e1741abc 100644
--- a/games/deng/files/patch-Src_dd__pinit.c
+++ b/games/deng/files/patch-Src_dd__pinit.c
@@ -1,11 +1,11 @@
---- Src/dd_pinit.c.orig
-+++ Src/dd_pinit.c
-@@ -226,7 +226,7 @@
- 	FH_Clear();
- 	ArgShutdown();
+--- Src/dd_pinit.c.orig	Fri Apr  7 21:12:59 2006
++++ Src/dd_pinit.c	Thu Sep  7 19:16:32 2006
+@@ -230,7 +230,7 @@
+     FH_Clear();
+     ArgShutdown();
      Z_Shutdown();
--	DD_ShutdownDGL();
-+	//DD_ShutdownDGL();
+-    DD_ShutdownDGL();
++    //DD_ShutdownDGL();
  
- 	// Close the message output file.
- 	fclose(outFile);
+     // Close the message output file.
+     fclose(outFile);
diff --git a/games/deng/files/patch-Src_dsSDLMixer_driver__sdlmixer.c b/games/deng/files/patch-Src_dsSDLMixer_driver__sdlmixer.c
deleted file mode 100644
index c87a81f71335..000000000000
--- a/games/deng/files/patch-Src_dsSDLMixer_driver__sdlmixer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/dsSDLMixer/driver_sdlmixer.c.orig	Tue Aug 31 21:53:06 2004
-+++ Src/dsSDLMixer/driver_sdlmixer.c	Tue Aug 31 21:53:21 2004
-@@ -130,7 +130,7 @@
- 		return false;
- 	}
- 
--	if(Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024))
-+	if(Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 4096))
- 	{
- 		Error();
- 		return false;
diff --git a/games/deng/files/pkg-message.in b/games/deng/files/pkg-message.in
index bc2e18dfdccf..7c155477f5af 100644
--- a/games/deng/files/pkg-message.in
+++ b/games/deng/files/pkg-message.in
@@ -1,11 +1,12 @@
-******************************************************************************
+==============================================================================
+
 Now you can start playing Doomsday!
 
 All three games Doom, Heretic and Hexen could be launched with one executable.
 
 A quick start command could be:
 
-	%%PREFIX%%/bin/doomsday -g ${game} -f ${path_to_game_wad}
+	%%PREFIX%%/bin/deng -g ${game} -f ${path_to_game_wad}
 
 where
 
@@ -14,8 +15,8 @@ where
 
 Check documentation in %%DOCSDIR%% for other options.
 
-NOTE: when you run Doomsday it will create about 7 files/dirs in the current
-directory (including temporary files, configuration, etc.) so it's preferable
-to run it in a separate directory.
+NOTE: the "deng" program is a script that creates/enters ~/.deng and then runs
+"doomsday". This is because the program will create about 7 files/dirs in the
+current directory.
 
-******************************************************************************
+==============================================================================
diff --git a/games/deng/pkg-plist b/games/deng/pkg-plist
index 6fa206bce103..25714e1522e6 100644
--- a/games/deng/pkg-plist
+++ b/games/deng/pkg-plist
@@ -1,3 +1,4 @@
+bin/deng
 bin/doomsday
 lib/libdpdehread.a
 lib/libdpdehread.la
@@ -11,10 +12,10 @@ lib/libdropengl.a
 lib/libdropengl.la
 lib/libdropengl.so
 lib/libdropengl.so.0
-%%WITH_OPENAL%%lib/libdsopenal.a
-%%WITH_OPENAL%%lib/libdsopenal.la
-%%WITH_OPENAL%%lib/libdsopenal.so
-%%WITH_OPENAL%%lib/libdsopenal.so.0
+%%OPENAL%%lib/libdsopenal.a
+%%OPENAL%%lib/libdsopenal.la
+%%OPENAL%%lib/libdsopenal.so
+%%OPENAL%%lib/libdsopenal.so.0
 lib/libdssdlmixer.a
 lib/libdssdlmixer.la
 lib/libdssdlmixer.so
@@ -31,29 +32,8 @@ lib/libjhexen.a
 lib/libjhexen.la
 lib/libjhexen.so
 lib/libjhexen.so.0
-%%DATADIR%%/Data/Doomsday.wad
-%%DATADIR%%/Data/Fonts/Fixed.dfn
-%%DATADIR%%/Data/Fonts/Fixed12.dfn
-%%DATADIR%%/Data/Fonts/Large.dfn
-%%DATADIR%%/Data/Fonts/Small10.dfn
-%%DATADIR%%/Data/Fonts/Small7.dfn
-%%DATADIR%%/Data/Fonts/Small8.dfn
-%%DATADIR%%/Data/Fonts/System.dfn
-%%DATADIR%%/Data/Fonts/System12.dfn
-%%DATADIR%%/Data/Graphics/Background.pcx
-%%DATADIR%%/Data/Graphics/BoxCorner.png
-%%DATADIR%%/Data/Graphics/BoxFill.png
-%%DATADIR%%/Data/Graphics/BoxShade.png
-%%DATADIR%%/Data/Graphics/Hint.png
-%%DATADIR%%/Data/Graphics/Logo.png
-%%DATADIR%%/Data/Graphics/Mouse.png
-%%DATADIR%%/Data/Graphics/RadioCC.pcx
-%%DATADIR%%/Data/Graphics/RadioCO.pcx
-%%DATADIR%%/Data/Graphics/WallGlow.pcx
-%%DATADIR%%/Data/KeyMaps/de.dkm
-%%DATADIR%%/Data/KeyMaps/default.dkm
-%%DATADIR%%/Data/KeyMaps/fi.dkm
-%%DATADIR%%/Data/cphelp.txt
+%%DATADIR%%/Data/CPHelp.txt
+%%DATADIR%%/Data/Doomsday.pk3
 %%DATADIR%%/Data/jDoom/jDoom.wad
 %%DATADIR%%/Data/jHeretic/jHeretic.wad
 %%DATADIR%%/Data/jHexen/jHexen.wad
@@ -70,10 +50,14 @@ lib/libjhexen.so.0
 %%DATADIR%%/Defs/jDoom/Maps.ded
 %%DATADIR%%/Defs/jDoom/Objects.ded
 %%DATADIR%%/Defs/jDoom/Particles.ded
+%%DATADIR%%/Defs/jDoom/PlutAnim.ded
 %%DATADIR%%/Defs/jDoom/PlutFinales.ded
+%%DATADIR%%/Defs/jDoom/PlutMaps.ded
 %%DATADIR%%/Defs/jDoom/Special.ded
 %%DATADIR%%/Defs/jDoom/Sprites.ded
+%%DATADIR%%/Defs/jDoom/TNTAnim.ded
 %%DATADIR%%/Defs/jDoom/TNTFinales.ded
+%%DATADIR%%/Defs/jDoom/TNTMaps.ded
 %%DATADIR%%/Defs/jDoom/Text.ded
 %%DATADIR%%/Defs/jDoom/Values.ded
 %%DATADIR%%/Defs/jDoom/jDoom.ded
@@ -111,6 +95,10 @@ lib/libjhexen.so.0
 %%PORTDOCS%%%%DOCSDIR%%/jDoom/JDoom.txt
 %%PORTDOCS%%%%DOCSDIR%%/jHeretic/JHeretic.txt
 %%PORTDOCS%%%%DOCSDIR%%/jHexen/JHexen.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/jHexen
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/jHeretic
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/jDoom
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/Runtime/jHexen
 @dirrm %%DATADIR%%/Runtime/jHeretic
 @dirrm %%DATADIR%%/Runtime/jDoom
@@ -122,12 +110,5 @@ lib/libjhexen.so.0
 @dirrm %%DATADIR%%/Data/jHexen
 @dirrm %%DATADIR%%/Data/jHeretic
 @dirrm %%DATADIR%%/Data/jDoom
-@dirrm %%DATADIR%%/Data/KeyMaps
-@dirrm %%DATADIR%%/Data/Graphics
-@dirrm %%DATADIR%%/Data/Fonts
 @dirrm %%DATADIR%%/Data
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/jDoom
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/jHeretic
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/jHexen
-%%PORTDOCS%%@dirrm %%DOCSDIR%%