2 files changed, 10 insertions, 184 deletions

diff --git a/games/blackshadeselite/Makefile b/games/blackshadeselite/Makefile
index d92e407a1b8f..8cddcffa3a3b 100644
--- a/games/blackshadeselite/Makefile
+++ b/games/blackshadeselite/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	http://download.gna.org/blackshadeselite/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Psychic Bodyguard FPS - protect the VIP
 
-LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_SDL=	sdl
 USE_GL=		yes
 USE_OPENAL=	al alut
@@ -23,10 +23,12 @@ MAKE_ARGS=	CC=${CC} CXX=${CXX}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+PLIST_FILES=	bin/blackshades
 PORTDOCS=	Readme Readme.elite
+PORTDATA=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
 
 post-extract:
 	@${FIND} ${WRKSRC}/Data -name '._*' -delete
@@ -35,15 +37,11 @@ post-patch:
 	@${REINPLACE_CMD} -e '/InitGL/ s|.*|chdir("${DATADIR}"); &|' ${WRKSRC}/Source/Main.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/objs/blackshades ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} Data ${DATADIR}/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/objs/blackshades ${STAGEDIR}${PREFIX}/bin/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} Data ${STAGEDIR}${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/games/blackshadeselite/pkg-plist b/games/blackshadeselite/pkg-plist
deleted file mode 100644
index bee558ff2a59..000000000000
--- a/games/blackshadeselite/pkg-plist
+++ /dev/null
@@ -1,172 +0,0 @@
-bin/blackshades
-%%DATADIR%%/Data/Animations/Aikidothrow
-%%DATADIR%%/Data/Animations/Aikidothrown
-%%DATADIR%%/Data/Animations/Assaultrifleaim
-%%DATADIR%%/Data/Animations/Breathe
-%%DATADIR%%/Data/Animations/Chestshot
-%%DATADIR%%/Data/Animations/Crouch
-%%DATADIR%%/Data/Animations/Dive
-%%DATADIR%%/Data/Animations/Getupfromback
-%%DATADIR%%/Data/Animations/Getupfromfront
-%%DATADIR%%/Data/Animations/Grenadeaim
-%%DATADIR%%/Data/Animations/Grenadethrow
-%%DATADIR%%/Data/Animations/Headshot
-%%DATADIR%%/Data/Animations/Leftarmshot
-%%DATADIR%%/Data/Animations/Leftlegshot
-%%DATADIR%%/Data/Animations/PistolAim
-%%DATADIR%%/Data/Animations/Rifleaim
-%%DATADIR%%/Data/Animations/Rifleaim(old)
-%%DATADIR%%/Data/Animations/Riflehit
-%%DATADIR%%/Data/Animations/Riflehold
-%%DATADIR%%/Data/Animations/Rightarmshot
-%%DATADIR%%/Data/Animations/Rightlegshot
-%%DATADIR%%/Data/Animations/Run
-%%DATADIR%%/Data/Animations/Stomachshot
-%%DATADIR%%/Data/Animations/Walk
-%%DATADIR%%/Data/Animations/ZombieRun
-%%DATADIR%%/Data/Animations/Zombiemunch
-%%DATADIR%%/Data/Animations/Zombiewalk
-%%DATADIR%%/Data/Animations/grenadecharge
-%%DATADIR%%/Data/Highscore
-%%DATADIR%%/Data/Models/Abdomen.solid
-%%DATADIR%%/Data/Models/AssaultRifle.solid
-%%DATADIR%%/Data/Models/Block1.solid
-%%DATADIR%%/Data/Models/Block1collide.solid
-%%DATADIR%%/Data/Models/Block1complete.solid
-%%DATADIR%%/Data/Models/Block2.solid
-%%DATADIR%%/Data/Models/Block2collide.solid
-%%DATADIR%%/Data/Models/Block2complete.solid
-%%DATADIR%%/Data/Models/Block3.solid
-%%DATADIR%%/Data/Models/Block3collide.solid
-%%DATADIR%%/Data/Models/Block3complete.solid
-%%DATADIR%%/Data/Models/Block4.solid
-%%DATADIR%%/Data/Models/Block4collide.solid
-%%DATADIR%%/Data/Models/Block4complete.solid
-%%DATADIR%%/Data/Models/BlockOcclude.solid
-%%DATADIR%%/Data/Models/Blocksimple.solid
-%%DATADIR%%/Data/Models/Chest.solid
-%%DATADIR%%/Data/Models/Foot.solid
-%%DATADIR%%/Data/Models/Glockbase.solid
-%%DATADIR%%/Data/Models/Glockslide.solid
-%%DATADIR%%/Data/Models/Grenadebase.solid
-%%DATADIR%%/Data/Models/Grenadepin.solid
-%%DATADIR%%/Data/Models/Grenadespoon.solid
-%%DATADIR%%/Data/Models/Hand.solid
-%%DATADIR%%/Data/Models/Handgunbase.solid
-%%DATADIR%%/Data/Models/Handgunslide.solid
-%%DATADIR%%/Data/Models/Head.solid
-%%DATADIR%%/Data/Models/Highblock1collide.solid
-%%DATADIR%%/Data/Models/Highblock2collide.solid
-%%DATADIR%%/Data/Models/Highblock3collide.solid
-%%DATADIR%%/Data/Models/Highblock4collide.solid
-%%DATADIR%%/Data/Models/Knife.solid
-%%DATADIR%%/Data/Models/Lower arm.solid
-%%DATADIR%%/Data/Models/Lower leg.solid
-%%DATADIR%%/Data/Models/Lowheightcollide.solid
-%%DATADIR%%/Data/Models/Path.solid
-%%DATADIR%%/Data/Models/Shades.solid
-%%DATADIR%%/Data/Models/Shotgun.solid
-%%DATADIR%%/Data/Models/Upper arm.solid
-%%DATADIR%%/Data/Models/Upper leg.solid
-%%DATADIR%%/Data/Models/lowsimplecollide1.solid
-%%DATADIR%%/Data/Models/lowsimplecollide2.solid
-%%DATADIR%%/Data/Models/lowsimplecollide3.solid
-%%DATADIR%%/Data/Models/lowsimplecollide4.solid
-%%DATADIR%%/Data/Models/sniperrifle.solid
-%%DATADIR%%/Data/Models/streetsubdivided2.solid
-%%DATADIR%%/Data/Skeleton/Basic Figure
-%%DATADIR%%/Data/Sounds/BodyHit.ogg
-%%DATADIR%%/Data/Sounds/DisguiseKill.ogg
-%%DATADIR%%/Data/Sounds/Lose.ogg
-%%DATADIR%%/Data/Sounds/Nearbullet.ogg
-%%DATADIR%%/Data/Sounds/SW.ogg
-%%DATADIR%%/Data/Sounds/SoulIn.ogg
-%%DATADIR%%/Data/Sounds/SoulOut.ogg
-%%DATADIR%%/Data/Sounds/WallHit.ogg
-%%DATADIR%%/Data/Sounds/bodyland.ogg
-%%DATADIR%%/Data/Sounds/bounce.ogg
-%%DATADIR%%/Data/Sounds/bounce2.ogg
-%%DATADIR%%/Data/Sounds/click.ogg
-%%DATADIR%%/Data/Sounds/explosion.ogg
-%%DATADIR%%/Data/Sounds/footstep1.ogg
-%%DATADIR%%/Data/Sounds/footstep2.ogg
-%%DATADIR%%/Data/Sounds/footstep3.ogg
-%%DATADIR%%/Data/Sounds/footstep4.ogg
-%%DATADIR%%/Data/Sounds/footstep5.ogg
-%%DATADIR%%/Data/Sounds/glock.ogg
-%%DATADIR%%/Data/Sounds/handlerelease.ogg
-%%DATADIR%%/Data/Sounds/headland.ogg
-%%DATADIR%%/Data/Sounds/headshot.ogg
-%%DATADIR%%/Data/Sounds/knifeslash.ogg
-%%DATADIR%%/Data/Sounds/knifesong.ogg
-%%DATADIR%%/Data/Sounds/machinegun.ogg
-%%DATADIR%%/Data/Sounds/mainmenusong.ogg
-%%DATADIR%%/Data/Sounds/pinpull.ogg
-%%DATADIR%%/Data/Sounds/pinreplace.ogg
-%%DATADIR%%/Data/Sounds/rain.ogg
-%%DATADIR%%/Data/Sounds/reload.ogg
-%%DATADIR%%/Data/Sounds/riflewhack.ogg
-%%DATADIR%%/Data/Sounds/shootsong.ogg
-%%DATADIR%%/Data/Sounds/shotgun.ogg
-%%DATADIR%%/Data/Sounds/sniperrifle.ogg
-%%DATADIR%%/Data/Sounds/underwater.ogg
-%%DATADIR%%/Data/Sounds/zombiesong.ogg
-%%DATADIR%%/Data/Textures/Blood.png
-%%DATADIR%%/Data/Textures/Blood.png copy
-%%DATADIR%%/Data/Textures/Blood.tga
-%%DATADIR%%/Data/Textures/Blood.tga copy
-%%DATADIR%%/Data/Textures/Blood/Blood1.png
-%%DATADIR%%/Data/Textures/Blood/Blood1.tga
-%%DATADIR%%/Data/Textures/Blood/Blood10.png
-%%DATADIR%%/Data/Textures/Blood/Blood10.tga
-%%DATADIR%%/Data/Textures/Blood/Blood11.png
-%%DATADIR%%/Data/Textures/Blood/Blood11.tga
-%%DATADIR%%/Data/Textures/Blood/Blood2.png
-%%DATADIR%%/Data/Textures/Blood/Blood2.tga
-%%DATADIR%%/Data/Textures/Blood/Blood3.png
-%%DATADIR%%/Data/Textures/Blood/Blood3.tga
-%%DATADIR%%/Data/Textures/Blood/Blood4.png
-%%DATADIR%%/Data/Textures/Blood/Blood4.tga
-%%DATADIR%%/Data/Textures/Blood/Blood5.png
-%%DATADIR%%/Data/Textures/Blood/Blood5.tga
-%%DATADIR%%/Data/Textures/Blood/Blood6.png
-%%DATADIR%%/Data/Textures/Blood/Blood6.tga
-%%DATADIR%%/Data/Textures/Blood/Blood7.png
-%%DATADIR%%/Data/Textures/Blood/Blood7.tga
-%%DATADIR%%/Data/Textures/Blood/Blood8.png
-%%DATADIR%%/Data/Textures/Blood/Blood8.tga
-%%DATADIR%%/Data/Textures/Blood/Blood9.png
-%%DATADIR%%/Data/Textures/Blood/Blood9.tga
-%%DATADIR%%/Data/Textures/BulletHole.png
-%%DATADIR%%/Data/Textures/BulletHole.tga
-%%DATADIR%%/Data/Textures/Crater.png
-%%DATADIR%%/Data/Textures/Crater.tga
-%%DATADIR%%/Data/Textures/Deadpersonsprite.png
-%%DATADIR%%/Data/Textures/Deadpersonsprite.tga
-%%DATADIR%%/Data/Textures/Flare.png
-%%DATADIR%%/Data/Textures/Flare.tga
-%%DATADIR%%/Data/Textures/Font.png
-%%DATADIR%%/Data/Textures/Font.tga
-%%DATADIR%%/Data/Textures/HitFlash.png
-%%DATADIR%%/Data/Textures/HitFlash.tga
-%%DATADIR%%/Data/Textures/MuzzleFlash.png
-%%DATADIR%%/Data/Textures/MuzzleFlash.tga
-%%DATADIR%%/Data/Textures/Personsprite.png
-%%DATADIR%%/Data/Textures/Personsprite.tga
-%%DATADIR%%/Data/Textures/Scope.png
-%%DATADIR%%/Data/Textures/Scope.tga
-%%DATADIR%%/Data/Textures/Smoke.png
-%%DATADIR%%/Data/Textures/Smoke.tga
-%%DATADIR%%/Data/Textures/rain.png
-%%DATADIR%%/Data/Textures/rain.tga
-%%DATADIR%%/Data/Textures/snow.png
-%%DATADIR%%/Data/Textures/snow.tga
-%%DATADIR%%/Data/customlevels.txt
-@dirrm %%DATADIR%%/Data/Textures/Blood
-@dirrm %%DATADIR%%/Data/Textures
-@dirrm %%DATADIR%%/Data/Sounds
-@dirrm %%DATADIR%%/Data/Skeleton
-@dirrm %%DATADIR%%/Data/Models
-@dirrm %%DATADIR%%/Data/Animations
-@dirrm %%DATADIR%%/Data
-@dirrm %%DATADIR%%