- Support staging

- Convert USE_GMAKE to USES
- Use new OPTIONS features

2 files changed, 19 insertions, 158 deletions

diff --git a/games/legesmotus/Makefile b/games/legesmotus/Makefile
index 356cc0c7e20a..30166ca9dc38 100644
--- a/games/legesmotus/Makefile
+++ b/games/legesmotus/Makefile
@@ -14,64 +14,38 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--mandir="${PREFIX}/man" \
 		--datadir="${DATADIR}"
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ENV=	XDIR=${LOCALBASE}
 
+PORTDATA=	*
+
 OPTIONS_MULTI=	COMPONENTS
 OPTIONS_MULTI_COMPONENTS=CLIENT SERVER METASERVER SERVERSCANNER
 OPTIONS_DEFAULT=CLIENT SERVER
+OPTIONS_SUB=	yes
+
 CLIENT_DESC=	Build client
 SERVER_DESC=	Build server
 METASERVER_DESC=Build metaserver
 SERVERSCANNER_DESC=Build server scanner
 
-DESKTOP_ENTRIES="Leges Motus" \
-		"A team-based, networked, 2D shooter set in zero-gravity" \
-		"${DATADIR}/sprites/blue_head32.png" \
-		"legesmotus" \
-		"Game;ActionGame;" \
-		false
+CLIENT_CONFIGURE_OFF=		--disable-client
+SERVER_CONFIGURE_OFF=		--disable-server
+METASERVER_CONFIGURE_ON=	--enable-metaserver
+SERVERSCANNER_CONFIGURE_ON=	--enable-serverscanner
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
-PLIST_SUB+=	CLIENT=""
 USE_SDL=	sdl image ttf mixer
 USE_GL=		gl
-MAN6+=		legesmotus.6
-.else
-PLIST_SUB+=	CLIENT="@comment "
-CONFIGURE_ARGS+=--disable-client
-.endif
-
-.if ${PORT_OPTIONS:MSERVER}
-PLIST_SUB+=	SERVER=""
-MAN6+=		lmserver.6
-.else
-PLIST_SUB+=	SERVER="@comment "
-CONFIGURE_ARGS+=--disable-server
-.endif
 
-.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MMETASERVER}
-PLIST_SUB+=	DATA=""
-.else
-PLIST_SUB+=	DATA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMETASERVER}
-PLIST_SUB+=	METASERVER=""
-CONFIGURE_ARGS+=--enable-metaserver
-.else
-PLIST_SUB+=	METASERVER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSERVERSCANNER}
-PLIST_SUB+=	SERVERSCANNER=""
-CONFIGURE_ARGS+=--enable-serverscanner
-MAN6+=		lmscan.6
-.else
-PLIST_SUB+=	SERVERSCANNER="@comment "
+DESKTOP_ENTRIES="Leges Motus" \
+		"A team-based, networked, 2D shooter set in zero-gravity" \
+		"${DATADIR}/sprites/blue_head32.png" \
+		"legesmotus" \
+		"Game;ActionGame;" \
+		""
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/legesmotus/pkg-plist b/games/legesmotus/pkg-plist
index c53224c8f0b6..1ea02ec59950 100644
--- a/games/legesmotus/pkg-plist
+++ b/games/legesmotus/pkg-plist
@@ -1,124 +1,11 @@
 %%CLIENT%%bin/legesmotus
-%%SERVER%%bin/lmserver
 %%METASERVER%%bin/lmmetaserver
 %%SERVERSCANNER%%bin/lmscan
+%%SERVER%%bin/lmserver
+%%CLIENT%%man/man6/legesmotus.6.gz
+%%SERVERSCANNER%%man/man6/lmscan.6.gz
+%%SERVER%%man/man6/lmserver.6.gz
 %%CLIENT%%share/icons/hicolor/256x256/legesmotus.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/fonts/Jura.gpl3
-%%DATA%%%%CLIENT%%%%DATADIR%%/fonts/Jura.ofl
-%%DATA%%%%CLIENT%%%%DATADIR%%/fonts/JuraDemiBold.ttf
-%%DATA%%%%CLIENT%%%%DATADIR%%/fonts/JuraMedium.ttf
-%%DATA%%%%DATADIR%%/maps/COPYING
-%%DATA%%%%DATADIR%%/maps/alpha1-ai.map
-%%DATA%%%%DATADIR%%/maps/alpha1-death.map
-%%DATA%%%%DATADIR%%/maps/alpha1-test.map
-%%DATA%%%%DATADIR%%/maps/alpha1.map
-%%DATA%%%%DATADIR%%/maps/beta2.map
-%%DATA%%%%DATADIR%%/maps/big.map
-%%DATA%%%%DATADIR%%/maps/force-test.map
-%%DATA%%%%DATADIR%%/maps/gamma3-ai.map
-%%DATA%%%%DATADIR%%/maps/gamma3.map
-%%DATA%%%%DATADIR%%/maps/maze.map
-%%DATA%%%%DATADIR%%/maps/oneobject.map
-%%DATA%%%%DATADIR%%/maps/soundbarrier.map
-%%DATA%%%%DATADIR%%/maps/test.map
-%%DATA%%%%DATADIR%%/maps/vastmelee.map
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/LMGateSiren-old.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/LMGateSiren.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/LMGunshot-alternate.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/LMGunshot.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/button_click.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/buzzerheavy.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/clockchime1.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/defeatsound.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/disenchant.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/dissolve.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/enchant.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/laserhit.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/positive_gate_siren.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sounds/victory_fanfare.ogg
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/COPYING
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_armless.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_backarm.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_backleg.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_frontarm.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_frontleg.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_full.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_gate.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_head.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_head256.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_head32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_head512.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/blue_torso.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/cannon_back.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/cannon_front.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/cannon_front_shot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/circle256.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/crosshairs.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/friction64.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/gun_noshot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/gun_shot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/large_cannon.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/large_gun.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/large_mgun.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/large_rifle.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/large_sgun.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/legesmotuslogo.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_bg.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_bgtile.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_bgtile64.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_bgtile_blue.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_bgtile_friction.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_bgtile_noscrews.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_bgtile_red.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_bgtile_yellow.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_gate_e.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_gate_w.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_hazard64.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_hazard64_blue.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_hazard64_red.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_obstacle128.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_obstacle64.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_e32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_en32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_es32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_n32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_ne32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_nw32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_s32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_se32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_sw32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_w32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_wn32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/metal_wall_ws32.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/mgun_noshot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/mgun_shot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/mini_bg.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/mini_blip_blue.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/mini_blip_red.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/mini_circle.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_armless.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_backarm.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_backleg.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_frontarm.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_frontleg.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_full.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_gate.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_head.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/red_torso.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/rifle_noshot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/rifle_shot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/sgun_noshot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/sgun_shot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/shot.png
-%%DATA%%%%CLIENT%%%%DATADIR%%/sprites/sshot.png
-%%DATA%%%%DATADIR%%/weapons/classic
-%%DATA%%%%DATADIR%%/weapons/standard
-%%DATA%%@dirrm %%DATADIR%%/weapons
-%%DATA%%%%CLIENT%%@dirrm %%DATADIR%%/sprites
-%%DATA%%%%CLIENT%%@dirrm %%DATADIR%%/sounds
-%%DATA%%@dirrm %%DATADIR%%/maps
-%%DATA%%%%CLIENT%%@dirrm %%DATADIR%%/fonts
-%%DATA%%@dirrm %%DATADIR%%
 %%CLIENT%%@dirrmtry share/icons/hicolor/256x256
 %%CLIENT%%@dirrmtry share/icons/hicolor
 %%CLIENT%%@dirrmtry share/icons