- Update to 2.0.1

- Add LICENSE
- Switch to cmake

7 files changed, 27 insertions, 110 deletions

diff --git a/games/instead/Makefile b/games/instead/Makefile
index 7490bfcbe7d7..54c362f53438 100644
--- a/games/instead/Makefile
+++ b/games/instead/Makefile
@@ -2,51 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	instead
-PORTVERSION=	1.9.1
-PORTREVISION=	2
+PORTVERSION=	2.0.1
 CATEGORIES=	games
-MASTER_SITES=	SF/instead/instead/${PORTVERSION}/ \
-		http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES=	SF/instead/instead/${PORTVERSION}/
 DISTNAME=	instead_${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple Text Adventure, The Interpreter
 
-HAS_CONFIGURE=	yes
-USES=		pkgconfig iconv gmake
-USE_GNOME=	gtk20
-USE_LUA=	5.1
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+LICENSE=	MIT
 
-CONFIGURE_SCRIPT=	configure.sh
-CONFIGURE_ENV=	PREFIX="${PREFIX}"
+USES=		cmake:outsource pkgconfig iconv
+CMAKE_ARGS=	-DMANDIR=man
+USE_LUA=	5.1
 
-WRKSRC=		${WRKDIR}/instead-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=SDL
+OPTIONS_DEFAULT=SDL GTK2
 OPTIONS_SINGLE=	SDL_VERSION
 OPTIONS_SINGLE_SDL_VERSION=	SDL SDL2
+OPTIONS_RADIO=	GTK_VERSION
+OPTIONS_RADIO_GTK_VERSION=	GTK2 GTK3
 
 SDL_VERSION_DESC=SDL version
 SDL_DESC=	Use SDL 1.2
 SDL2_DESC=	Use SDL 2.0
-
-.include <bsd.port.options.mk>
-
-.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 's|sdl2-config|&-nonexistent|' ${WRKSRC}/configure.sh
-.endif
+GTK_VERSION_DESC=GTK version for file open dialog
+GTK2_DESC=	Use GTK 2
+GTK3_DESC=	Use GTK 3
+
+SDL_USE=	SDL=sdl,image,ttf,mixer
+SDL2_USE=	SDL=sdl2,image2,ttf2,mixer2
+SDL2_CMAKE_ON=	-DWITH_SDL2=ON
+SDL2_CMAKE_OFF=	-DWITH_SDL2=OFF
+GTK2_USE=	GNOME=gtk20
+GTK2_CMAKE_ON=	-DWITH_GTK2=ON
+GTK2_CMAKE_OFF=	-DWITH_GTK2=OFF
+GTK3_USE=	GNOME=gtk30
+GTK3_CMAKE_ON=	-DWITH_GTK3=ON
+GTK3_CMAKE_OFF=	-DWITH_GTK3=OFF
 
 .include <bsd.port.mk>
diff --git a/games/instead/distinfo b/games/instead/distinfo
index ebcf6b1f65a8..2160c0bd0fed 100644
--- a/games/instead/distinfo
+++ b/games/instead/distinfo
@@ -1,2 +1,2 @@
-SHA256 (instead_1.9.1.tar.gz) = f5577c5118b5f4a2897c7bb26f3ad7993005dbf0ae8fe762b4434e1151ddb430
-SIZE (instead_1.9.1.tar.gz) = 5551348
+SHA256 (instead_2.0.1.tar.gz) = 57fa913c0667a19b527e23ffcc48fc7a7cb57e23dce459d499902875d1bbf12e
+SIZE (instead_2.0.1.tar.gz) = 5559716
diff --git a/games/instead/files/patch-configure.sh b/games/instead/files/patch-configure.sh
deleted file mode 100644
index f5550d9aed2f..000000000000
--- a/games/instead/files/patch-configure.sh
+++ /dev/null
@@ -1,48 +0,0 @@
---- configure.sh.orig	2012-04-21 18:53:11.000000000 +0400
-+++ configure.sh	2012-04-22 03:17:17.136235398 +0400
-@@ -192,26 +192,7 @@
- echo "SDL_CFLAGS=\$(shell sdl-config --cflags)" >> config.make
- echo "SDL_LFLAGS=\$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image" >> config.make
- echo "ok"
--echo -n "Choose installation mode. Standalone(1) or system(2) [1]: "
--read ans
--if [ "x$ans" = "x1" -o "x$ans" = "x" ]; then
--	echo " * Standalone version"
--	rm -f Rules.make
--	ln -sf Rules.make.standalone Rules.make
--	rm -f sdl-instead
--	ln -sf src/sdl-instead/sdl-instead sdl-instead
--	echo "Ok. We are ready to build. Use these commands:"
--	echo "    \$ make"
--	echo "    \$ ./sdl-instead"
--elif [ "x$ans" = "x2" ]; then
--	echo -n "Enter prefix path [/usr/local]: "
--	read ans
--
--	if [ "x$ans" = "x" ]; then
--		prefix="/usr/local"
--	else
--		prefix="$ans"
--	fi
-+	prefix="$PREFIX"
- 	
- 	rm -f Rules.make
- 	ln -s Rules.make.system Rules.make
-@@ -227,16 +208,12 @@
- 	echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make
- 	echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make
- 	echo "LANGPATH=\$(DATAPATH)/lang" >> config.make
--	echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make
-+	echo "MANPATH=\$(DESTDIR)\$(PREFIX)/man/man6" >> config.make
- 
- 	echo "Ok. We are ready to build and install. Use these commands:"
- 	echo "    \$ make"
- 	echo "    \$ sudo make install"
- 	echo "    \$ sdl-instead"
--else
--	echo "Huh!!! Wrong answer."
--	exit 1
--fi
- 
- echo " Enjoy..."
- 
diff --git a/games/instead/files/patch-desktop-Makefile b/games/instead/files/patch-desktop-Makefile
deleted file mode 100644
index 293b2547a10e..000000000000
--- a/games/instead/files/patch-desktop-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- desktop/Makefile.orig	2013-06-23 15:26:58.000000000 +0400
-+++ desktop/Makefile	2013-12-25 18:47:41.313221986 +0400
-@@ -7,7 +7,7 @@
- all: instead.desktop
- 
- instead.desktop: instead.desktop.in
--	cat instead.desktop.in | sed -e "s|@BIN|$(BIN)|g" > instead.desktop
-+	cat instead.desktop.in | sed -e "s|@BIN|$(BIN:${DESTDIR}%=%)|g" > instead.desktop
- 
- install:
- 	$(INSTALLD) $(DESTDIR)$(PREFIX)/share/applications
diff --git a/games/instead/files/patch-src-instead-Makefile b/games/instead/files/patch-src-instead-Makefile
deleted file mode 100644
index e86fa0fa9fd6..000000000000
--- a/games/instead/files/patch-src-instead-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/instead/Makefile.orig	2013-06-23 15:26:48.000000000 +0400
-+++ src/instead/Makefile	2013-12-25 18:45:45.639220432 +0400
-@@ -4,7 +4,7 @@
- 
- all: instead
- instead: instead.c rline.c
--	$(CC) $(CFLAGS) -DSTEAD_PATH=\"${STEADPATH}/\" instead.c $(LUA_CFLAGS) rline.c $(LUA_LFLAGS) -lncurses -lreadline -o instead
-+	$(CC) $(CFLAGS) -DSTEAD_PATH=\"${STEADPATH:${DESTDIR}%=%}/\" instead.c $(LUA_CFLAGS) rline.c $(LUA_LFLAGS) -lncurses -lreadline -o instead
- clean:
- 	$(RM) -rf *.o instead
- install:
diff --git a/games/instead/files/patch-src-sdl-instead-Makefile b/games/instead/files/patch-src-sdl-instead-Makefile
deleted file mode 100644
index 8d208f40872c..000000000000
--- a/games/instead/files/patch-src-sdl-instead-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sdl-instead/Makefile.orig	2013-06-23 15:26:49.000000000 +0400
-+++ src/sdl-instead/Makefile	2013-12-25 18:46:16.823227850 +0400
-@@ -1,7 +1,7 @@
- include ../../Rules.make
- include ../../config.make
- 
--CFLAGS += $(SDL_CFLAGS) $(LUA_CFLAGS) $(ZLIB_CFLAGS) $(EXTRA_CFLAGS) -DLANG_PATH=\"${LANGPATH}/\" -DSTEAD_PATH=\"${STEADPATH}/\"  -DGAMES_PATH=\"${GAMESPATH}/\" -DTHEMES_PATH=\"${THEMESPATH}/\" -DVERSION=\"$(VERSION)\" -DICON_PATH=\"${ICONPATH}/\"
-+CFLAGS += $(SDL_CFLAGS) $(LUA_CFLAGS) $(ZLIB_CFLAGS) $(EXTRA_CFLAGS) -DLANG_PATH=\"${LANGPATH:${DESTDIR}%=%}/\" -DSTEAD_PATH=\"${STEADPATH:${DESTDIR}%=%}/\"  -DGAMES_PATH=\"${GAMESPATH:${DESTDIR}%=%}/\" -DTHEMES_PATH=\"${THEMESPATH:${DESTDIR}%=%}/\" -DVERSION=\"$(VERSION)\" -DICON_PATH=\"${ICONPATH:${DESTDIR}%=%}/\"
- 
- LDFLAGS += $(SDL_LFLAGS) $(LUA_LFLAGS) $(ZLIB_LFLAGS) $(EXTRA_LDFLAGS)
-  
diff --git a/games/instead/pkg-plist b/games/instead/pkg-plist
index a00fd5a8ad39..2888836b5c6f 100644
--- a/games/instead/pkg-plist
+++ b/games/instead/pkg-plist
@@ -4,4 +4,5 @@ man/man6/instead.6.gz
 share/applications/instead.desktop
 share/pixmaps/sdl_instead.ico
 share/pixmaps/sdl_instead.png
+share/pixmaps/sdl_instead.svg
 share/pixmaps/sdl_instead_1.png