Attachment #123770 for bug #167181

View | Details | Raw Unified | Return to bug 167181
Collapse All | Expand All

Lines 5-11 Link Here

(-)Makefile (-1 / +1 lines)
5	# $FreeBSD: ports/games/instead/Makefile,v 1.5 2012/02/22 21:43:33 amdmi3 Exp $	5	# $FreeBSD: ports/games/instead/Makefile,v 1.5 2012/02/22 21:43:33 amdmi3 Exp $
6		6
7	PORTNAME= instead	7	PORTNAME= instead
8	PORTVERSION= 1.6.2	8	PORTVERSION= 1.7.0
9	CATEGORIES= games	9	CATEGORIES= games
10	MASTER_SITES= GOOGLE_CODE \	10	MASTER_SITES= GOOGLE_CODE \
11	http://mirror.amdmi3.ru/distfiles/	11	http://mirror.amdmi3.ru/distfiles/

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (instead_1.6.2.tar.gz) = f87b0c3ce2dba59d90a46e8023d7a145dca99f8da5f281183f86ca8f84e66aa4	1	SHA256 (instead_1.7.0.tar.gz) = e74d0168cc7c62d630f64a406ea6f2a09de6f7f320954457d3b01aa4f26cac43
2	SIZE (instead_1.6.2.tar.gz) = 3891996	2	SIZE (instead_1.7.0.tar.gz) = 3951154




%%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/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




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

 	
 	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

Added Link Here

(-)files/patch-games-Makefile (+11 lines)
1	--- games/Makefile.orig 2012-04-21 18:53:07.000000000 +0400
2	+++ games/Makefile 2012-04-22 03:17:56.351000837 +0400
3	@@ -8,7 +8,7 @@
4	echo $$f;\
5	if [ ! -d $$f ]; then continue; fi;\
6	$(INSTALLD) $(GAMESPATH)/$$f; \
7	- tar --exclude=".svn" -cf - -C $$f . \| tar -xpf - -C $(GAMESPATH)/$$f;\
8	+ tar -cf - -C $$f . \| tar -xpf - -C $(GAMESPATH)/$$f;\
9	done
10
11	uninstall:

Removed Link Here

(-)files/patch-makefile_games (-11 lines)
1	--- games/Makefile.orig 2010-10-12 19:06:34.000000000 +0800
2	+++ games/Makefile 2010-12-23 11:55:51.000000000 +0700
3	@@ -7,7 +7,7 @@
4	for f in *; do \
5	if [ ! -d $$f ]; then continue; fi;\
6	$(INSTALLD) $(GAMESPATH)/$$f; \
7	- tar --exclude=".svn" -c -C $$f . \| tar -x -C $(GAMESPATH)/$$f;\
8	+ tar -cf - -C $$f . \| tar -xpf - -C $(GAMESPATH)/$$f; \
9	done
10
11	uninstall:

Removed Link Here

(-)files/patch-makefile_themes (-11 lines)
1	--- themes/Makefile.orig 2010-10-12 19:06:32.000000000 +0800
2	+++ themes/Makefile 2010-12-23 11:55:51.000000000 +0700
3	@@ -8,7 +8,7 @@
4	for f in *; do \
5	if [ ! -d $$f ]; then continue; fi;\
6	$(INSTALLD) $(THEMESPATH)/$$f;\
7	- tar --exclude=".svn" -c -C $$f . \| tar -x -C $(THEMESPATH)/$$f;\
8	+ tar -cf - -C $$f . \| tar -xpf - -C $(THEMESPATH)/$$f; \
9	done
10
11	uninstall:

Added Link Here

(-)files/patch-themes-Makefile (+11 lines)
1	--- themes/Makefile.orig 2012-04-21 18:53:05.000000000 +0400
2	+++ themes/Makefile 2012-04-22 03:18:19.063048156 +0400
3	@@ -8,7 +8,7 @@
4	for f in *; do \
5	if [ ! -d $$f ]; then continue; fi;\
6	$(INSTALLD) $(THEMESPATH)/$$f;\
7	- tar --exclude=".svn" -cf - -C $$f . \| tar -xpf - -C $(THEMESPATH)/$$f;\
8	+ tar -cf - -C $$f . \| tar -xpf - -C $(THEMESPATH)/$$f;\
9	done
10
11	uninstall:

Return to bug 167181

Lines 20-36 Link Here

(-)pkg-plist (+6 lines)
20	%%DATADIR%%/lang/ru.ini	20	%%DATADIR%%/lang/ru.ini
21	%%DATADIR%%/lang/ua.ini	21	%%DATADIR%%/lang/ua.ini
22	%%DATADIR%%/stead/click.lua	22	%%DATADIR%%/stead/click.lua
		23	%%DATADIR%%/stead/counters.lua
23	%%DATADIR%%/stead/dash.lua	24	%%DATADIR%%/stead/dash.lua
24	%%DATADIR%%/stead/dbg.lua	25	%%DATADIR%%/stead/dbg.lua
		26	%%DATADIR%%/stead/dlg.lua
25	%%DATADIR%%/stead/format.lua	27	%%DATADIR%%/stead/format.lua
26	%%DATADIR%%/stead/gui.lua	28	%%DATADIR%%/stead/gui.lua
27	%%DATADIR%%/stead/hideinv.lua	29	%%DATADIR%%/stead/hideinv.lua
28	%%DATADIR%%/stead/hotkeys.lua	30	%%DATADIR%%/stead/hotkeys.lua
29	%%DATADIR%%/stead/input.lua	31	%%DATADIR%%/stead/input.lua
30	%%DATADIR%%/stead/kbd.lua	32	%%DATADIR%%/stead/kbd.lua
		33	%%DATADIR%%/stead/nolife.lua
		34	%%DATADIR%%/stead/nouse.lua
31	%%DATADIR%%/stead/object.lua	35	%%DATADIR%%/stead/object.lua
32	%%DATADIR%%/stead/para.lua	36	%%DATADIR%%/stead/para.lua
33	%%DATADIR%%/stead/prefs.lua	37	%%DATADIR%%/stead/prefs.lua
		38	%%DATADIR%%/stead/proxymenu.lua
34	%%DATADIR%%/stead/quotes.lua	39	%%DATADIR%%/stead/quotes.lua
35	%%DATADIR%%/stead/snapshots.lua	40	%%DATADIR%%/stead/snapshots.lua
36	%%DATADIR%%/stead/sound.lua	41	%%DATADIR%%/stead/sound.lua
Lines 40-45 Link Here
40	%%DATADIR%%/stead/timer.lua	45	%%DATADIR%%/stead/timer.lua
41	%%DATADIR%%/stead/vars.lua	46	%%DATADIR%%/stead/vars.lua
42	%%DATADIR%%/stead/walk.lua	47	%%DATADIR%%/stead/walk.lua
		48	%%DATADIR%%/stead/wroom.lua
43	%%DATADIR%%/stead/xact.lua	49	%%DATADIR%%/stead/xact.lua
44	%%DATADIR%%/themes/arctic/adown.png	50	%%DATADIR%%/themes/arctic/adown.png
45	%%DATADIR%%/themes/arctic/aup.png	51	%%DATADIR%%/themes/arctic/aup.png

Lines 1-24 Link Here

(-)files/patch-configure.sh (-22 / +4 lines)
1	--- configure.sh.orig 2012-02-09 18:55:00.127534293 +0400	1	--- configure.sh.orig 2012-04-21 18:53:11.000000000 +0400
2	+++ configure.sh 2012-02-09 18:58:52.803532634 +0400	2	+++ configure.sh 2012-04-22 03:17:17.136235398 +0400
3	@@ -131,14 +131,14 @@	3	@@ -192,26 +192,7 @@
4	echo -n "Checking iconv...("
5	echo -n "$cc /tmp/iconv-test.c -o iconv-test)..."
6
7	-if $cc /tmp/iconv-test.c -o /tmp/iconv-test; then
8	+if $cc /tmp/iconv-test.c -o /tmp/iconv-test >/dev/null 2>&1; then
9	CFLAGS="$CFLAGS -D_HAVE_ICONV"
10	echo "ok"
11	-elif $cc /tmp/iconv-test.c -liconv -o /tmp/iconv-test; then
12	+elif $cc /tmp/iconv-test.c -liconv -o /tmp/iconv-test >/dev/null 2>&1; then
13	CFLAGS="$CFLAGS -D_HAVE_ICONV"
14	LDFLAGS="$LDFLAGS -liconv"
15	echo "ok, with -liconv"
16	-elif $cc /tmp/iconv-test.c -I/usr/local/include -L/usr/local/lib -liconv -o /tmp/iconv-test; then
17	+elif $cc /tmp/iconv-test.c -I/usr/local/include -L/usr/local/lib -liconv -o /tmp/iconv-test >/dev/null 2>&1; then
18	CFLAGS="$CFLAGS -I/usr/local/include -D_HAVE_ICONV"
19	LDFLAGS="$LDFLAGS -L/usr/local/lib -liconv"
20	echo "ok, with -liconv and -L/usr/local/lib"
21	@@ -183,26 +183,7 @@
22	echo "SDL_CFLAGS=\$(shell sdl-config --cflags)" >> config.make	4	echo "SDL_CFLAGS=\$(shell sdl-config --cflags)" >> config.make
23	echo "SDL_LFLAGS=\$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image" >> config.make	5	echo "SDL_LFLAGS=\$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image" >> config.make
24	echo "ok"	6	echo "ok"
Lines 46-52 Link Here
46		28
47	rm -f Rules.make	29	rm -f Rules.make
48	ln -s Rules.make.system Rules.make	30	ln -s Rules.make.system Rules.make
49	@@ -218,16 +199,12 @@	31	@@ -227,16 +208,12 @@
50	echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make	32	echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make
51	echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make	33	echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make
52	echo "LANGPATH=\$(DATAPATH)/lang" >> config.make	34	echo "LANGPATH=\$(DATAPATH)/lang" >> config.make