update to openal 20060211 [1]

fix dependant ports [2]

PR:		ports/96172 [1]
		ports/95192 [2]
Submitted by:	maintainer  [1]
		oliver      [2]
Approved by:	maintainer

4 files changed, 62 insertions, 44 deletions

diff --git a/games/ember/Makefile b/games/ember/Makefile
index c514b3bcfbc8..46a8b38ab8a6 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ember
-PORTVERSION=	0.3.4
-PORTREVISION=	2
+PORTVERSION=	0.4.0
+PORTREVISION=	0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://amber.worldforge.org/ember/releases/stable/
@@ -16,13 +16,14 @@ MASTER_SITE_SUBDIR=worldforge
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Ember is a WorldForge 3d client using the OGRE 3d library
 
-RUN_DEPENDS=	${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut
+#RUN_DEPENDS=	${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut
 LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
-		OgreMain.9:${PORTSDIR}/graphics/ogre3d \
+		OgreMain.10:${PORTSDIR}/graphics/ogre3d \
 		eris-1.3:${PORTSDIR}/devel/eris \
 		varconf-1.0.6:${PORTSDIR}/devel/varconf \
 		mercator-0.2.4:${PORTSDIR}/devel/mercator \
-		openal.0:${PORTSDIR}/audio/openal
+		openal.0:${PORTSDIR}/audio/openal \
+		alut.0:${PORTSDIR}/audio/freealut
 
 CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit
 USE_SDL=	sdl image
@@ -32,6 +33,7 @@ INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
 USE_X_PREFIX=	YES
 USE_GNOME=	gnomehack
+USE_BZIP2=	YES
 CPPFLAGS=	-DBR_NO_MACROS
 
 .include <bsd.port.pre.mk>
@@ -59,6 +61,10 @@ post-patch:
 		 /Plugin=Plugin_CgProgramManager.so/d; \
 		s|/usr/lib/OGRE|${X11BASE}/lib/OGRE|' \
 		${WRKSRC}/src/components/ogre/plugins.cfg
+	@${REINPLACE_CMD} -e 's|/altypes\.h|/al\.h|' \
+		${WRKSRC}/src/services/sound/SoundService.h
+	@${REINPLACE_CMD} -e 's|@LDFLAGS@|& -lopenal -lalut|' \
+		${WRKSRC}/src/components/ogre/Makefile.in
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} -e 's|lrintf|(long int)rintf|g' \
 		${WRKSRC}/src/components/ogre/environment/meshtree/TStem.cpp \
diff --git a/games/ember/distinfo b/games/ember/distinfo
index 28ecc92e08a4..911acac1b5e8 100644
--- a/games/ember/distinfo
+++ b/games/ember/distinfo
@@ -1,3 +1,3 @@
-MD5 (ember-0.3.4.tar.gz) = 49b4181a415ba9a75b0315ae55ac52bc
-SHA256 (ember-0.3.4.tar.gz) = 864cdbeb5f9f89fc135bdd94d7359589e4f00d7b8278b5581d78dbbf7896243d
-SIZE (ember-0.3.4.tar.gz) = 1316934
+MD5 (ember-0.4.0.tar.bz2) = c60cfe1227e2f0f810e5fa9b24f2096e
+SHA256 (ember-0.4.0.tar.bz2) = 17780eec446b5e3959d657a61a85533f5072e00b629a1755ce51d75509fedd6a
+SIZE (ember-0.4.0.tar.bz2) = 2275373
diff --git a/games/ember/files/patch-ember b/games/ember/files/patch-ember
index 474dff462880..8d1b70f606fa 100644
--- a/games/ember/files/patch-ember
+++ b/games/ember/files/patch-ember
@@ -1,5 +1,5 @@
---- ember.orig	Tue Sep 27 22:04:31 2005
-+++ ember	Wed Oct 12 17:32:30 2005
+--- ember.orig	Mon Feb 13 00:33:13 2006
++++ ember	Wed Mar  8 06:28:31 2006
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -18,22 +18,16 @@
  #if [ "$fullpath" = "" ]; then
  if [ "$test" = "." ]; then
  	path=${PWD}
-@@ -77,12 +78,12 @@
-   # See if Updater exists in home dir
-   if [ ! -e $homedata/$WFUT_JAR ] ; then
-     # Check to see if its in the install dir
--    if [ -e $datadir/$WFUT_JAR ] ; then
-+    if [ -e $bindir/$WFUT_JAR ] ; then
-       # Install into home dir 
-       echo "Installing Updater"
+@@ -56,7 +57,7 @@
+ etcdir=${prefix}/etc/ember
+ homedata=$HOME/.ember
  
-       # Copy WFUT to home dir
--      cp $datadir/$WFUT_JAR $homedata
-+      cp $bindir/$WFUT_JAR $homedata
+-WFUT_JAR=$datadir/WFUT.jar
++WFUT_JAR=$bindir/WFUT.jar
  
-     fi
-   fi
-@@ -124,5 +125,6 @@
+ # Create dir if required 
+ if [ ! -d $homedata ] ; then
+@@ -96,5 +97,6 @@
  # Execute real ember binary
  echo "Starting Ember...."
  #we have to do the LD_PRELOAD thing, because else at least I get an error: libnvidia-tls.so.1: cannot handle TLS data /ehj
diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist
index 72fe864be270..14ba924de5cc 100644
--- a/games/ember/pkg-plist
+++ b/games/ember/pkg-plist
@@ -20,25 +20,33 @@ share/games/ember/carpenter/modelblockspecs/general.modelblocks.xml
 share/games/ember/jesus/modelmappings/general.modelmapping.xml
 share/games/ember/media/gui/CEGUIConfig.xsd
 share/games/ember/media/gui/Font.xsd
+share/games/ember/media/gui/Falagard.xsd
 share/games/ember/media/gui/GUILayout.xsd
 share/games/ember/media/gui/GUIScheme.xsd
 share/games/ember/media/gui/Imageset.xsd
 share/games/ember/media/gui/cegui/datafiles/configs/cegui.config
 share/games/ember/media/gui/cegui/datafiles/fonts/Font.xsd
+share/games/ember/media/gui/cegui/datafiles/fonts/Vera.ttf
 share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-10.xml
 share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-14.xml
 share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-8.xml
 share/games/ember/media/gui/cegui/datafiles/fonts/tahoma.ttf
+share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-14.xml
+share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-10.xml
+share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-8.xml
+share/games/ember/media/gui/cegui/datafiles/fonts/
 share/games/ember/media/gui/cegui/datafiles/imagesets/Imageset.xsd
 share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLook.imageset
-share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLookMouse.imageset
 share/games/ember/media/gui/cegui/datafiles/imagesets/WindowsLook.imageset
 share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_mason.imageset
 share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_standard.imageset
-share/games/ember/media/gui/cegui/datafiles/layouts/ChatWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/Chat.layout
 share/games/ember/media/gui/cegui/datafiles/layouts/ConsoleWidget.xml
-share/games/ember/media/gui/cegui/datafiles/layouts/DebugWidget.xml
-share/games/ember/media/gui/cegui/datafiles/layouts/GiveWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/Debug.layout
+share/games/ember/media/gui/cegui/datafiles/layouts/Demo8.layout
+share/games/ember/media/gui/cegui/datafiles/layouts/EntityEditWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/EntityPicker.layout
+share/games/ember/media/gui/cegui/datafiles/layouts/Give.layout
 share/games/ember/media/gui/cegui/datafiles/layouts/GUILayout.xsd
 share/games/ember/media/gui/cegui/datafiles/layouts/HelpWidget.xml
 share/games/ember/media/gui/cegui/datafiles/layouts/IngameChatWidget.xml
@@ -49,24 +57,36 @@ share/games/ember/media/gui/cegui/datafiles/layouts/JesusEditFile.widget
 share/games/ember/media/gui/cegui/datafiles/layouts/JesusEditPreview.widget
 share/games/ember/media/gui/cegui/datafiles/layouts/MakeEntityWidget.xml
 share/games/ember/media/gui/cegui/datafiles/layouts/MeshPreview.widget
-share/games/ember/media/gui/cegui/datafiles/layouts/Performance.widget
+share/games/ember/media/gui/cegui/datafiles/layouts/ModelEdit.layout
+share/games/ember/media/gui/cegui/datafiles/layouts/Performance.layout
 share/games/ember/media/gui/cegui/datafiles/layouts/Quit.widget
-share/games/ember/media/gui/cegui/datafiles/layouts/ServerBrowserWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/ScriptEdit.layout
+share/games/ember/media/gui/cegui/datafiles/layouts/ServerBrowser.layout
 share/games/ember/media/gui/cegui/datafiles/layouts/ServerWidget.xml
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/Bootstrap.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/Chat.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/Debug.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/demo8.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/EntityPicker.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/Give.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/ModelEdit.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/Performance.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/ServerBrowser.lua
+share/games/ember/media/gui/cegui/datafiles/lua_scripts/ScriptEdit.lua
+share/games/ember/media/gui/cegui/datafiles/imagesets/EmberLook.imageset
+share/games/ember/media/gui/cegui/datafiles/looknfeel/TaharezLook.looknfeel
+share/games/ember/media/gui/cegui/datafiles/looknfeel/Vanilla.looknfeel
+share/games/ember/media/gui/cegui/datafiles/looknfeel/WindowsLook.looknfeel
+share/games/ember/media/gui/cegui/datafiles/looknfeel/EmberLook.looknfeel
+share/games/ember/media/gui/cegui/datafiles/schemes/EmberLookSkin.scheme
 share/games/ember/media/gui/cegui/datafiles/schemes/GUIScheme.xsd
 share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLook.scheme
+share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookSkin.scheme
 share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme
-share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgets.scheme
 share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLook.scheme
-share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookWidgets.scheme
-share/games/ember/media/modeldefinitions/buildingelements.modeldef.xml
-share/games/ember/media/modeldefinitions/characters.modeldef.xml
-share/games/ember/media/modeldefinitions/creatures.modeldef.xml
-share/games/ember/media/modeldefinitions/environment.modeldef.xml
-share/games/ember/media/modeldefinitions/items.modeldef.xml
-share/games/ember/media/modeldefinitions/placeholder.modeldef.xml
-share/games/ember/media/modeldefinitions/trees/dynamic/trees.modeldef.xml
-share/games/ember/media/modeldefinitions/trees/pregenerated/trees.modeldef.xml
+share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookSkin.scheme
+share/games/ember/media/packs/EmberCore.zip
+share/games/ember/media/packs/OgreCore.zip
 share/icons/worldforge/ember.png
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -85,15 +105,13 @@ share/icons/worldforge/ember.png
 @dirrm share/games/ember/media/gui/cegui/datafiles/fonts
 @dirrm share/games/ember/media/gui/cegui/datafiles/imagesets
 @dirrm share/games/ember/media/gui/cegui/datafiles/layouts
+@dirrm share/games/ember/media/gui/cegui/datafiles/looknfeel
 @dirrm share/games/ember/media/gui/cegui/datafiles/lua_scripts
 @dirrm share/games/ember/media/gui/cegui/datafiles/schemes
 @dirrm share/games/ember/media/gui/cegui/datafiles
 @dirrm share/games/ember/media/gui/cegui
 @dirrm share/games/ember/media/gui
-@dirrm share/games/ember/media/modeldefinitions/trees/dynamic
-@dirrm share/games/ember/media/modeldefinitions/trees/pregenerated
-@dirrm share/games/ember/media/modeldefinitions/trees
-@dirrm share/games/ember/media/modeldefinitions
+@dirrm share/games/ember/media/packs
 @dirrm share/games/ember/media
 @dirrm share/games/ember
 @dirrm share/games