5 files changed, 41 insertions, 197 deletions

diff --git a/games/ember/Makefile b/games/ember/Makefile
index 7eebbedbf204..01122880d758 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	ember
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.3.3
+PORTREVISION=	0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=worldforge
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=oliver
-PATCHFILES=	patch-ember-opcode.bz2
-
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Ember is a WorldForge 3d client using the OGRE 3d library
 
@@ -29,9 +25,9 @@ LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 RUN_DEPENDS=	${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut
 
 CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name=
+USE_LIBTOOL=	15
 USE_SDL=	sdl image
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
@@ -46,7 +42,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '\
 		s|sdl-config|${SDL_CONFIG}|g; \
 		s|"-lopenal|"-L${LOCALBASE}/lib -lopenal ${PTHREAD_LIBS}|g; \
-		s|src/components/ogre/SceneManagers/EmberSceneManager[a-z/]*/Makefile||g; \
+		s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \
 		s|CEGUI-OGRE_\([A-Z]*=\)|CEGUI_OGRE_\1|g; \
 		s|\$$CEGUI-OGRE_\([A-Z]*\)|\$$CEGUI_OGRE_\1|g' \
 		${WRKSRC}/configure
diff --git a/games/ember/distinfo b/games/ember/distinfo
index 3a0af815a304..77c7f6b9c40f 100644
--- a/games/ember/distinfo
+++ b/games/ember/distinfo
@@ -1,4 +1,2 @@
-MD5 (ember-0.3.2.zip) = bd60abd65f60284f51d4e69efadfb81e
-SIZE (ember-0.3.2.zip) = 1637051
-MD5 (patch-ember-opcode.bz2) = 212fc7e0015566f0aabf9f43fc376aaf
-SIZE (patch-ember-opcode.bz2) = 38136
+MD5 (ember-0.3.3.zip) = 403206c2f34a1faa45b41c031f6e5059
+SIZE (ember-0.3.3.zip) = 1681887
diff --git a/games/ember/files/patch-ember b/games/ember/files/patch-ember
index 250324cf8d28..474dff462880 100644
--- a/games/ember/files/patch-ember
+++ b/games/ember/files/patch-ember
@@ -1,133 +1,44 @@
---- /dev/null	Mon Oct  3 20:13:37 2005
-+++ ember	Mon Oct  3 20:17:51 2005
-@@ -0,0 +1,130 @@
+--- ember.orig	Tue Sep 27 22:04:31 2005
++++ ember	Wed Oct 12 17:32:30 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
 +#!/bin/sh
-+
-+
-+
-+# Function to find the real directory a program resides in.
-+# Feb. 17, 2000 - Sam Lantinga, Loki Entertainment Software
-+FindPath()
-+{
-+    fullpath="`echo $0 | grep /`"
-+    if [ "$fullpath" = "" ]; then
-+        oIFS="$IFS"
-+        IFS=:
-+        for path in $PATH
-+        do if [ -x "$path/$0" ]; then
-+               if [ "$path" = "" ]; then
-+                   path="."
-+               fi
-+               fullpath="$path/$0"
-+               break
-+           fi
-+        done
-+        IFS="$oIFS"
-+    fi
-+    if [ "$fullpath" = "" ]; then
-+        fullpath="$0"
-+    fi
-+ 
-+    # Is the sed/ls magic portable?
-+    if [ -L "$fullpath" ]; then
-+        #fullpath="`ls -l "$fullpath" | awk '{print $01}'`"
-+        fullpath=`ls -l "$fullpath" |sed -e 's/.* -> //' |sed -e 's/\*//'`
-+    fi
-+    dirname $fullpath
-+}
-+
-+
-+
-+
-+
-+# Setup variables
-+#get the dir where this script resides in
+ 
+ 
+ 
+@@ -40,8 +40,9 @@
+ # Setup variables
+ 
+ #get the dir where this script resides in
+-path=`FindPath`
+-test=${path[0]}
 +set -- $(FindPath)
 +path=$*
 +test=$1
-+#if [ "$fullpath" = "" ]; then
-+if [ "$test" = "." ]; then
-+	path=${PWD}
-+fi
-+prefix=${path}/..
-+
-+#prefix=$HOME/opt/ember_static_x86/
-+echo "According to my calculations Ember should be installed in $prefix"
-+
-+
-+
-+#scriptPath=$0
-+#prefix=`dirname ${scriptPath}`/..
-+
-+exec_prefix=${prefix}
-+bindir=${exec_prefix}/bin
-+datadir=${prefix}/share/games/ember
-+etcdir=${prefix}/etc/ember
-+homedata=$HOME/.ember
-+
-+WFUT_JAR=WFUT.jar
-+
-+# Create dir if required 
-+if [ ! -d $homedata ] ; then
-+	echo "Created ~/.ember to store all game data."
-+	mkdir $homedata
-+fi
-+
-+# Determine if java executable exists in path
-+JAVA=`which java`
-+if [ -x $JAVA ] ; then
-+
-+  # See if Updater exists in home dir
-+  if [ ! -e $homedata/$WFUT_JAR ] ; then
-+    # Check to see if its in the install dir
+ #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"
-+
-+      # Copy WFUT to home dir
+       # Install into home dir 
+       echo "Installing Updater"
+ 
+       # Copy WFUT to home dir
+-      cp $datadir/$WFUT_JAR $homedata
 +      cp $bindir/$WFUT_JAR $homedata
-+
-+    fi
-+  fi
-+
-+  #make sure the configfile also is copied
-+  if [ ! -e $homedata/configfile ] ; then
-+     echo "No config file for WFUT found, trying to install."
-+     if [ -e $etcdir/configfile ] ; then
-+      # Copy WFUT to home dir
-+	cp $etcdir/configfile $homedata/
-+	echo "Copied config file for WFUT."
-+    fi
-+  fi
-+  		
-+
-+  # Run Updater if it exists
-+#it should exist
-+#  if [ -e $homedata/$WFUT_JAR ] ; then
-+    # Store Current dir
-+    CUR_DIR=`pwd`
-+    # We need to change here so updater knows where to find / store data
-+    cd $homedata
-+    # Update
-+    echo "Updating data from the server, this might take some time on a slow connection (circa 30 Mb of data)"
-+    xterm -T "Downloading media..." -e $JAVA -jar $WFUT_JAR update ember-media
-+    # Restore dir
-+    cd $CUR_DIR
-+#  fi
-+else
-+  echo "Java not found in path. Updater cannot be run. For now, that means that you won't get the media necessary, so I will quit right now. In the future this dependecy on java will disappear though."
-+  exit
-+fi
-+
-+LD_LIBRARY=$prefix/lib/ember:$LD_LIBRARY
-+LD_LIBRARY_PATH=$prefix/lib/ember:$LD_LIBRARY_PATH
-+export LD_LIBRARY
-+export LD_LIBRARY_PATH
-+
-+# 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
+ 
+     fi
+   fi
+@@ -124,5 +125,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
+-LD_PRELOAD=libGL.so.1 $bindir/ember.bin --binrelocloading
+-
 +[ ! -f $homedata/plugins.cfg ] && cp $etcdir/plugins.cfg $homedata/
 +[ ! -f $homedata/resources.cfg ] && cp $etcdir/resources.cfg $homedata/
 +LD_PRELOAD=libGL.so.1 $bindir/ember.bin
-+
diff --git a/games/ember/files/patch-src-services-logging-LoggingService.h b/games/ember/files/patch-src-services-logging-LoggingService.h
deleted file mode 100644
index 64b10e48758a..000000000000
--- a/games/ember/files/patch-src-services-logging-LoggingService.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/services/logging/LoggingService.h.orig	Tue Oct  4 17:58:10 2005
-+++ src/services/logging/LoggingService.h	Tue Oct  4 17:58:25 2005
-@@ -28,6 +28,7 @@
- //#include <sigc++/object_slot.h>
- 
- #include <ctime>
-+#include <stdarg.h>
- 
- 
- namespace Ember
diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist
index 9fc5a2807e44..df6e101ed9ee 100644
--- a/games/ember/pkg-plist
+++ b/games/ember/pkg-plist
@@ -43,7 +43,6 @@ share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookWidgets.scheme
 share/games/ember/media/gui/cegui/widgets/ChatWidget.xml
 share/games/ember/media/gui/cegui/widgets/ConsoleWidget.xml
 share/games/ember/media/gui/cegui/widgets/DebugWidget.xml
-share/games/ember/media/gui/cegui/widgets/EntityEditWidget.xml
 share/games/ember/media/gui/cegui/widgets/GiveWidget.xml
 share/games/ember/media/gui/cegui/widgets/HelpWidget.xml
 share/games/ember/media/gui/cegui/widgets/IngameChatWidget.xml
@@ -63,53 +62,6 @@ 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/old/done/acorn.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/axe.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/barrel.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/butcher.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/butchershouse.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/campfire.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/chicken.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/cleaver.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/column_3.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/column_fractured_3.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/column_segmented_3.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/crab.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/deer.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/dog.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/fencegate.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/fencepole.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/fencesection.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/fire.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/floor.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/floor_12_stone.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/floor_24_stone.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/floor_3_stone.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/floor_6_stone.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/house3.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/lumber.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/marshall.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/mercenary.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/merchant.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/mushroom_amanita.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/pig.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/roof.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/scythe.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/settler.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/slopewall.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/spade.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/spider.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/squirrel.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/sty.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/table.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/wall.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/wall_1.5.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/wall_3.modeldef.xml
-share/games/ember/media/modeldefinitions/old/done/wall_with_door.modeldef.xml
-share/games/ember/media/modeldefinitions/old/goblin.modeldef.xml
-share/games/ember/media/modeldefinitions/old/obsolete/field.modeldef.xml
-share/games/ember/media/modeldefinitions/old/obsolete/malebuilder.modeldef.xml
-share/games/ember/media/modeldefinitions/old/obsolete/settler_1.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
@@ -135,9 +87,6 @@ share/icons/worldforge/ember.png
 @dirrm share/games/ember/media/gui/cegui/widgets
 @dirrm share/games/ember/media/gui/cegui
 @dirrm share/games/ember/media/gui
-@dirrm share/games/ember/media/modeldefinitions/old/done
-@dirrm share/games/ember/media/modeldefinitions/old/obsolete
-@dirrm share/games/ember/media/modeldefinitions/old
 @dirrm share/games/ember/media/modeldefinitions/trees/dynamic
 @dirrm share/games/ember/media/modeldefinitions/trees/pregenerated
 @dirrm share/games/ember/media/modeldefinitions/trees