- Update to 1.7.0

- Use canonical names for patch files
- Take maintainership (1)

PR:		167181
Submitted by:	myself
Approved by:	maintainer via private email (1)

8 files changed, 36 insertions, 48 deletions

diff --git a/games/instead/Makefile b/games/instead/Makefile
index 38d9d444a22e..9d6ca89f613f 100644
--- a/games/instead/Makefile
+++ b/games/instead/Makefile
@@ -5,13 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	instead
-PORTVERSION=	1.6.2
+PORTVERSION=	1.7.0
 CATEGORIES=	games
 MASTER_SITES=	GOOGLE_CODE \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	instead_${PORTVERSION}
 
-MAINTAINER=	neuroworker@gmail.com
+MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple Text Adventure, The Interpreter
 
 HAS_CONFIGURE=	yes
diff --git a/games/instead/distinfo b/games/instead/distinfo
index c55e45e8068f..552bf81c70f3 100644
--- a/games/instead/distinfo
+++ b/games/instead/distinfo
@@ -1,2 +1,2 @@
-SHA256 (instead_1.6.2.tar.gz) = f87b0c3ce2dba59d90a46e8023d7a145dca99f8da5f281183f86ca8f84e66aa4
-SIZE (instead_1.6.2.tar.gz) = 3891996
+SHA256 (instead_1.7.0.tar.gz) = e74d0168cc7c62d630f64a406ea6f2a09de6f7f320954457d3b01aa4f26cac43
+SIZE (instead_1.7.0.tar.gz) = 3951154
diff --git a/games/instead/files/patch-configure.sh b/games/instead/files/patch-configure.sh
index 4ae100b4da59..f5550d9aed2f 100644
--- a/games/instead/files/patch-configure.sh
+++ b/games/instead/files/patch-configure.sh
@@ -1,24 +1,6 @@
---- configure.sh.orig	2012-02-09 18:55:00.127534293 +0400
-+++ configure.sh	2012-02-09 18:58:52.803532634 +0400
-@@ -131,14 +131,14 @@
- echo -n "Checking iconv...("
- echo -n "$cc /tmp/iconv-test.c -o iconv-test)..."
- 
--if $cc /tmp/iconv-test.c -o /tmp/iconv-test; then
-+if $cc /tmp/iconv-test.c -o /tmp/iconv-test >/dev/null 2>&1; then
- 	CFLAGS="$CFLAGS -D_HAVE_ICONV"
- 	echo "ok"
--elif $cc /tmp/iconv-test.c -liconv -o /tmp/iconv-test; then
-+elif $cc /tmp/iconv-test.c -liconv -o /tmp/iconv-test >/dev/null 2>&1; then
- 	CFLAGS="$CFLAGS -D_HAVE_ICONV"
- 	LDFLAGS="$LDFLAGS -liconv"
- 	echo "ok, with -liconv"
--elif $cc /tmp/iconv-test.c -I/usr/local/include -L/usr/local/lib -liconv -o /tmp/iconv-test; then
-+elif $cc /tmp/iconv-test.c -I/usr/local/include -L/usr/local/lib -liconv -o /tmp/iconv-test >/dev/null 2>&1; then
- 	CFLAGS="$CFLAGS -I/usr/local/include -D_HAVE_ICONV"
- 	LDFLAGS="$LDFLAGS -L/usr/local/lib -liconv"
- 	echo "ok, with -liconv and -L/usr/local/lib"
-@@ -183,26 +183,7 @@
+--- 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"
@@ -46,7 +28,7 @@
  	
  	rm -f Rules.make
  	ln -s Rules.make.system Rules.make
-@@ -218,16 +199,12 @@
+@@ -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
diff --git a/games/instead/files/patch-games-Makefile b/games/instead/files/patch-games-Makefile
new file mode 100644
index 000000000000..797a223ef699
--- /dev/null
+++ b/games/instead/files/patch-games-Makefile
@@ -0,0 +1,11 @@
+--- games/Makefile.orig	2012-04-21 18:53:07.000000000 +0400
++++ games/Makefile	2012-04-22 03:17:56.351000837 +0400
+@@ -8,7 +8,7 @@
+ 		echo $$f;\
+ 		if [ ! -d $$f ]; then continue; fi;\
+ 		$(INSTALLD) $(GAMESPATH)/$$f; \
+-		tar --exclude=".svn" -cf - -C $$f . | tar -xpf - -C $(GAMESPATH)/$$f;\
++		tar -cf - -C $$f . | tar -xpf - -C $(GAMESPATH)/$$f;\
+ 	done
+ 
+ uninstall:
diff --git a/games/instead/files/patch-makefile_games b/games/instead/files/patch-makefile_games
deleted file mode 100644
index abdd03e69302..000000000000
--- a/games/instead/files/patch-makefile_games
+++ /dev/null
@@ -1,11 +0,0 @@
---- games/Makefile.orig	2010-10-12 19:06:34.000000000 +0800
-+++ games/Makefile	2010-12-23 11:55:51.000000000 +0700
-@@ -7,7 +7,7 @@
- 	for f in *; do \
- 		if [ ! -d $$f ]; then continue; fi;\
- 		$(INSTALLD) $(GAMESPATH)/$$f; \
--		tar --exclude=".svn" -c -C $$f . | tar -x -C $(GAMESPATH)/$$f;\
-+		tar -cf - -C $$f . | tar -xpf - -C $(GAMESPATH)/$$f; \
- 	done
- 
- uninstall:
diff --git a/games/instead/files/patch-makefile_themes b/games/instead/files/patch-makefile_themes
deleted file mode 100644
index dccc70276e43..000000000000
--- a/games/instead/files/patch-makefile_themes
+++ /dev/null
@@ -1,11 +0,0 @@
---- themes/Makefile.orig	2010-10-12 19:06:32.000000000 +0800
-+++ themes/Makefile	2010-12-23 11:55:51.000000000 +0700
-@@ -8,7 +8,7 @@
- 	for f in *; do \
- 		if [ ! -d $$f ]; then continue; fi;\
- 		$(INSTALLD) $(THEMESPATH)/$$f;\
--		tar --exclude=".svn" -c -C $$f . | tar -x -C $(THEMESPATH)/$$f;\
-+		tar -cf - -C $$f . | tar -xpf - -C $(THEMESPATH)/$$f; \
- 	done
- 
- uninstall:
diff --git a/games/instead/files/patch-themes-Makefile b/games/instead/files/patch-themes-Makefile
new file mode 100644
index 000000000000..ab0cb211bff7
--- /dev/null
+++ b/games/instead/files/patch-themes-Makefile
@@ -0,0 +1,11 @@
+--- themes/Makefile.orig	2012-04-21 18:53:05.000000000 +0400
++++ themes/Makefile	2012-04-22 03:18:19.063048156 +0400
+@@ -8,7 +8,7 @@
+ 	for f in *; do \
+ 		if [ ! -d $$f ]; then continue; fi;\
+ 		$(INSTALLD) $(THEMESPATH)/$$f;\
+-		tar --exclude=".svn" -cf - -C $$f . | tar -xpf - -C $(THEMESPATH)/$$f;\
++		tar -cf - -C $$f . | tar -xpf - -C $(THEMESPATH)/$$f;\
+ 	done
+ 
+ uninstall:
diff --git a/games/instead/pkg-plist b/games/instead/pkg-plist
index 665e51a4b17f..8351b66c51b6 100644
--- a/games/instead/pkg-plist
+++ b/games/instead/pkg-plist
@@ -20,17 +20,22 @@ share/applications/instead.desktop
 %%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
@@ -40,6 +45,7 @@ share/applications/instead.desktop
 %%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