3 files changed, 72 insertions, 27 deletions

diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile
index 18a1477d676d..12294ccad53b 100644
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freedroidrpg
-PORTVERSION=	0.11.1
+PORTVERSION=	0.12.1
 CATEGORIES=	games
 MASTER_SITES=	SF/freedroid
 
@@ -14,16 +14,17 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Modification of the classical Freedroid engine into an RPG
 
 USE_BZIP2=	yes
-USE_SDL=	mixer image net sdl
+USE_SDL=	sdl image mixer
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=
+MAKE_JOBS_SAFE=	yes
 
 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
+		OPENGL "Enable the OpenGL support (highly recommended!)" on \
+		VORBIS "Enable vorbis support (music)" on
 
 .include <bsd.port.pre.mk>
 
@@ -35,15 +36,6 @@ STRIP=		#
 CONFIGURE_ARGS+=--disable-backtrace
 .endif
 
-.if !defined(WITHOUT_EDITORS)
-USE_GNOME+=	gtk12
-CONFIGURE_ARGS+=--enable-editors
-PLIST_SUB+=	EDITORS=""
-.else
-CONFIGURE_ARGS+=--disable-editors
-PLIST_SUB+=	EDITORS="@comment "
-.endif
-
 .if !defined(WITHOUT_OPENGL)
 USE_GL=		yes
 CONFIGURE_ARGS+=--enable-opengl
@@ -51,4 +43,12 @@ CONFIGURE_ARGS+=--enable-opengl
 CONFIGURE_ARGS+=--disable-opengl
 .endif
 
+.if !defined(WITHOUT_VORBIS)
+LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis \
+		ogg.5:${PORTSDIR}/audio/libogg
+CONFIGURE_ARGS+=--enable-vorbis
+.else
+CONFIGURE_ARGS+=--disable-vorbis
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/games/freedroidrpg/distinfo b/games/freedroidrpg/distinfo
index 83d1a055c17b..12bb1255f4c0 100644
--- a/games/freedroidrpg/distinfo
+++ b/games/freedroidrpg/distinfo
@@ -1,3 +1,3 @@
-MD5 (freedroidrpg-0.11.1.tar.bz2) = f7bb462f5bf51638f6c71722dbdb041f
-SHA256 (freedroidrpg-0.11.1.tar.bz2) = c9c922d4e3eeb972c65fd7f85caf88dca9b04ecacbe904df669ec8fe4d851100
-SIZE (freedroidrpg-0.11.1.tar.bz2) = 127203731
+MD5 (freedroidrpg-0.12.1.tar.bz2) = 77fc8fb5c6080c555d90105da91c671f
+SHA256 (freedroidrpg-0.12.1.tar.bz2) = e06149e3c90fd815b3a7fd677ebf25e550418f935699503a1c461cadcd93a073
+SIZE (freedroidrpg-0.12.1.tar.bz2) = 131651496
diff --git a/games/freedroidrpg/pkg-plist b/games/freedroidrpg/pkg-plist
index afc5e0122450..da5328628337 100644
--- a/games/freedroidrpg/pkg-plist
+++ b/games/freedroidrpg/pkg-plist
@@ -1,8 +1,9 @@
-%%EDITORS%%bin/croppy
+bin/croppy
 bin/freedroidRPG
-%%EDITORS%%bin/gluem
-%%EDITORS%%bin/pngtoico
+bin/gluem
+bin/pngtoico
 %%DATADIR%%/dialogs/614.dialog
+%%DATADIR%%/dialogs/614_cryo.dialog
 %%DATADIR%%/dialogs/Bender.dialog
 %%DATADIR%%/dialogs/Benjamin.dialog
 %%DATADIR%%/dialogs/Bruce.dialog
@@ -12,7 +13,6 @@ bin/freedroidRPG
 %%DATADIR%%/dialogs/Dixon.dialog
 %%DATADIR%%/dialogs/DocMoore.dialog
 %%DATADIR%%/dialogs/Duncan.dialog
-%%DATADIR%%/dialogs/Ernie.dialog
 %%DATADIR%%/dialogs/Ewald.dialog
 %%DATADIR%%/dialogs/FirmwareUpdateServer.dialog
 %%DATADIR%%/dialogs/Francis.dialog
@@ -40,17 +40,14 @@ bin/freedroidRPG
 %%DATADIR%%/dialogs/Tania.dialog
 %%DATADIR%%/dialogs/Template.dialog
 %%DATADIR%%/dialogs/TestDroid.dialog
+%%DATADIR%%/dialogs/TutorialTom.dialog
 %%DATADIR%%/dialogs/Tybalt.dialog
-%%DATADIR%%/dialogs/subdlg_Benjamin.dialog
-%%DATADIR%%/dialogs/subdlg_Benjamin_bribe.dialog
 %%DATADIR%%/dialogs/subdlg_Butch.dialog
 %%DATADIR%%/dialogs/subdlg_Darwin.dialog
 %%DATADIR%%/dialogs/subdlg_Duncan.dialog
 %%DATADIR%%/dialogs/subdlg_Duncan_quest.dialog
-%%DATADIR%%/dialogs/subdlg_Kevin.dialog
 %%DATADIR%%/dialogs/subdlg_Pendragon.dialog
 %%DATADIR%%/dialogs/subdlg_Sorenson.dialog
-%%DATADIR%%/dialogs/subdlg_Stone.dialog
 %%DATADIR%%/dialogs/subdlg_kevin_reward1.dialog
 %%DATADIR%%/graphics/README
 %%DATADIR%%/graphics/backgrounds/LoadGameBanner.png
@@ -648,6 +645,7 @@ bin/freedroidRPG
 %%DATADIR%%/graphics/bullets/iso_bullet_single_14_0001.png
 %%DATADIR%%/graphics/bullets/iso_bullet_single_15_0001.offset
 %%DATADIR%%/graphics/bullets/iso_bullet_single_15_0001.png
+%%DATADIR%%/graphics/compass.png
 %%DATADIR%%/graphics/droids/001.png
 %%DATADIR%%/graphics/droids/123.png
 %%DATADIR%%/graphics/droids/123/123.tux_image_archive.z
@@ -2421,7 +2419,6 @@ bin/freedroidRPG
 %%DATADIR%%/graphics/items/entropy_inverter/portrait_0014.jpg
 %%DATADIR%%/graphics/items/entropy_inverter/portrait_0015.jpg
 %%DATADIR%%/graphics/items/entropy_inverter/portrait_0016.jpg
-%%DATADIR%%/graphics/items/entropy_inverter/portrait_0017.jpg
 %%DATADIR%%/graphics/items/force_capsule/ingame.offset
 %%DATADIR%%/graphics/items/force_capsule/ingame.png
 %%DATADIR%%/graphics/items/force_capsule/inv_image_big.png
@@ -4401,8 +4398,6 @@ bin/freedroidRPG
 %%DATADIR%%/graphics/mouse_cursor_0007.png
 %%DATADIR%%/graphics/mouse_cursor_0008.png
 %%DATADIR%%/graphics/mouse_cursor_0009.png
-%%DATADIR%%/graphics/mouse_cursor_0010.png
-%%DATADIR%%/graphics/mouse_cursor_0011.png
 %%DATADIR%%/graphics/mouse_cursor_corona_0000.png
 %%DATADIR%%/graphics/mouse_cursor_corona_0001.png
 %%DATADIR%%/graphics/mouse_cursor_corona_0002.png
@@ -4423,6 +4418,14 @@ bin/freedroidRPG
 %%DATADIR%%/graphics/obstacles/iso_autogun_0003.png
 %%DATADIR%%/graphics/obstacles/iso_autogun_0004.offset
 %%DATADIR%%/graphics/obstacles/iso_autogun_0004.png
+%%DATADIR%%/graphics/obstacles/iso_autogun_act_0001.offset
+%%DATADIR%%/graphics/obstacles/iso_autogun_act_0001.png
+%%DATADIR%%/graphics/obstacles/iso_autogun_act_0002.offset
+%%DATADIR%%/graphics/obstacles/iso_autogun_act_0002.png
+%%DATADIR%%/graphics/obstacles/iso_autogun_act_0003.offset
+%%DATADIR%%/graphics/obstacles/iso_autogun_act_0003.png
+%%DATADIR%%/graphics/obstacles/iso_autogun_act_0004.offset
+%%DATADIR%%/graphics/obstacles/iso_autogun_act_0004.png
 %%DATADIR%%/graphics/obstacles/iso_autogun_shadow_0001.offset
 %%DATADIR%%/graphics/obstacles/iso_autogun_shadow_0001.png
 %%DATADIR%%/graphics/obstacles/iso_autogun_shadow_0002.offset
@@ -4431,6 +4434,14 @@ bin/freedroidRPG
 %%DATADIR%%/graphics/obstacles/iso_autogun_shadow_0003.png
 %%DATADIR%%/graphics/obstacles/iso_autogun_shadow_0004.offset
 %%DATADIR%%/graphics/obstacles/iso_autogun_shadow_0004.png
+%%DATADIR%%/graphics/obstacles/iso_basin_0001.offset
+%%DATADIR%%/graphics/obstacles/iso_basin_0001.png
+%%DATADIR%%/graphics/obstacles/iso_basin_0002.offset
+%%DATADIR%%/graphics/obstacles/iso_basin_0002.png
+%%DATADIR%%/graphics/obstacles/iso_basin_0003.offset
+%%DATADIR%%/graphics/obstacles/iso_basin_0003.png
+%%DATADIR%%/graphics/obstacles/iso_basin_0004.offset
+%%DATADIR%%/graphics/obstacles/iso_basin_0004.png
 %%DATADIR%%/graphics/obstacles/iso_bathroom_furniture_0000.offset
 %%DATADIR%%/graphics/obstacles/iso_bathroom_furniture_0000.png
 %%DATADIR%%/graphics/obstacles/iso_bathroom_furniture_0001.offset
@@ -4789,6 +4800,12 @@ bin/freedroidRPG
 %%DATADIR%%/graphics/obstacles/iso_crystal_fields_0005.png
 %%DATADIR%%/graphics/obstacles/iso_crystal_fields_0006.offset
 %%DATADIR%%/graphics/obstacles/iso_crystal_fields_0006.png
+%%DATADIR%%/graphics/obstacles/iso_deskchair_0001.offset
+%%DATADIR%%/graphics/obstacles/iso_deskchair_0001.png
+%%DATADIR%%/graphics/obstacles/iso_deskchair_0002.offset
+%%DATADIR%%/graphics/obstacles/iso_deskchair_0002.png
+%%DATADIR%%/graphics/obstacles/iso_deskchair_0003.offset
+%%DATADIR%%/graphics/obstacles/iso_deskchair_0003.png
 %%DATADIR%%/graphics/obstacles/iso_disautogun_0001.offset
 %%DATADIR%%/graphics/obstacles/iso_disautogun_0001.png
 %%DATADIR%%/graphics/obstacles/iso_disautogun_0002.offset
@@ -4845,8 +4862,30 @@ bin/freedroidRPG
 %%DATADIR%%/graphics/obstacles/iso_doors_0023.png
 %%DATADIR%%/graphics/obstacles/iso_doors_0024.offset
 %%DATADIR%%/graphics/obstacles/iso_doors_0024.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0001.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0001.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0002.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0002.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0003.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0003.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0004.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0004.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0005.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0005.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0006.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0006.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0007.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0007.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0008.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0008.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0009.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0009.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0010.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0010.png
 %%DATADIR%%/graphics/obstacles/iso_doubledoors_0011.offset
 %%DATADIR%%/graphics/obstacles/iso_doubledoors_0011.png
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0012.offset
+%%DATADIR%%/graphics/obstacles/iso_doubledoors_0012.png
 %%DATADIR%%/graphics/obstacles/iso_exits_0001.offset
 %%DATADIR%%/graphics/obstacles/iso_exits_0001.png
 %%DATADIR%%/graphics/obstacles/iso_exits_0002.offset
@@ -4855,6 +4894,10 @@ bin/freedroidRPG
 %%DATADIR%%/graphics/obstacles/iso_exits_0003.png
 %%DATADIR%%/graphics/obstacles/iso_exits_0004.offset
 %%DATADIR%%/graphics/obstacles/iso_exits_0004.png
+%%DATADIR%%/graphics/obstacles/iso_exits_0005.offset
+%%DATADIR%%/graphics/obstacles/iso_exits_0005.png
+%%DATADIR%%/graphics/obstacles/iso_exits_0006.offset
+%%DATADIR%%/graphics/obstacles/iso_exits_0006.png
 %%DATADIR%%/graphics/obstacles/iso_fence_0001.offset
 %%DATADIR%%/graphics/obstacles/iso_fence_0001.png
 %%DATADIR%%/graphics/obstacles/iso_fence_0002.offset
@@ -5510,6 +5553,7 @@ bin/freedroidRPG
 %%DATADIR%%/map/freedroid.program_archetypes
 %%DATADIR%%/map/freedroid.quests
 %%DATADIR%%/map/freedroid.ruleset
+%%DATADIR%%/map/script_helpers.lua
 %%DATADIR%%/map/titles/Contribute.title
 %%DATADIR%%/map/titles/Credits.title
 %%DATADIR%%/map/titles/EndOfGame.title
@@ -5710,6 +5754,7 @@ bin/freedroidRPG
 %%DATADIR%%/sound/music/Ambience.ogg
 %%DATADIR%%/sound/music/AmbientBattle.ogg
 %%DATADIR%%/sound/music/Bleostrada.ogg
+%%DATADIR%%/sound/music/HellFortressTwo.ogg
 %%DATADIR%%/sound/music/ImperialArmy.ogg
 %%DATADIR%%/sound/music/Suspicion.ogg
 %%DATADIR%%/sound/music/TechBattle.ogg