7 files changed, 100 insertions, 67 deletions

diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile
index 5bc148f91da3..a53d038df5c9 100644
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@@ -6,40 +6,59 @@
 #
 
 PORTNAME=	freedroidrpg
-PORTVERSION=	0.9.13.r2
+PORTVERSION=	0.9.13.r3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freedroid
-DISTNAME=	${PORTNAME}-0.9.13-rc2
+DISTNAME=	${PORTNAME:S/rpg/RPG/}-${PORTVERSION:S/.r3/-rc3/}
 
 MAINTAINER=	alejandro@varnet.biz
 COMMENT=	Modification of the classical Freedroid engine into an RPG
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r3/-rc3/}
+
 USE_BZIP2=	yes
-USE_REINPLACE=	yes
-USE_GL=		yes
-USE_GMAKE=	yes
-USE_GNOME=	gtk12
+USE_GETOPT_LONG=yes
 USE_SDL=	mixer image net sdl
-USE_XLIB=	yes
+WANT_GNOME=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=
 
 MAN6=		freedroidRPG.6
 
+OPTIONS=	BACKTRACE "Use backtrace() to generate nice bug reports" on \
+		EDITORS "Build the GTK editors" on \
+		OPENGL "Enable the OpenGL support (highly recommended!)" on
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
 BROKEN=		"does not compile (missing fenv.h)"
 .endif
 
-.if ${OSVERSION} < 600021
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-init.c
+.if defined(WITH_BACKTRACE)
+LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+CONFIGURE_ARGS+=	--enable-backtrace
+STRIP=		# keep debugging symbols
+.else
+CONFIGURE_ARGS+=	--disable-backtrace
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's#-lSDL # #' \
-				${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.if defined(WITH_EDITORS)
+USE_GNOME+=	gtk12
+CONFIGURE_ARGS+=	--enable-editors
+PLIST_SUB+=	EDITORS=""
+.else
+CONFIGURE_ARGS+=	--disable-editors
+PLIST_SUB+=	EDITORS="@comment "
+.endif
+
+.if defined(WITH_OPENGL)
+USE_GL=		yes
+CONFIGURE_ARGS+=	--enable-opengl
+.else
+CONFIGURE_ARGS+=	--disable-opengl
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/freedroidrpg/distinfo b/games/freedroidrpg/distinfo
index 2434a96f3c00..6e9d0669dea8 100644
--- a/games/freedroidrpg/distinfo
+++ b/games/freedroidrpg/distinfo
@@ -1,2 +1,2 @@
-MD5 (freedroidrpg-0.9.13-rc2.tar.bz2) = eda34581d784cbd1db59ebc46208880e
-SIZE (freedroidrpg-0.9.13-rc2.tar.bz2) = 71145621
+MD5 (freedroidRPG-0.9.13-rc3.tar.bz2) = 4c31c93b4a4cad94b25de41ee43ed392
+SIZE (freedroidRPG-0.9.13-rc3.tar.bz2) = 72171151
diff --git a/games/freedroidrpg/files/extra-patch-init.c b/games/freedroidrpg/files/extra-patch-init.c
deleted file mode 100644
index be6c3d649681..000000000000
--- a/games/freedroidrpg/files/extra-patch-init.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/init.c.orig	Mon Jul 18 02:00:54 2005
-+++ src/init.c		Mon Jul 18 02:05:10 2005
-@@ -58,14 +58,9 @@
-  * section about 'Arithmethic', subsection on floating point control
-  * functions.
-  * ---------------------------------------------------------------------- */
--#if defined __APPLE_CC__
--/* turn off these function-call on OS X, where there are not present */
-+/* turn off these function-call */
- int feenableexcept (int excepts) { return 0;}
- int fedisableexcept (int TheExceptionFlags ) { return 0; }
--#else
--extern int feenableexcept (int excepts);
--extern int fedisableexcept (int TheExceptionFlags );
--#endif
- 
- /* ----------------------------------------------------------------------
-  *
diff --git a/games/freedroidrpg/files/patch-DialogEditor.c b/games/freedroidrpg/files/patch-DialogEditor.c
deleted file mode 100644
index d65cba9c7251..000000000000
--- a/games/freedroidrpg/files/patch-DialogEditor.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/DialogEditor.c.orig	Mon Jul 18 02:45:24 2005
-+++ src/DialogEditor.c		Mon Jul 18 02:46:23 2005
-@@ -32,6 +32,8 @@
- #define NATIVE_WIN32
- #endif
- 
-+#include <getopt.h>
-+
- #include <gtk/gtk.h>
- #include <gdk/gdk.h>
- #include <gdk/gdkkeysyms.h>
diff --git a/games/freedroidrpg/files/patch-configure b/games/freedroidrpg/files/patch-configure
new file mode 100644
index 000000000000..001217837078
--- /dev/null
+++ b/games/freedroidrpg/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Thu Aug  4 11:00:41 2005
++++ configure	Fri Aug 26 18:33:02 2005
+@@ -4978,6 +4978,8 @@
+ 	;;
+ 
+ 	*bsd*)
++	CFLAGS="$CFLAGS  -DFD_DATADIR='\"\$(pkgdatadir)\"'"   #avoid expansion of $pkgdatadir !
++	SYS_GL_LIB=GL
+ 	bsd=true
+ 	;;
+ 
diff --git a/games/freedroidrpg/files/patch-misc.c b/games/freedroidrpg/files/patch-misc.c
deleted file mode 100644
index 32f39127cba4..000000000000
--- a/games/freedroidrpg/files/patch-misc.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/misc.c.orig	Mon Jul 18 02:13:52 2005
-+++ src/misc.c		Mon Jul 18 02:19:36 2005
-@@ -294,7 +294,7 @@
-     // including the operating system (or rather libc) call to main() in 
-     // the beginning of execution.
-     //
--    backtrace_size = backtrace ( backtrace_array , MAX_CALLS_IN_BACKTRACE );
-+    // backtrace_size = backtrace ( backtrace_array , MAX_CALLS_IN_BACKTRACE );
- 
-     fprintf ( stderr , "print_trace:  Obtained %zd stack frames.\n", backtrace_size );
-     
-@@ -307,7 +307,7 @@
-     //       Also there might be a problem with non-ELF binaries, but let's
-     //       hope that it still works...
-     //
--    backtrace_strings = backtrace_symbols ( backtrace_array , backtrace_size );
-+    // backtrace_strings = backtrace_symbols ( backtrace_array , backtrace_size );
-     
-     fprintf ( stderr , "print_trace:  Obtaining symbols now done.\n" );
-     
diff --git a/games/freedroidrpg/pkg-plist b/games/freedroidrpg/pkg-plist
index 5eae9069f1ab..b1cb744eb330 100644
--- a/games/freedroidrpg/pkg-plist
+++ b/games/freedroidrpg/pkg-plist
@@ -1,8 +1,8 @@
-bin/DialogEditor
-bin/ItemEditor
-bin/croppy
+%%EDITORS%%bin/DialogEditor
+%%EDITORS%%bin/ItemEditor
+%%EDITORS%%bin/croppy
 bin/freedroidRPG
-bin/pngtoico
+%%EDITORS%%bin/pngtoico
 %%DATADIR%%/dialogs/614.dialog
 %%DATADIR%%/dialogs/Bender.dialog
 %%DATADIR%%/dialogs/Benjamin.dialog
@@ -1088,6 +1088,7 @@ bin/pngtoico
 %%DATADIR%%/graphics/droids/493/portrait_0031.jpg
 %%DATADIR%%/graphics/droids/493/portrait_0032.jpg
 %%DATADIR%%/graphics/droids/516.png
+%%DATADIR%%/graphics/droids/516/516.tux_image_archive
 %%DATADIR%%/graphics/droids/516/ingame_0001.offset
 %%DATADIR%%/graphics/droids/516/ingame_0001.png
 %%DATADIR%%/graphics/droids/516/ingame_0002.offset
@@ -2038,6 +2039,22 @@ bin/pngtoico
 %%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0014.jpg
 %%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0015.jpg
 %%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0016.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0017.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0018.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0019.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0020.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0021.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0022.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0023.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0024.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0025.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0026.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0027.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0028.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0029.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0030.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0031.jpg
+%%DATADIR%%/graphics/items/ammo_plasma_bullet/portrait_0032.jpg
 %%DATADIR%%/graphics/items/antigrav_unit/ingame.offset
 %%DATADIR%%/graphics/items/antigrav_unit/ingame.png
 %%DATADIR%%/graphics/items/antigrav_unit/inv_image.png
@@ -2498,6 +2515,22 @@ bin/pngtoico
 %%DATADIR%%/graphics/items/desk_lamp/portrait_0014.jpg
 %%DATADIR%%/graphics/items/desk_lamp/portrait_0015.jpg
 %%DATADIR%%/graphics/items/desk_lamp/portrait_0016.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0017.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0018.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0019.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0020.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0021.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0022.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0023.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0024.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0025.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0026.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0027.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0028.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0029.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0030.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0031.jpg
+%%DATADIR%%/graphics/items/desk_lamp/portrait_0032.jpg
 %%DATADIR%%/graphics/items/dixons_toolbox/ingame.offset
 %%DATADIR%%/graphics/items/dixons_toolbox/ingame.png
 %%DATADIR%%/graphics/items/dixons_toolbox/inv_image.png
@@ -5446,6 +5479,8 @@ bin/pngtoico
 %%DATADIR%%/sound/speeches/Tux_STO_Some_Of_My_0.ogg
 %%DATADIR%%/sound/speeches/Tux_See_You_Later_0.ogg
 %%DATADIR%%/sound/speeches/Tux_Why_Did_I_0.ogg
+@dirrm share/nls/en_US.US-ASCII
+@dirrm share/nls/POSIX
 @dirrm %%DATADIR%%/sound/speeches/Spencer
 @dirrm %%DATADIR%%/sound/speeches/OldTown614Guard
 @dirrm %%DATADIR%%/sound/speeches/Michelangelo
@@ -5466,6 +5501,7 @@ bin/pngtoico
 @dirrm %%DATADIR%%/sound/effects
 @dirrm %%DATADIR%%/sound
 @dirrm %%DATADIR%%/map
+@dirrm %%DATADIR%%/graphics/wm_icon
 @dirrm %%DATADIR%%/graphics/tux_motion_parts/sword_motion/shield_items
 @dirrm %%DATADIR%%/graphics/tux_motion_parts/sword_motion
 @dirrm %%DATADIR%%/graphics/tux_motion_parts/gun_motion/shield_items
@@ -5473,9 +5509,18 @@ bin/pngtoico
 @dirrm %%DATADIR%%/graphics/tux_motion_parts
 @dirrm %%DATADIR%%/graphics/tux_flags
 @dirrm %%DATADIR%%/graphics/skill_icons
+@dirrm %%DATADIR%%/graphics/rotation_models/portraits
+@dirrm %%DATADIR%%/graphics/rotation_models/items/item_blender_sources
+@dirrm %%DATADIR%%/graphics/rotation_models/items
+@dirrm %%DATADIR%%/graphics/rotation_models
+@dirrm %%DATADIR%%/graphics/portraits
+@dirrm %%DATADIR%%/graphics/para90_theme
 @dirrm %%DATADIR%%/graphics/obstacles
 @dirrm %%DATADIR%%/graphics/mouse_buttons
+@dirrm %%DATADIR%%/graphics/map_inserts/BlenderSources
+@dirrm %%DATADIR%%/graphics/map_inserts
 @dirrm %%DATADIR%%/graphics/light_radius_chunks
+@dirrm %%DATADIR%%/graphics/lanzz_theme/single_map_tiles
 @dirrm %%DATADIR%%/graphics/lanzz_theme
 @dirrm %%DATADIR%%/graphics/items/wheel_drive
 @dirrm %%DATADIR%%/graphics/items/warrior_wristband
@@ -5501,6 +5546,9 @@ bin/pngtoico
 @dirrm %%DATADIR%%/graphics/items/monkey_wrench
 @dirrm %%DATADIR%%/graphics/items/map_maker
 @dirrm %%DATADIR%%/graphics/items/mace
+@dirrm %%DATADIR%%/graphics/items/light_sabre_yellow
+@dirrm %%DATADIR%%/graphics/items/light_sabre_red
+@dirrm %%DATADIR%%/graphics/items/light_sabre_green
 @dirrm %%DATADIR%%/graphics/items/laser_sword_yellow
 @dirrm %%DATADIR%%/graphics/items/laser_sword_red
 @dirrm %%DATADIR%%/graphics/items/laser_sword_green
@@ -5542,6 +5590,7 @@ bin/pngtoico
 @dirrm %%DATADIR%%/graphics/items
 @dirrm %%DATADIR%%/graphics/font
 @dirrm %%DATADIR%%/graphics/floor_tiles
+@dirrm %%DATADIR%%/graphics/floor
 @dirrm %%DATADIR%%/graphics/droids/red_guard
 @dirrm %%DATADIR%%/graphics/droids/professor
 @dirrm %%DATADIR%%/graphics/droids/kevin
@@ -5577,7 +5626,10 @@ bin/pngtoico
 @dirrm %%DATADIR%%/graphics/droids/247
 @dirrm %%DATADIR%%/graphics/droids/139
 @dirrm %%DATADIR%%/graphics/droids/123
+@dirrm %%DATADIR%%/graphics/droids/001
 @dirrm %%DATADIR%%/graphics/droids
+@dirrm %%DATADIR%%/graphics/default_theme
+@dirrm %%DATADIR%%/graphics/classic_theme
 @dirrm %%DATADIR%%/graphics/bullets
 @dirrm %%DATADIR%%/graphics/blender_sources
 @dirrm %%DATADIR%%/graphics/blasts