Attachment #121873 for bug #164944

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




# $FreeBSD: ports/games/instead/Makefile,v 1.3 2011/08/30 20:21:32 pawel Exp $

PORTNAME=	instead
PORTVERSION=	1.6.2
CATEGORIES=	games
MASTER_SITES=	GOOGLE_CODE \
		http://209.44.102.205/FreeBSD/distfiles/

USE_ICONV=	yes

CONFIGURE_SCRIPT=	configure.sh
CONFIGURE_ENV=	PREFIX="${PREFIX}"

WRKSRC=		${WRKDIR}/instead-${PORTVERSION}
MAN6=		instead.6

PORTDOCS=	*

post-patch:
	@${REINPLACE_CMD} -e 's|port_install_prefix|${PREFIX}|' ${WRKSRC}/configure.sh
.if defined(NOPORTDOCS)
post-patch:
	@${REINPLACE_CMD} -e '/INSTALL.*DOCPATH/ d' ${WRKSRC}/doc/Makefile
.endif


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (instead_1.5.0.tar.gz) = 9a10b446301ad378bbb3b900a09c7494c0accf8055951598f1cb0239c85c4284	1	SHA256 (instead_1.6.2.tar.gz) = f87b0c3ce2dba59d90a46e8023d7a145dca99f8da5f281183f86ca8f84e66aa4
2	SIZE (instead_1.5.0.tar.gz) = 3867439	2	SIZE (instead_1.6.2.tar.gz) = 3891996




bin/instead
bin/sdl-instead
share/applications/instead.desktop
%%DATADIR%%/games/tutorial3/main-it.lua
%%DATADIR%%/games/tutorial3/ua.png
%%DATADIR%%/games/tutorial3/es.png
%%DATADIR%%/games/tutorial3/it.png
%%DATADIR%%/games/tutorial3/gb.png
%%DATADIR%%/games/tutorial3/ramparts.mod
%%DATADIR%%/games/tutorial3/main-ru.lua
%%DATADIR%%/games/tutorial3/ru.png
%%DATADIR%%/games/tutorial3/main-en.lua
%%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-ru.lua
%%DATADIR%%/games/tutorial3/main-ua.lua
%%DATADIR%%/games/tutorial3/main.lua
%%DATADIR%%/games/tutorial3/ru.png
%%DATADIR%%/games/tutorial3/sv_ttt.xm
%%DATADIR%%/games/tutorial3/ua.png
%%DATADIR%%/lang/en.ini
%%DATADIR%%/lang/es.ini
%%DATADIR%%/lang/it.ini

%%DATADIR%%/stead/dash.lua
%%DATADIR%%/stead/dbg.lua
%%DATADIR%%/stead/format.lua
%%DATADIR%%/stead/goto.lua
%%DATADIR%%/stead/gui.lua
%%DATADIR%%/stead/hideinv.lua
%%DATADIR%%/stead/hotkeys.lua

%%DATADIR%%/stead/theme.lua
%%DATADIR%%/stead/timer.lua
%%DATADIR%%/stead/vars.lua
%%DATADIR%%/stead/walk.lua
%%DATADIR%%/stead/xact.lua
%%DATADIR%%/themes/arctic/adown.png
%%DATADIR%%/themes/arctic/aup.png

%%DATADIR%%/themes/default/cursor-use.png
%%DATADIR%%/themes/default/cursor.png
%%DATADIR%%/themes/default/menu.png
%%DATADIR%%/themes/default/sans.ttf
%%DATADIR%%/themes/default/sans-i.ttf
%%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/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
@dirrmtry share/applications
@dirrm %%DATADIR%%/themes/wide
@dirrm %%DATADIR%%/themes/original




--- configure.sh.orig	2010-10-12 19:06:42.000000000 +0800
+++ configure.sh	2011-01-04 12:04:35.000000000 +0700
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 echo -n "Checking pkg-config..."
 if ! pkg-config --version >/dev/null 2>&1; then
 	echo "error: no pkg-config in \$PATH."
@@ -8,7 +8,7 @@
 
 echo -n "Checking pkg-config --cflags zlib..."
 if ! pkg-config --cflags zlib >/dev/null 2>&1; then
-	if [[ -f /usr/include/zlib.h ]]; then
+	if [ -f /usr/include/zlib.h ]; then
 		echo "not found, but /usr/include/zlib.h exists..."
 		zlib_cflags="x"
 		zlib_libs=
@@ -36,7 +36,7 @@
 
 
 echo -n "Checking pkg-config --cflags lua[5.1]..."
-if ! pkg-config --cflags lua5.1 >/dev/null 2>&1; then
+if ! pkg-config --cflags lua-5.1 >/dev/null 2>&1; then
 	if ! pkg-config --cflags lua >/dev/null 2>&1; then
 		echo "failed: no package lua/lua5.1"
 		echo "Please install lua development package."
@@ -47,8 +47,8 @@
 	lua_libs="pkg-config --libs lua"
 else
 	echo "lua5.1"
-	lua_cflags="pkg-config --cflags lua5.1"	
-	lua_libs="pkg-config --libs lua5.1"	
+	lua_cflags="pkg-config --cflags lua-5.1"	
+	lua_libs="pkg-config --libs lua-5.1"	
 fi
 
 
@@ -109,30 +109,8 @@
 echo "ok"
 rm -f /tmp/sdl-test.c /tmp/sdl-test
 
-cat << EOF >/tmp/iconv-test.c
-#include <iconv.h>
-int main(int argc, char **argv)
-{
-	iconv_open("","");
-}
-EOF
-echo $cc
-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 -liconv -o /tmp/iconv-test; then
-		echo -n "failed. Build without iconv.".
-	else
-		CFLAGS="$CFLAGS -D_HAVE_ICONV"
-		LDFLAGS="$LDFLAGS -liconv"
-		echo "ok, with -liconv"
-	fi
-else
-	CFLAGS="$CFLAGS -D_HAVE_ICONV"
-	echo "ok"
-fi
-
-rm -f /tmp/iconv-test.c /tmp/iconv-test
+#build with iconv
+CFLAGS="$CFLAGS -D_HAVE_ICONV"
 
 if ! make clean >/dev/null 2>&1; then
 	echo " * Warning!!! Can not do make clean..."
@@ -140,20 +118,20 @@
 echo -n "Generating config.make..."
 echo "# autamatically generated by configure.sh" >config.make
 
-if [[ ! -z "$CFLAGS" ]]; then
+if [ ! -z "$CFLAGS" ]; then
 	echo "EXTRA_CFLAGS+=$CFLAGS" >> config.make
 fi
 
-if [[ ! -z "$LDFLAGS" ]]; then
+if [ ! -z "$LDFLAGS" ]; then
 	echo "EXTRA_LDFLAGS+=$LDFLAGS" >> config.make
 fi
 
-if [[ ! -z "$gtk_cflags" ]]; then
+if [ ! -z "$gtk_cflags" ]; then
 	echo "EXTRA_CFLAGS+=-D_USE_GTK -D_USE_BROWSE" >> config.make
 	echo "EXTRA_CFLAGS+=\$(shell $gtk_cflags)" >> config.make
 	echo "EXTRA_LDFLAGS+=\$(shell $gtk_libs)" >> config.make
 fi
-if [[ -z "$zlib_cflags" ]]; then
+if [ -z "$zlib_cflags" ]; then
 	echo "SUBDIRS=src/zlib" >> config.make
 	echo "ZLIB_CFLAGS=-I../zlib" >> config.make
 	echo "ZLIB_LFLAGS=../zlib/libz.a" >> config.make
@@ -169,26 +147,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="port_install_prefix"
 	
 	rm -f Rules.make
 	ln -s Rules.make.system Rules.make
@@ -204,16 +163,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..."
 




--- 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 @@
 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
@@ -218,16 +199,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..."
 

Return to bug 164944

Lines 5-11 Link Here

(-)Makefile (-3 / +3 lines)
5	# $FreeBSD: ports/games/instead/Makefile,v 1.3 2011/08/30 20:21:32 pawel Exp $	5	# $FreeBSD: ports/games/instead/Makefile,v 1.3 2011/08/30 20:21:32 pawel Exp $
6		6
7	PORTNAME= instead	7	PORTNAME= instead
8	PORTVERSION= 1.5.0	8	PORTVERSION= 1.6.2
9	CATEGORIES= games	9	CATEGORIES= games
10	MASTER_SITES= GOOGLE_CODE \	10	MASTER_SITES= GOOGLE_CODE \
11	http://209.44.102.205/FreeBSD/distfiles/	11	http://209.44.102.205/FreeBSD/distfiles/
Lines 22-36 Link Here
22	USE_ICONV= yes	22	USE_ICONV= yes
23		23
24	CONFIGURE_SCRIPT= configure.sh	24	CONFIGURE_SCRIPT= configure.sh
		25	CONFIGURE_ENV= PREFIX="${PREFIX}"
25		26
26	WRKSRC= ${WRKDIR}/instead-${PORTVERSION}	27	WRKSRC= ${WRKDIR}/instead-${PORTVERSION}
27	MAN6= instead.6	28	MAN6= instead.6
28		29
29	PORTDOCS= *	30	PORTDOCS= *
30		31
31	post-patch:
32	@${REINPLACE_CMD} -e 's\|port_install_prefix\|${PREFIX}\|' ${WRKSRC}/configure.sh
33	.if defined(NOPORTDOCS)	32	.if defined(NOPORTDOCS)
		33	post-patch:
34	@${REINPLACE_CMD} -e '/INSTALL.*DOCPATH/ d' ${WRKSRC}/doc/Makefile	34	@${REINPLACE_CMD} -e '/INSTALL.*DOCPATH/ d' ${WRKSRC}/doc/Makefile
35	.endif	35	.endif
36		36

Lines 1-19 Link Here

(-)pkg-plist (-12 / +14 lines)
1	bin/instead	1	bin/instead
2	bin/sdl-instead	2	bin/sdl-instead
3	share/applications/instead.desktop	3	share/applications/instead.desktop
4	%%DATADIR%%/games/tutorial3/main-it.lua
5	%%DATADIR%%/games/tutorial3/ua.png
6	%%DATADIR%%/games/tutorial3/es.png	4	%%DATADIR%%/games/tutorial3/es.png
7	%%DATADIR%%/games/tutorial3/it.png
8	%%DATADIR%%/games/tutorial3/gb.png	5	%%DATADIR%%/games/tutorial3/gb.png
9	%%DATADIR%%/games/tutorial3/ramparts.mod
10	%%DATADIR%%/games/tutorial3/main-ru.lua
11	%%DATADIR%%/games/tutorial3/ru.png
12	%%DATADIR%%/games/tutorial3/main-en.lua
13	%%DATADIR%%/games/tutorial3/instead.png	6	%%DATADIR%%/games/tutorial3/instead.png
14	%%DATADIR%%/games/tutorial3/main.lua	7	%%DATADIR%%/games/tutorial3/it.png
15	%%DATADIR%%/games/tutorial3/main-ua.lua	8	%%DATADIR%%/games/tutorial3/main-en.lua
16	%%DATADIR%%/games/tutorial3/main-es.lua	9	%%DATADIR%%/games/tutorial3/main-es.lua
		10	%%DATADIR%%/games/tutorial3/main-it.lua
		11	%%DATADIR%%/games/tutorial3/main-ru.lua
		12	%%DATADIR%%/games/tutorial3/main-ua.lua
		13	%%DATADIR%%/games/tutorial3/main.lua
		14	%%DATADIR%%/games/tutorial3/ru.png
		15	%%DATADIR%%/games/tutorial3/sv_ttt.xm
		16	%%DATADIR%%/games/tutorial3/ua.png
17	%%DATADIR%%/lang/en.ini	17	%%DATADIR%%/lang/en.ini
18	%%DATADIR%%/lang/es.ini	18	%%DATADIR%%/lang/es.ini
19	%%DATADIR%%/lang/it.ini	19	%%DATADIR%%/lang/it.ini
Lines 23-29 Link Here
23	%%DATADIR%%/stead/dash.lua	23	%%DATADIR%%/stead/dash.lua
24	%%DATADIR%%/stead/dbg.lua	24	%%DATADIR%%/stead/dbg.lua
25	%%DATADIR%%/stead/format.lua	25	%%DATADIR%%/stead/format.lua
26	%%DATADIR%%/stead/goto.lua
27	%%DATADIR%%/stead/gui.lua	26	%%DATADIR%%/stead/gui.lua
28	%%DATADIR%%/stead/hideinv.lua	27	%%DATADIR%%/stead/hideinv.lua
29	%%DATADIR%%/stead/hotkeys.lua	28	%%DATADIR%%/stead/hotkeys.lua
Lines 40-45 Link Here
40	%%DATADIR%%/stead/theme.lua	39	%%DATADIR%%/stead/theme.lua
41	%%DATADIR%%/stead/timer.lua	40	%%DATADIR%%/stead/timer.lua
42	%%DATADIR%%/stead/vars.lua	41	%%DATADIR%%/stead/vars.lua
		42	%%DATADIR%%/stead/walk.lua
43	%%DATADIR%%/stead/xact.lua	43	%%DATADIR%%/stead/xact.lua
44	%%DATADIR%%/themes/arctic/adown.png	44	%%DATADIR%%/themes/arctic/adown.png
45	%%DATADIR%%/themes/arctic/aup.png	45	%%DATADIR%%/themes/arctic/aup.png
Lines 72-81 Link Here
72	%%DATADIR%%/themes/default/cursor-use.png	72	%%DATADIR%%/themes/default/cursor-use.png
73	%%DATADIR%%/themes/default/cursor.png	73	%%DATADIR%%/themes/default/cursor.png
74	%%DATADIR%%/themes/default/menu.png	74	%%DATADIR%%/themes/default/menu.png
75	%%DATADIR%%/themes/default/sans.ttf
76	%%DATADIR%%/themes/default/sans-i.ttf
77	%%DATADIR%%/themes/default/sans-b.ttf	75	%%DATADIR%%/themes/default/sans-b.ttf
78	%%DATADIR%%/themes/default/sans-bi.ttf	76	%%DATADIR%%/themes/default/sans-bi.ttf
		77	%%DATADIR%%/themes/default/sans-i.ttf
		78	%%DATADIR%%/themes/default/sans.ttf
79	%%DATADIR%%/themes/default/theme.ini	79	%%DATADIR%%/themes/default/theme.ini
80	%%DATADIR%%/themes/default/use.png	80	%%DATADIR%%/themes/default/use.png
81	%%DATADIR%%/themes/fantasy/bg.png	81	%%DATADIR%%/themes/fantasy/bg.png
Lines 85-91 Link Here
85	%%DATADIR%%/themes/fantasy/up.png	85	%%DATADIR%%/themes/fantasy/up.png
86	%%DATADIR%%/themes/original/theme.ini	86	%%DATADIR%%/themes/original/theme.ini
87	%%DATADIR%%/themes/wide/theme.ini	87	%%DATADIR%%/themes/wide/theme.ini
		88	share/pixmaps/sdl_instead.ico
88	share/pixmaps/sdl_instead.png	89	share/pixmaps/sdl_instead.png
		90	share/pixmaps/sdl_instead_1.png
89	@dirrmtry share/applications	91	@dirrmtry share/applications
90	@dirrm %%DATADIR%%/themes/wide	92	@dirrm %%DATADIR%%/themes/wide
91	@dirrm %%DATADIR%%/themes/original	93	@dirrm %%DATADIR%%/themes/original

Removed Link Here

(-)files/patch-configure (-141 lines)
1	--- configure.sh.orig 2010-10-12 19:06:42.000000000 +0800
2	+++ configure.sh 2011-01-04 12:04:35.000000000 +0700
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/bin/sh
6	echo -n "Checking pkg-config..."
7	if ! pkg-config --version >/dev/null 2>&1; then
8	echo "error: no pkg-config in \$PATH."
9	@@ -8,7 +8,7 @@
10
11	echo -n "Checking pkg-config --cflags zlib..."
12	if ! pkg-config --cflags zlib >/dev/null 2>&1; then
13	- if [[ -f /usr/include/zlib.h ]]; then
14	+ if [ -f /usr/include/zlib.h ]; then
15	echo "not found, but /usr/include/zlib.h exists..."
16	zlib_cflags="x"
17	zlib_libs=
18	@@ -36,7 +36,7 @@
19
20
21	echo -n "Checking pkg-config --cflags lua[5.1]..."
22	-if ! pkg-config --cflags lua5.1 >/dev/null 2>&1; then
23	+if ! pkg-config --cflags lua-5.1 >/dev/null 2>&1; then
24	if ! pkg-config --cflags lua >/dev/null 2>&1; then
25	echo "failed: no package lua/lua5.1"
26	echo "Please install lua development package."
27	@@ -47,8 +47,8 @@
28	lua_libs="pkg-config --libs lua"
29	else
30	echo "lua5.1"
31	- lua_cflags="pkg-config --cflags lua5.1"
32	- lua_libs="pkg-config --libs lua5.1"
33	+ lua_cflags="pkg-config --cflags lua-5.1"
34	+ lua_libs="pkg-config --libs lua-5.1"
35	fi
36
37
38	@@ -109,30 +109,8 @@
39	echo "ok"
40	rm -f /tmp/sdl-test.c /tmp/sdl-test
41
42	-cat << EOF >/tmp/iconv-test.c
43	-#include <iconv.h>
44	-int main(int argc, char **argv)
45	-{
46	- iconv_open("","");
47	-}
48	-EOF
49	-echo $cc
50	-echo -n "Checking iconv...("
51	-echo -n "$cc /tmp/iconv-test.c -o iconv-test)..."
52	-if ! $cc /tmp/iconv-test.c -o /tmp/iconv-test; then
53	- if ! $cc /tmp/iconv-test.c -liconv -o /tmp/iconv-test; then
54	- echo -n "failed. Build without iconv.".
55	- else
56	- CFLAGS="$CFLAGS -D_HAVE_ICONV"
57	- LDFLAGS="$LDFLAGS -liconv"
58	- echo "ok, with -liconv"
59	- fi
60	-else
61	- CFLAGS="$CFLAGS -D_HAVE_ICONV"
62	- echo "ok"
63	-fi
64	-
65	-rm -f /tmp/iconv-test.c /tmp/iconv-test
66	+#build with iconv
67	+CFLAGS="$CFLAGS -D_HAVE_ICONV"
68
69	if ! make clean >/dev/null 2>&1; then
70	echo " * Warning!!! Can not do make clean..."
71	@@ -140,20 +118,20 @@
72	echo -n "Generating config.make..."
73	echo "# autamatically generated by configure.sh" >config.make
74
75	-if [[ ! -z "$CFLAGS" ]]; then
76	+if [ ! -z "$CFLAGS" ]; then
77	echo "EXTRA_CFLAGS+=$CFLAGS" >> config.make
78	fi
79
80	-if [[ ! -z "$LDFLAGS" ]]; then
81	+if [ ! -z "$LDFLAGS" ]; then
82	echo "EXTRA_LDFLAGS+=$LDFLAGS" >> config.make
83	fi
84
85	-if [[ ! -z "$gtk_cflags" ]]; then
86	+if [ ! -z "$gtk_cflags" ]; then
87	echo "EXTRA_CFLAGS+=-D_USE_GTK -D_USE_BROWSE" >> config.make
88	echo "EXTRA_CFLAGS+=\$(shell $gtk_cflags)" >> config.make
89	echo "EXTRA_LDFLAGS+=\$(shell $gtk_libs)" >> config.make
90	fi
91	-if [[ -z "$zlib_cflags" ]]; then
92	+if [ -z "$zlib_cflags" ]; then
93	echo "SUBDIRS=src/zlib" >> config.make
94	echo "ZLIB_CFLAGS=-I../zlib" >> config.make
95	echo "ZLIB_LFLAGS=../zlib/libz.a" >> config.make
96	@@ -169,26 +147,7 @@
97	echo "SDL_CFLAGS=\$(shell sdl-config --cflags)" >> config.make
98	echo "SDL_LFLAGS=\$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image" >> config.make
99	echo "ok"
100	-echo -n "Choose installation mode. Standalone(1) or system(2) [1]: "
101	-read ans
102	-if [ "x$ans" = "x1" -o "x$ans" = "x" ]; then
103	- echo " * Standalone version"
104	- rm -f Rules.make
105	- ln -sf Rules.make.standalone Rules.make
106	- rm -f sdl-instead
107	- ln -sf src/sdl-instead/sdl-instead sdl-instead
108	- echo "Ok. We are ready to build. Use these commands:"
109	- echo " \$ make"
110	- echo " \$ ./sdl-instead"
111	-elif [ "x$ans" = "x2" ]; then
112	- echo -n "Enter prefix path [/usr/local]: "
113	- read ans
114	-
115	- if [ "x$ans" = "x" ]; then
116	- prefix="/usr/local"
117	- else
118	- prefix="$ans"
119	- fi
120	+ prefix="port_install_prefix"
121
122	rm -f Rules.make
123	ln -s Rules.make.system Rules.make
124	@@ -204,16 +163,12 @@
125	echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make
126	echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make
127	echo "LANGPATH=\$(DATAPATH)/lang" >> config.make
128	- echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make
129	+ echo "MANPATH=\$(DESTDIR)\$(PREFIX)/man/man6" >> config.make
130
131	echo "Ok. We are ready to build and install. Use these commands:"
132	echo " \$ make"
133	echo " \$ sudo make install"
134	echo " \$ sdl-instead"
135	-else
136	- echo "Huh!!! Wrong answer."
137	- exit 1
138	-fi
139
140	echo " Enjoy..."
141

Added Link Here

(-)files/patch-configure.sh (+66 lines)
1	--- configure.sh.orig 2012-02-09 18:55:00.127534293 +0400
2	+++ configure.sh 2012-02-09 18:58:52.803532634 +0400
3	@@ -131,14 +131,14 @@
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
23	echo "SDL_LFLAGS=\$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image" >> config.make
24	echo "ok"
25	-echo -n "Choose installation mode. Standalone(1) or system(2) [1]: "
26	-read ans
27	-if [ "x$ans" = "x1" -o "x$ans" = "x" ]; then
28	- echo " * Standalone version"
29	- rm -f Rules.make
30	- ln -sf Rules.make.standalone Rules.make
31	- rm -f sdl-instead
32	- ln -sf src/sdl-instead/sdl-instead sdl-instead
33	- echo "Ok. We are ready to build. Use these commands:"
34	- echo " \$ make"
35	- echo " \$ ./sdl-instead"
36	-elif [ "x$ans" = "x2" ]; then
37	- echo -n "Enter prefix path [/usr/local]: "
38	- read ans
39	-
40	- if [ "x$ans" = "x" ]; then
41	- prefix="/usr/local"
42	- else
43	- prefix="$ans"
44	- fi
45	+ prefix="$PREFIX"
46
47	rm -f Rules.make
48	ln -s Rules.make.system Rules.make
49	@@ -218,16 +199,12 @@
50	echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make
51	echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make
52	echo "LANGPATH=\$(DATAPATH)/lang" >> config.make
53	- echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make
54	+ echo "MANPATH=\$(DESTDIR)\$(PREFIX)/man/man6" >> config.make
55
56	echo "Ok. We are ready to build and install. Use these commands:"
57	echo " \$ make"
58	echo " \$ sudo make install"
59	echo " \$ sdl-instead"
60	-else
61	- echo "Huh!!! Wrong answer."
62	- exit 1
63	-fi
64
65	echo " Enjoy..."
66