- Support staging

- Convert USE_GMAKE to USES
- Suppport new OPTIONS features
- Fix build when both sdl12 and sdl2 installed and add OPTIONS to choose SDL version to use

2 files changed, 22 insertions, 114 deletions

diff --git a/games/instead/Makefile b/games/instead/Makefile
index 603f05830614..fb5367011e1c 100644
--- a/games/instead/Makefile
+++ b/games/instead/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	instead
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/instead/instead/${PORTVERSION}/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -12,27 +13,40 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple Text Adventure, The Interpreter
 
 HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		pkgconfig iconv gmake
 USE_GNOME=	gtk20
 USE_LUA=	5.1
-USE_SDL=	sdl image ttf mixer
-USES=		pkgconfig iconv
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
 CONFIGURE_SCRIPT=	configure.sh
 CONFIGURE_ENV=	PREFIX="${PREFIX}"
 
 WRKSRC=		${WRKDIR}/instead-${PORTVERSION}
-MAN6=		instead.6
 
 PORTDOCS=	*
+PORTDATA=	*
+
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=SDL
+OPTIONS_SINGLE=	SDL_VERSION
+OPTIONS_SINGLE_SDL_VERSION=	SDL SDL2
+
+SDL_VERSION_DESC=SDL version
+SDL_DESC=	Use SDL 1.2
+SDL2_DESC=	Use SDL 2.0
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ! ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MSDL2}
+USE_SDL=	sdl2 image2 ttf2 mixer2
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|sdl-config|&-nonexistent|' ${WRKSRC}/configure.sh
+.else
+USE_SDL=	sdl image ttf mixer
+
 post-patch:
-	@${REINPLACE_CMD} -e '/INSTALL.*DOCPATH/ d' ${WRKSRC}/doc/Makefile
+	@${REINPLACE_CMD} -e 's|sdl2-config|&-nonexistent|' ${WRKSRC}/configure.sh
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/instead/pkg-plist b/games/instead/pkg-plist
index e68e1b79511a..a00fd5a8ad39 100644
--- a/games/instead/pkg-plist
+++ b/games/instead/pkg-plist
@@ -1,113 +1,7 @@
 bin/instead
 bin/sdl-instead
+man/man6/instead.6.gz
 share/applications/instead.desktop
-%%DATADIR%%/games/tutorial3/br.png
-%%DATADIR%%/games/tutorial3/es.png
-%%DATADIR%%/games/tutorial3/gb.png
-%%DATADIR%%/games/tutorial3/instead.ogg
-%%DATADIR%%/games/tutorial3/instead.png
-%%DATADIR%%/games/tutorial3/it.png
-%%DATADIR%%/games/tutorial3/main-en.lua
-%%DATADIR%%/games/tutorial3/main-es.lua
-%%DATADIR%%/games/tutorial3/main-it.lua
-%%DATADIR%%/games/tutorial3/main-pt.lua
-%%DATADIR%%/games/tutorial3/main-ru.lua
-%%DATADIR%%/games/tutorial3/main-ua.lua
-%%DATADIR%%/games/tutorial3/main.lua
-%%DATADIR%%/games/tutorial3/ru.png
-%%DATADIR%%/games/tutorial3/ua.png
-%%DATADIR%%/lang/en.ini
-%%DATADIR%%/lang/es.ini
-%%DATADIR%%/lang/it.ini
-%%DATADIR%%/lang/pt.ini
-%%DATADIR%%/lang/ru.ini
-%%DATADIR%%/lang/ua.ini
-%%DATADIR%%/stead/click.lua
-%%DATADIR%%/stead/counters.lua
-%%DATADIR%%/stead/dash.lua
-%%DATADIR%%/stead/dbg.lua
-%%DATADIR%%/stead/dlg.lua
-%%DATADIR%%/stead/format.lua
-%%DATADIR%%/stead/gui.lua
-%%DATADIR%%/stead/hideinv.lua
-%%DATADIR%%/stead/hotkeys.lua
-%%DATADIR%%/stead/input.lua
-%%DATADIR%%/stead/kbd.lua
-%%DATADIR%%/stead/nolife.lua
-%%DATADIR%%/stead/nouse.lua
-%%DATADIR%%/stead/object.lua
-%%DATADIR%%/stead/para.lua
-%%DATADIR%%/stead/prefs.lua
-%%DATADIR%%/stead/proxymenu.lua
-%%DATADIR%%/stead/quotes.lua
-%%DATADIR%%/stead/snapshots.lua
-%%DATADIR%%/stead/sound.lua
-%%DATADIR%%/stead/sprites.lua
-%%DATADIR%%/stead/stead.lua
-%%DATADIR%%/stead/theme.lua
-%%DATADIR%%/stead/timer.lua
-%%DATADIR%%/stead/vars.lua
-%%DATADIR%%/stead/walk.lua
-%%DATADIR%%/stead/wroom.lua
-%%DATADIR%%/stead/xact.lua
-%%DATADIR%%/themes/arctic/adown.png
-%%DATADIR%%/themes/arctic/aup.png
-%%DATADIR%%/themes/arctic/bg.png
-%%DATADIR%%/themes/arctic/cursor-use.png
-%%DATADIR%%/themes/arctic/cursor.png
-%%DATADIR%%/themes/arctic/menu.png
-%%DATADIR%%/themes/arctic/theme.ini
-%%DATADIR%%/themes/bluesteel/bg.png
-%%DATADIR%%/themes/bluesteel/cursor-use.png
-%%DATADIR%%/themes/bluesteel/cursor.png
-%%DATADIR%%/themes/bluesteel/downarrow.png
-%%DATADIR%%/themes/bluesteel/menu.png
-%%DATADIR%%/themes/bluesteel/theme.ini
-%%DATADIR%%/themes/bluesteel/uparrow.png
-%%DATADIR%%/themes/book/book.png
-%%DATADIR%%/themes/book/theme.ini
-%%DATADIR%%/themes/clearlooks/adown.png
-%%DATADIR%%/themes/clearlooks/aup.png
-%%DATADIR%%/themes/clearlooks/bg.jpg
-%%DATADIR%%/themes/clearlooks/cursor-use.png
-%%DATADIR%%/themes/clearlooks/cursor.png
-%%DATADIR%%/themes/clearlooks/menu.png
-%%DATADIR%%/themes/clearlooks/theme.ini
-%%DATADIR%%/themes/default/adown.png
-%%DATADIR%%/themes/default/aup.png
-%%DATADIR%%/themes/default/bg.png
-%%DATADIR%%/themes/default/click.ogg
-%%DATADIR%%/themes/default/click.wav
-%%DATADIR%%/themes/default/cursor-use.png
-%%DATADIR%%/themes/default/cursor.png
-%%DATADIR%%/themes/default/menu.png
-%%DATADIR%%/themes/default/sans-b.ttf
-%%DATADIR%%/themes/default/sans-bi.ttf
-%%DATADIR%%/themes/default/sans-i.ttf
-%%DATADIR%%/themes/default/sans.ttf
-%%DATADIR%%/themes/default/theme.ini
-%%DATADIR%%/themes/default/use.png
-%%DATADIR%%/themes/fantasy/bg.png
-%%DATADIR%%/themes/fantasy/down.png
-%%DATADIR%%/themes/fantasy/menu.png
-%%DATADIR%%/themes/fantasy/theme.ini
-%%DATADIR%%/themes/fantasy/up.png
-%%DATADIR%%/themes/original/theme.ini
-%%DATADIR%%/themes/wide/theme.ini
 share/pixmaps/sdl_instead.ico
 share/pixmaps/sdl_instead.png
 share/pixmaps/sdl_instead_1.png
-@dirrm %%DATADIR%%/themes/wide
-@dirrm %%DATADIR%%/themes/original
-@dirrm %%DATADIR%%/themes/fantasy
-@dirrm %%DATADIR%%/themes/default
-@dirrm %%DATADIR%%/themes/clearlooks
-@dirrm %%DATADIR%%/themes/book
-@dirrm %%DATADIR%%/themes/bluesteel
-@dirrm %%DATADIR%%/themes/arctic
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/stead
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%/games/tutorial3
-@dirrm %%DATADIR%%/games
-@dirrm %%DATADIR%%