2 files changed, 125 insertions, 138 deletions

diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index 38de38fb2edf..10a459924e6a 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -12,29 +12,32 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freedroid
 
-MAINTAINER=	benlutz@datacomm.ch
+MAINTAINER=	alejandro@varnet.biz
 COMMENT=	Freedroid is a clone of the classic game "Paradroid"
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png:${PORTSDIR}/graphics/png \
-		vorbis.3:${PORTSDIR}/audio/libvorbis
-
 USE_XLIB=	yes
 USE_SDL=	mixer image sdl
 USE_REINPLACE=	yes
+
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" \
-		CPPFLAGS="${CFLAGS} -I${X11BASE}/include"
 CONFIGURE_ARGS=	--program-transform-name=
 
 MAN6=		freedroid.6
 
+post-extract:
+.for d in graphics map sound
+	@${FIND} ${WRKSRC}/${d} -type f -name "Makefile*" -print0 | \
+		${XARGS} -0 ${RM}
+.endfor
+
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${REINPLACE_CMD} -e 's#sdl-config#sdl11-config#; s#-lSDL # #;' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's#mac-osx ##;' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e 's#\#include \"mac-osx/getopt\.h\"##;' ${WRKSRC}/src/system.h
+	@${REINPLACE_CMD} -e 's#-lSDL # #;' \
+				${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's#$$(man_MANS) mac-osx ##;' \
+				${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's#\#include \"mac-osx/getopt\.h\"##;' \
+				${WRKSRC}/src/system.h
 
 .include <bsd.port.post.mk>
diff --git a/games/freedroid/pkg-plist b/games/freedroid/pkg-plist
index b515c1f4d2b6..82a96618ac72 100644
--- a/games/freedroid/pkg-plist
+++ b/games/freedroid/pkg-plist
@@ -1,128 +1,112 @@
 bin/freedroid
-share/freedroid/freedroid.6
-share/freedroid/graphics/001.jpg
-share/freedroid/graphics/001.png
-share/freedroid/graphics/123.jpg
-share/freedroid/graphics/139.jpg
-share/freedroid/graphics/247.jpg
-share/freedroid/graphics/249.jpg
-share/freedroid/graphics/296.jpg
-share/freedroid/graphics/302.jpg
-share/freedroid/graphics/329.jpg
-share/freedroid/graphics/420.jpg
-share/freedroid/graphics/476.jpg
-share/freedroid/graphics/493.jpg
-share/freedroid/graphics/516.jpg
-share/freedroid/graphics/571.jpg
-share/freedroid/graphics/598.jpg
-share/freedroid/graphics/614.jpg
-share/freedroid/graphics/615.jpg
-share/freedroid/graphics/629.jpg
-share/freedroid/graphics/711.jpg
-share/freedroid/graphics/742.jpg
-share/freedroid/graphics/751.jpg
-share/freedroid/graphics/821.jpg
-share/freedroid/graphics/834.jpg
-share/freedroid/graphics/883.jpg
-share/freedroid/graphics/999.jpg
-share/freedroid/graphics/999.png
-share/freedroid/graphics/Ashes.png
-share/freedroid/graphics/Makefile
-share/freedroid/graphics/Makefile.am
-share/freedroid/graphics/Makefile.in
-share/freedroid/graphics/arrow_down.png
-share/freedroid/graphics/arrow_left.png
-share/freedroid/graphics/arrow_right.png
-share/freedroid/graphics/arrow_up.png
-share/freedroid/graphics/banner.png
-share/freedroid/graphics/classic_theme/Makefile
-share/freedroid/graphics/classic_theme/Makefile.am
-share/freedroid/graphics/classic_theme/Makefile.in
-share/freedroid/graphics/classic_theme/blast.png
-share/freedroid/graphics/classic_theme/bullet.png
-share/freedroid/graphics/classic_theme/config.theme
-share/freedroid/graphics/classic_theme/digits.png
-share/freedroid/graphics/classic_theme/droids.png
-share/freedroid/graphics/classic_theme/map_blocks.png
-share/freedroid/graphics/classic_theme/ship_off.png
-share/freedroid/graphics/classic_theme/ship_on.png
-share/freedroid/graphics/classic_theme/to_elem.png
-share/freedroid/graphics/console_bg1.jpg
-share/freedroid/graphics/console_bg2.jpg
-share/freedroid/graphics/console_fg.png
-share/freedroid/graphics/credits.jpg
-share/freedroid/graphics/font05.png
-share/freedroid/graphics/lanzz_theme/Makefile
-share/freedroid/graphics/lanzz_theme/Makefile.am
-share/freedroid/graphics/lanzz_theme/Makefile.in
-share/freedroid/graphics/lanzz_theme/blast.png
-share/freedroid/graphics/lanzz_theme/bullet.png
-share/freedroid/graphics/lanzz_theme/config.theme
-share/freedroid/graphics/lanzz_theme/digits.png
-share/freedroid/graphics/lanzz_theme/droids.png
-share/freedroid/graphics/lanzz_theme/map_blocks.png
-share/freedroid/graphics/lanzz_theme/ship_off.png
-share/freedroid/graphics/lanzz_theme/ship_on.png
-share/freedroid/graphics/lanzz_theme/to_elem.png
-share/freedroid/graphics/old_parafont.png
-share/freedroid/graphics/parafont.png
-share/freedroid/graphics/paraicon.bmp
-share/freedroid/graphics/paraicon.ico
-share/freedroid/graphics/takeover_bg.jpg
-share/freedroid/graphics/title.jpg
-share/freedroid/graphics/transfer.jpg
-share/freedroid/map/Makefile
-share/freedroid/map/Makefile.am
-share/freedroid/map/Makefile.in
-share/freedroid/map/Paradroid.droids
-share/freedroid/map/Paradroid.elevators
-share/freedroid/map/Paradroid.maps
-share/freedroid/map/Paradroid.mission
-share/freedroid/map/freedroid.ruleset
-share/freedroid/sound/Alert.wav
-share/freedroid/sound/AnarchyMenu1.mod
-share/freedroid/sound/Blast_Sound_0.wav
-share/freedroid/sound/Collision_Sound_0.wav
-share/freedroid/sound/Countdown_Sound.wav
-share/freedroid/sound/Cry_Sound_0.wav
-share/freedroid/sound/EndCountdown_Sound.wav
-share/freedroid/sound/EnterElevator_Sound_0.wav
-share/freedroid/sound/Fire_Bullet_Exterminator_Sound_0.wav
-share/freedroid/sound/Fire_Bullet_Flash_Sound_0.wav
-share/freedroid/sound/Fire_Bullet_Laser_Rifle_Sound.wav
-share/freedroid/sound/Fire_Bullet_Military_Sound_0.wav
-share/freedroid/sound/Fire_Bullet_Pulse_Sound_0.wav
-share/freedroid/sound/Fire_Bullet_Single_Pulse_Sound_0.wav
-share/freedroid/sound/GotIntoBlast_Sound_0.wav
-share/freedroid/sound/Got_Hit_Sound_0.wav
-share/freedroid/sound/InfluExplosion.wav
-share/freedroid/sound/LeaveElevator_Sound_0.wav
-share/freedroid/sound/Makefile
-share/freedroid/sound/Makefile.am
-share/freedroid/sound/Makefile.in
-share/freedroid/sound/Menu_Item_Selected_Sound_0.wav
-share/freedroid/sound/MoveElevator_Sound_0.wav
-share/freedroid/sound/Move_Menu_Position_Sound_0.wav
-share/freedroid/sound/Paradroid.ogg
-share/freedroid/sound/Refresh_Sound_0.wav
-share/freedroid/sound/TakeoverSetCapsule_Sound_0.wav
-share/freedroid/sound/Takeover_Game_Deadlock_Sound_0.wav
-share/freedroid/sound/Takeover_Game_Lost_Sound_0.wav
-share/freedroid/sound/Takeover_Game_Start_Sound_0.wav
-share/freedroid/sound/Takeover_Game_Won_Sound_0.wav
-share/freedroid/sound/Takeover_Sound_0.wav
-share/freedroid/sound/The_Last_V8.mod
-share/freedroid/sound/ThouArtDefeated_Sound_0.wav
-share/freedroid/sound/WhiteNoise.wav
-share/freedroid/sound/android-commando_hiscore.mod
-share/freedroid/sound/dreamfish-green_beret.mod
-share/freedroid/sound/dreamfish-sanxion.mod
-share/freedroid/sound/dreamfish-uridium2_loader.mod
-share/freedroid/sound/kollaps-tron.mod
-share/freedroid/sound/starpaws.mod
-@dirrm share/freedroid/sound
-@dirrm share/freedroid/map
-@dirrm share/freedroid/graphics/lanzz_theme
-@dirrm share/freedroid/graphics/classic_theme
-@dirrm share/freedroid/graphics
-@dirrm share/freedroid
+%%DATADIR%%/graphics/001.jpg
+%%DATADIR%%/graphics/001.png
+%%DATADIR%%/graphics/123.jpg
+%%DATADIR%%/graphics/139.jpg
+%%DATADIR%%/graphics/247.jpg
+%%DATADIR%%/graphics/249.jpg
+%%DATADIR%%/graphics/296.jpg
+%%DATADIR%%/graphics/302.jpg
+%%DATADIR%%/graphics/329.jpg
+%%DATADIR%%/graphics/420.jpg
+%%DATADIR%%/graphics/476.jpg
+%%DATADIR%%/graphics/493.jpg
+%%DATADIR%%/graphics/516.jpg
+%%DATADIR%%/graphics/571.jpg
+%%DATADIR%%/graphics/598.jpg
+%%DATADIR%%/graphics/614.jpg
+%%DATADIR%%/graphics/615.jpg
+%%DATADIR%%/graphics/629.jpg
+%%DATADIR%%/graphics/711.jpg
+%%DATADIR%%/graphics/742.jpg
+%%DATADIR%%/graphics/751.jpg
+%%DATADIR%%/graphics/821.jpg
+%%DATADIR%%/graphics/834.jpg
+%%DATADIR%%/graphics/883.jpg
+%%DATADIR%%/graphics/999.jpg
+%%DATADIR%%/graphics/999.png
+%%DATADIR%%/graphics/Ashes.png
+%%DATADIR%%/graphics/arrow_down.png
+%%DATADIR%%/graphics/arrow_left.png
+%%DATADIR%%/graphics/arrow_right.png
+%%DATADIR%%/graphics/arrow_up.png
+%%DATADIR%%/graphics/banner.png
+%%DATADIR%%/graphics/classic_theme/blast.png
+%%DATADIR%%/graphics/classic_theme/bullet.png
+%%DATADIR%%/graphics/classic_theme/config.theme
+%%DATADIR%%/graphics/classic_theme/digits.png
+%%DATADIR%%/graphics/classic_theme/droids.png
+%%DATADIR%%/graphics/classic_theme/map_blocks.png
+%%DATADIR%%/graphics/classic_theme/ship_off.png
+%%DATADIR%%/graphics/classic_theme/ship_on.png
+%%DATADIR%%/graphics/classic_theme/to_elem.png
+%%DATADIR%%/graphics/console_bg1.jpg
+%%DATADIR%%/graphics/console_bg2.jpg
+%%DATADIR%%/graphics/console_fg.png
+%%DATADIR%%/graphics/credits.jpg
+%%DATADIR%%/graphics/font05.png
+%%DATADIR%%/graphics/lanzz_theme/blast.png
+%%DATADIR%%/graphics/lanzz_theme/bullet.png
+%%DATADIR%%/graphics/lanzz_theme/config.theme
+%%DATADIR%%/graphics/lanzz_theme/digits.png
+%%DATADIR%%/graphics/lanzz_theme/droids.png
+%%DATADIR%%/graphics/lanzz_theme/map_blocks.png
+%%DATADIR%%/graphics/lanzz_theme/ship_off.png
+%%DATADIR%%/graphics/lanzz_theme/ship_on.png
+%%DATADIR%%/graphics/lanzz_theme/to_elem.png
+%%DATADIR%%/graphics/old_parafont.png
+%%DATADIR%%/graphics/parafont.png
+%%DATADIR%%/graphics/paraicon.bmp
+%%DATADIR%%/graphics/paraicon.ico
+%%DATADIR%%/graphics/takeover_bg.jpg
+%%DATADIR%%/graphics/title.jpg
+%%DATADIR%%/graphics/transfer.jpg
+%%DATADIR%%/map/Paradroid.droids
+%%DATADIR%%/map/Paradroid.elevators
+%%DATADIR%%/map/Paradroid.maps
+%%DATADIR%%/map/Paradroid.mission
+%%DATADIR%%/map/freedroid.ruleset
+%%DATADIR%%/sound/Alert.wav
+%%DATADIR%%/sound/AnarchyMenu1.mod
+%%DATADIR%%/sound/Blast_Sound_0.wav
+%%DATADIR%%/sound/Collision_Sound_0.wav
+%%DATADIR%%/sound/Countdown_Sound.wav
+%%DATADIR%%/sound/Cry_Sound_0.wav
+%%DATADIR%%/sound/EndCountdown_Sound.wav
+%%DATADIR%%/sound/EnterElevator_Sound_0.wav
+%%DATADIR%%/sound/Fire_Bullet_Exterminator_Sound_0.wav
+%%DATADIR%%/sound/Fire_Bullet_Flash_Sound_0.wav
+%%DATADIR%%/sound/Fire_Bullet_Laser_Rifle_Sound.wav
+%%DATADIR%%/sound/Fire_Bullet_Military_Sound_0.wav
+%%DATADIR%%/sound/Fire_Bullet_Pulse_Sound_0.wav
+%%DATADIR%%/sound/Fire_Bullet_Single_Pulse_Sound_0.wav
+%%DATADIR%%/sound/GotIntoBlast_Sound_0.wav
+%%DATADIR%%/sound/Got_Hit_Sound_0.wav
+%%DATADIR%%/sound/InfluExplosion.wav
+%%DATADIR%%/sound/LeaveElevator_Sound_0.wav
+%%DATADIR%%/sound/Menu_Item_Selected_Sound_0.wav
+%%DATADIR%%/sound/MoveElevator_Sound_0.wav
+%%DATADIR%%/sound/Move_Menu_Position_Sound_0.wav
+%%DATADIR%%/sound/Paradroid.ogg
+%%DATADIR%%/sound/Refresh_Sound_0.wav
+%%DATADIR%%/sound/TakeoverSetCapsule_Sound_0.wav
+%%DATADIR%%/sound/Takeover_Game_Deadlock_Sound_0.wav
+%%DATADIR%%/sound/Takeover_Game_Lost_Sound_0.wav
+%%DATADIR%%/sound/Takeover_Game_Start_Sound_0.wav
+%%DATADIR%%/sound/Takeover_Game_Won_Sound_0.wav
+%%DATADIR%%/sound/Takeover_Sound_0.wav
+%%DATADIR%%/sound/The_Last_V8.mod
+%%DATADIR%%/sound/ThouArtDefeated_Sound_0.wav
+%%DATADIR%%/sound/WhiteNoise.wav
+%%DATADIR%%/sound/android-commando_hiscore.mod
+%%DATADIR%%/sound/dreamfish-green_beret.mod
+%%DATADIR%%/sound/dreamfish-sanxion.mod
+%%DATADIR%%/sound/dreamfish-uridium2_loader.mod
+%%DATADIR%%/sound/kollaps-tron.mod
+%%DATADIR%%/sound/starpaws.mod
+@dirrm %%DATADIR%%/sound
+@dirrm %%DATADIR%%/map
+@dirrm %%DATADIR%%/graphics/lanzz_theme
+@dirrm %%DATADIR%%/graphics/classic_theme
+@dirrm %%DATADIR%%/graphics
+@dirrm %%DATADIR%%