- Update to 1.9.0b6.8

- Give maintainer ship to Yuri Pankov <yuri.pankov@gmail.com>

PR:	ports/142850
Submitted by:	Yuri Pankov <yuri.pankov@gmail.com>

7 files changed, 71 insertions, 198 deletions

diff --git a/games/deng/Makefile b/games/deng/Makefile
index 91bb34298965..6bbd1e8a478d 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -6,64 +6,63 @@
 #
 
 PORTNAME=	deng
-PORTVERSION=	1.9.0b4
-PORTREVISION=	3
+PORTVERSION=	1.9.0b6.8
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta4
+MASTER_SITES=	SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta6.8
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/-beta/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	yuri.pankov@gmail.com
 COMMENT=	An enhanced Doom, Heretic and Hexen source port
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl \
+		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 
-USE_GL=		gl
+USE_GL=		gl glu
 USE_LDCONFIG=	yes
 USE_SDL=	sdl mixer net
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-		`${SDL_CONFIG} --cflags`"
-CONFIGURE_SCRIPT=	../configure
-CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
-BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/Build
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
+USE_XORG=	x11
 
-OPTIONS=	OPENAL "Build OpenAL sound plugin" off
+BUILDDIR=	${WRKSRC}/doomsday/portbuild
+BUILD_WRKSRC=	${BUILDDIR}
+INSTALL_WRKSRC=	${BUILDDIR}
+
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,--export-dynamic"
 
-SUB_FILES=	${PORTNAME} pkg-message
+MAN6=		doomsday.6
+
+OPTIONS=	OPENAL "Build OpenAL sound plugin" off
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/games/doom-data/Makefile.include"
 
 .if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so.0)
 LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
+CMAKE_ARGS+=	-DBUILDOPENAL:BOOL=ON
 PLIST_SUB=	OPENAL=""
 .else
 PLIST_SUB=	OPENAL="@comment "
 .endif
 
 post-patch:
-	@${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(\\|/),,'
+	${REINPLACE_CMD} \
+		-e '/CHECK_LIBRARY_EXIST/s/dl//' \
+		-e '/TARGET_LINK_LIBRARIES/s/dl//' \
+		${WRKSRC}/doomsday/CMakeLists.txt
+
+do-configure:
+	@${MKDIR} ${BUILDDIR}
+	@cd ${BUILDDIR}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ..
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+	@${LN} -s ${PREFIX}/bin/doomsday ${PREFIX}/bin/deng
+	${INSTALL_MAN} ${WRKSRC}/doomsday/engine/doc/doomsday.6 ${MANPREFIX}/man/man6/
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Doc/*.txt ${DOCSDIR}
-.for i in jDoom jHeretic jHexen
-		@${MKDIR} ${DOCSDIR}/${i}
-		${INSTALL_DATA} ${WRKSRC}/Doc/${i}/*.txt ${DOCSDIR}/${i}
+.for i in LICENSE changelog.txt cnsname.txt cvars.txt deddoc.txt dhistory.txt naming.txt network.txt
+	${INSTALL_DATA} ${WRKSRC}/doomsday/engine/doc/${i} ${DOCSDIR}/
 .endfor
 .endif
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/games/deng/distinfo b/games/deng/distinfo
index 5ea2389e1d99..238751a5f983 100644
--- a/games/deng/distinfo
+++ b/games/deng/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (deng-1.9.0-beta6.8.tar.gz) = a57c46e68c5448ee1550ed80f242ff2d
+SHA256 (deng-1.9.0-beta6.8.tar.gz) = eb1c59583c4683289397460c5e74ad9f03e97cc3193e82a418d878cbb2c05cd9
+SIZE (deng-1.9.0-beta6.8.tar.gz) = 6104242
diff --git a/games/deng/files/deng.in b/games/deng/files/deng.in
deleted file mode 100644
index 1074e62cc32f..000000000000
--- a/games/deng/files/deng.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 100644
index e1a3e1741abc..000000000000
--- a/games/deng/files/patch-Src_dd__pinit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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();
- 
-     // Close the message output file.
-     fclose(outFile);
diff --git a/games/deng/files/pkg-message.in b/games/deng/files/pkg-message.in
deleted file mode 100644
index 7c155477f5af..000000000000
--- a/games/deng/files/pkg-message.in
+++ /dev/null
@@ -1,22 +0,0 @@
-==============================================================================
-
-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/deng -g ${game} -f ${path_to_game_wad}
-
-where
-
-	game - could be jdoom, jheretic or jhexen;
-	path_to_game_wad - path to game main wad file.
-
-Check documentation in %%DOCSDIR%% for other options.
-
-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-descr b/games/deng/pkg-descr
index 50cef5838ee0..d4cf5869663b 100644
--- a/games/deng/pkg-descr
+++ b/games/deng/pkg-descr
@@ -1,20 +1,23 @@
-The Doomsday Engine is an enhanced Doom source port for the Windows and
-UNIX platforms. It is based on the source code of id Software's Doom
-and Raven Software's Heretic and Hexen.
-Some of supported features are:
-* Dynamic lights
-* Lens flares
-* High-resolution textures (PNG, TGA, PCX)
-* Particle effects
-* Detail textures
-* 3D models (uses Quake II's MD2 format)
-* Simple environmental mapping for 3D models (shiny effects)
-* MD2 skymodels and skyboxes
-* Actor (monster) movement smoothing
-* Simulated radiosity shadowing system for the environment
-* Simple shadows for objects
-* Fog
-* Glowing surfaces
-* Smart texture filtering using a modified hq2x algorith
+The Doomsday Engine is an enhanced DOOM source port for Windows, Mac OS
+X, and various Unix platforms. It is based on the source code of id
+Software's DOOM and Raven Software's Heretic and Hexen.
 
-WWW: http://www.doomsdayhq.com/
+* Hardware-accelerated OpenGL graphics engine
+* 3D positional audio for sound effects (not supported by all audio plugins)
+* 16-player client/server networking via TCP/IP
+* Graphical Control Panel for configuration, accessed quickly with Shift-Escape
+* 3D models: Quake's MD2 format and Doomsday's DMD format with LOD support
+* High-resolution textures (PNG, TGA, PCX) and detail textures
+* Map lighting emulates the effects of radiosity for a more natual appearance
+  (FakeRadio: shadows in corners)
+* Smooth movement of objects, world structures and the camera.
+* Colored, dynamic lighting for world surfaces, 3D models, sprites and particles
+* Object shadowing effects
+* Particle generators for special effects
+* Decoration effects on world surfaces: light sources and particle generators
+* Lens flares and glowing objects
+* Support for skyboxes and 3D sky models
+* EAX and A3D environmental sound processing effects
+* Upsampling of sound effects
+
+WWW: http://www.dengine.net/
diff --git a/games/deng/pkg-plist b/games/deng/pkg-plist
index 25714e1522e6..98c2f374d0ad 100644
--- a/games/deng/pkg-plist
+++ b/games/deng/pkg-plist
@@ -1,114 +1,26 @@
 bin/deng
 bin/doomsday
-lib/libdpdehread.a
-lib/libdpdehread.la
 lib/libdpdehread.so
-lib/libdpdehread.so.0
-lib/libdpmapload.a
-lib/libdpmapload.la
-lib/libdpmapload.so
-lib/libdpmapload.so.0
-lib/libdropengl.a
-lib/libdropengl.la
-lib/libdropengl.so
-lib/libdropengl.so.0
-%%OPENAL%%lib/libdsopenal.a
-%%OPENAL%%lib/libdsopenal.la
+lib/libdpwadmapconverter.so
 %%OPENAL%%lib/libdsopenal.so
-%%OPENAL%%lib/libdsopenal.so.0
-lib/libdssdlmixer.a
-lib/libdssdlmixer.la
-lib/libdssdlmixer.so
-lib/libdssdlmixer.so.0
-lib/libjdoom.a
-lib/libjdoom.la
 lib/libjdoom.so
-lib/libjdoom.so.0
-lib/libjheretic.a
-lib/libjheretic.la
 lib/libjheretic.so
-lib/libjheretic.so.0
-lib/libjhexen.a
-lib/libjhexen.la
 lib/libjhexen.so
-lib/libjhexen.so.0
-%%DATADIR%%/Data/CPHelp.txt
-%%DATADIR%%/Data/Doomsday.pk3
-%%DATADIR%%/Data/jDoom/jDoom.wad
-%%DATADIR%%/Data/jHeretic/jHeretic.wad
-%%DATADIR%%/Data/jHexen/jHexen.wad
-%%DATADIR%%/Defs/Doomsday.ded
-%%DATADIR%%/Defs/Flags.ded
-%%DATADIR%%/Defs/XG.ded
-%%DATADIR%%/Defs/jDoom/Anim.ded
-%%DATADIR%%/Defs/jDoom/Audio.ded
-%%DATADIR%%/Defs/jDoom/Details.ded
-%%DATADIR%%/Defs/jDoom/Doom1Lights.ded
-%%DATADIR%%/Defs/jDoom/Doom2Lights.ded
-%%DATADIR%%/Defs/jDoom/Finales.ded
-%%DATADIR%%/Defs/jDoom/Lights.ded
-%%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
-%%DATADIR%%/Defs/jHeretic/Anim.ded
-%%DATADIR%%/Defs/jHeretic/Audio.ded
-%%DATADIR%%/Defs/jHeretic/Finales.ded
-%%DATADIR%%/Defs/jHeretic/Lights.ded
-%%DATADIR%%/Defs/jHeretic/Maps.ded
-%%DATADIR%%/Defs/jHeretic/Objects.ded
-%%DATADIR%%/Defs/jHeretic/Special.ded
-%%DATADIR%%/Defs/jHeretic/Sprites.ded
-%%DATADIR%%/Defs/jHeretic/Text.ded
-%%DATADIR%%/Defs/jHeretic/jHeretic.ded
-%%DATADIR%%/Defs/jHexen/Anim.ded
-%%DATADIR%%/Defs/jHexen/Audio.ded
-%%DATADIR%%/Defs/jHexen/Finales.ded
-%%DATADIR%%/Defs/jHexen/Lights.ded
-%%DATADIR%%/Defs/jHexen/Maps.ded
-%%DATADIR%%/Defs/jHexen/Objects.ded
-%%DATADIR%%/Defs/jHexen/Special.ded
-%%DATADIR%%/Defs/jHexen/Sprites.ded
-%%DATADIR%%/Defs/jHexen/Text.ded
-%%DATADIR%%/Defs/jHexen/jHexen.ded
-%%DATADIR%%/Runtime/jDoom/Startup.cfg
-%%DATADIR%%/Runtime/jHeretic/Startup.cfg
-%%DATADIR%%/Runtime/jHexen/Startup.cfg
-%%PORTDOCS%%%%DOCSDIR%%/CVars.txt
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
-%%PORTDOCS%%%%DOCSDIR%%/DEDDoc.txt
-%%PORTDOCS%%%%DOCSDIR%%/Network.txt
-%%PORTDOCS%%%%DOCSDIR%%/Ravenlic.txt
-%%PORTDOCS%%%%DOCSDIR%%/SrcNotes.txt
-%%PORTDOCS%%%%DOCSDIR%%/TexC.txt
-%%PORTDOCS%%%%DOCSDIR%%/jDoom/DoomLic.txt
-%%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
+%%DATADIR%%/data/doomsday.pk3
+%%DATADIR%%/data/jdoom/jdoom.pk3
+%%DATADIR%%/data/jheretic/jheretic.pk3
+%%DATADIR%%/data/jhexen/jhexen.pk3
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
+%%PORTDOCS%%%%DOCSDIR%%/cnsname.txt
+%%PORTDOCS%%%%DOCSDIR%%/cvars.txt
+%%PORTDOCS%%%%DOCSDIR%%/deddoc.txt
+%%PORTDOCS%%%%DOCSDIR%%/dhistory.txt
+%%PORTDOCS%%%%DOCSDIR%%/naming.txt
+%%PORTDOCS%%%%DOCSDIR%%/network.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/Runtime/jHexen
-@dirrm %%DATADIR%%/Runtime/jHeretic
-@dirrm %%DATADIR%%/Runtime/jDoom
-@dirrm %%DATADIR%%/Runtime
-@dirrm %%DATADIR%%/Defs/jHexen
-@dirrm %%DATADIR%%/Defs/jHeretic
-@dirrm %%DATADIR%%/Defs/jDoom
-@dirrm %%DATADIR%%/Defs
-@dirrm %%DATADIR%%/Data/jHexen
-@dirrm %%DATADIR%%/Data/jHeretic
-@dirrm %%DATADIR%%/Data/jDoom
-@dirrm %%DATADIR%%/Data
+@dirrm %%DATADIR%%/data/jdoom
+@dirrm %%DATADIR%%/data/jhexen
+@dirrm %%DATADIR%%/data/jheretic
+@dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%