mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

- Update to 1.7.0

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

PR:		167181
Submitted by:	myself
Approved by:	maintainer via private email (1)
This commit is contained in:
Dmitry Marakasov 2012-04-23 14:02:10 +00:00
parent 2e62ae5a07
commit b6ffde7db3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295315
8 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/instead/Makefile
View File

@ -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

4
games/instead/distinfo
View File

@ -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

26
games/instead/files/patch-configure.sh
View File

@ -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

11
games/instead/files/patch-games-Makefile Normal file
View File

@ -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:

11
games/instead/files/patch-makefile_games
View File

@ -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:

11
games/instead/files/patch-makefile_themes
View File

@ -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:

11
games/instead/files/patch-themes-Makefile Normal file
View File

@ -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:

6
games/instead/pkg-plist
View File

@ -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