- Support staging

- Use new LIB_DEPENDS syntax

2 files changed, 5 insertions, 138 deletions

diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index b853d7a27649..1d385b297c31 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/game${PORTNAME}/game${PORTNAME}/${PORTNAME}-0.4.0
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Arcade-style game with elements of economy and adventure
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		guichan:${PORTSDIR}/devel/guichan
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
+		libguichan.so:${PORTSDIR}/devel/guichan
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -27,7 +27,9 @@ LDFLAGS+=	`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
 
 DATADIR=	${PREFIX}/share/gamediameter
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/${PORTNAME}
+PORTDATA=	*
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|; /^CFLAGS=.*march/ d; \
 		/PKG_CONFIG/ s|libpng|libpng15|' ${WRKSRC}/configure
diff --git a/games/diameter/pkg-plist b/games/diameter/pkg-plist
deleted file mode 100644
index 1db50a367ba2..000000000000
--- a/games/diameter/pkg-plist
+++ /dev/null
@@ -1,135 +0,0 @@
-bin/diameter
-%%DATADIR%%/fonts/font-blue-test.png
-%%DATADIR%%/fonts/font-gold-test.png
-%%DATADIR%%/fonts/rpgfont_thinner_noshadow.png
-%%DATADIR%%/models/Rockets/r01_88.3DS
-%%DATADIR%%/models/Rockets/r02_88.3DS
-%%DATADIR%%/models/Ships/1_406.3DS
-%%DATADIR%%/models/Ships/ship2/2_628.3DS
-%%DATADIR%%/models/Ships/ship3/3_436.3DS
-%%DATADIR%%/models/Ships/ship4/4_724.3DS
-%%DATADIR%%/models/models.xml
-%%DATADIR%%/music/AmbDune.ogg
-%%DATADIR%%/music/sample/explode_06.wav
-%%DATADIR%%/music/sample/explode_07.wav
-%%DATADIR%%/music/sample/s1.wav
-%%DATADIR%%/pyscripts/arena.py
-%%DATADIR%%/pyscripts/test_mission1.py
-%%DATADIR%%/pyscripts/test_mission1d1_next.py
-%%DATADIR%%/pyscripts/test_mission1d1_ok.py
-%%DATADIR%%/pyscripts/test_mission1d2_ok.py
-%%DATADIR%%/pyscripts/test_mission1d4_ok.py
-%%DATADIR%%/pyscripts/test_mission1state1.py
-%%DATADIR%%/pyscripts/test_mission1state2.py
-%%DATADIR%%/pyscripts/test_mission1state3.py
-%%DATADIR%%/pyscripts/test_mission1state4.py
-%%DATADIR%%/sprites/sprites.xml
-%%DATADIR%%/texture/Argon.jpg
-%%DATADIR%%/texture/Brat.jpg
-%%DATADIR%%/texture/Cloud1.png
-%%DATADIR%%/texture/Cloud2.png
-%%DATADIR%%/texture/Cloud3.png
-%%DATADIR%%/texture/Cloud4.jpg
-%%DATADIR%%/texture/Liser1.jpg
-%%DATADIR%%/texture/Rockets/R01.jpg
-%%DATADIR%%/texture/Rockets/R01s.jpg
-%%DATADIR%%/texture/Rockets/R02.jpg
-%%DATADIR%%/texture/Rockets/R02s.jpg
-%%DATADIR%%/texture/back.png
-%%DATADIR%%/texture/blue_sphere.jpg
-%%DATADIR%%/texture/blue_sphere.png
-%%DATADIR%%/texture/flame.jpg
-%%DATADIR%%/texture/flame2.jpg
-%%DATADIR%%/texture/gui/curs/center.png
-%%DATADIR%%/texture/gui/curs/center2.png
-%%DATADIR%%/texture/gui/curs/ring-damage.png
-%%DATADIR%%/texture/gui/curs/ring-in.png
-%%DATADIR%%/texture/gui/curs/ring.png
-%%DATADIR%%/texture/gui/curs/weapons/laser.png
-%%DATADIR%%/texture/gui/curs/weapons/plasma.png
-%%DATADIR%%/texture/gui/curs/weapons/rocket.png
-%%DATADIR%%/texture/gui/diameter.png
-%%DATADIR%%/texture/gui/eng/main/credits-.png
-%%DATADIR%%/texture/gui/eng/main/credits.png
-%%DATADIR%%/texture/gui/eng/main/logo-.png
-%%DATADIR%%/texture/gui/eng/main/logo.png
-%%DATADIR%%/texture/gui/eng/main/new-.png
-%%DATADIR%%/texture/gui/eng/main/new.png
-%%DATADIR%%/texture/gui/eng/main/options-.png
-%%DATADIR%%/texture/gui/eng/main/options.png
-%%DATADIR%%/texture/gui/eng/main/quit-.png
-%%DATADIR%%/texture/gui/eng/main/quit.png
-%%DATADIR%%/texture/gui/eng/main/resume-.png
-%%DATADIR%%/texture/gui/eng/main/resume.png
-%%DATADIR%%/texture/gui/eng/main/return-.png
-%%DATADIR%%/texture/gui/eng/main/return.png
-%%DATADIR%%/texture/gui/eng/main/start-.png
-%%DATADIR%%/texture/gui/eng/main/start.png
-%%DATADIR%%/texture/gui/logo.png
-%%DATADIR%%/texture/gui/other/back.png
-%%DATADIR%%/texture/gui/other/back_b.png
-%%DATADIR%%/texture/gui/other/button_ok.png
-%%DATADIR%%/texture/gui/other/button_ok_b.png
-%%DATADIR%%/texture/gui/other/forward.png
-%%DATADIR%%/texture/gui/other/forward_b.png
-%%DATADIR%%/texture/gui/other/lucas.png
-%%DATADIR%%/texture/gui/other/magnaguard.png
-%%DATADIR%%/texture/gui/other/noface.png
-%%DATADIR%%/texture/gui/rus/main/credits-.png
-%%DATADIR%%/texture/gui/rus/main/credits.png
-%%DATADIR%%/texture/gui/rus/main/logo-.png
-%%DATADIR%%/texture/gui/rus/main/logo.png
-%%DATADIR%%/texture/gui/rus/main/new-.png
-%%DATADIR%%/texture/gui/rus/main/new.png
-%%DATADIR%%/texture/gui/rus/main/options-.png
-%%DATADIR%%/texture/gui/rus/main/options.png
-%%DATADIR%%/texture/gui/rus/main/quit-.png
-%%DATADIR%%/texture/gui/rus/main/quit.png
-%%DATADIR%%/texture/gui/rus/main/resume-.png
-%%DATADIR%%/texture/gui/rus/main/resume.png
-%%DATADIR%%/texture/gui/rus/main/return-.png
-%%DATADIR%%/texture/gui/rus/main/return.png
-%%DATADIR%%/texture/gui/rus/main/start-.png
-%%DATADIR%%/texture/gui/rus/main/start.png
-%%DATADIR%%/texture/lav1.jpg
-%%DATADIR%%/texture/nebular3.gif
-%%DATADIR%%/texture/nebular3.jpg
-%%DATADIR%%/texture/null.jpg
-%%DATADIR%%/texture/p1.png
-%%DATADIR%%/texture/s_n1.jpg
-%%DATADIR%%/texture/ship1/S1.jpg
-%%DATADIR%%/texture/ship2/S2.jpg
-%%DATADIR%%/texture/ship3/S3.jpg
-%%DATADIR%%/texture/ship4/S4.jpg
-%%DATADIR%%/texture/spaceshiptexture.jpg
-%%DATADIR%%/texture/test.png
-%%DATADIR%%/texture/textures.xml
-%%DATADIR%%/world/arena.xml
-%%DATADIR%%/world/test_mission1.xml
-@dirrm %%DATADIR%%/world
-@dirrm %%DATADIR%%/texture/ship4
-@dirrm %%DATADIR%%/texture/ship3
-@dirrm %%DATADIR%%/texture/ship2
-@dirrm %%DATADIR%%/texture/ship1
-@dirrm %%DATADIR%%/texture/gui/rus/main
-@dirrm %%DATADIR%%/texture/gui/rus
-@dirrm %%DATADIR%%/texture/gui/other
-@dirrm %%DATADIR%%/texture/gui/eng/main
-@dirrm %%DATADIR%%/texture/gui/eng
-@dirrm %%DATADIR%%/texture/gui/curs/weapons
-@dirrm %%DATADIR%%/texture/gui/curs
-@dirrm %%DATADIR%%/texture/gui
-@dirrm %%DATADIR%%/texture/Rockets
-@dirrm %%DATADIR%%/texture
-@dirrm %%DATADIR%%/sprites
-@dirrm %%DATADIR%%/pyscripts
-@dirrm %%DATADIR%%/music/sample
-@dirrm %%DATADIR%%/music
-@dirrm %%DATADIR%%/models/Ships/ship4
-@dirrm %%DATADIR%%/models/Ships/ship3
-@dirrm %%DATADIR%%/models/Ships/ship2
-@dirrm %%DATADIR%%/models/Ships
-@dirrm %%DATADIR%%/models/Rockets
-@dirrm %%DATADIR%%/models
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%