kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 1.6.2

Browse source 
PR:		164944
Submitted by:	myself
Approved by:	maintainer timeout
This commit is contained in:
Dmitry Marakasov 2012-02-22 21:43:33 +00:00
parent e90d7fb4ae
commit 50360cb392
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=292085
5 changed files with 86 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
games/instead/Makefile
View file

@ -5,11 +5,10 @@
# $FreeBSD$
PORTNAME= instead
PORTVERSION= 1.5.0
PORTREVISION= 1
PORTVERSION= 1.6.2
CATEGORIES= games
MASTER_SITES= GOOGLE_CODE \
http://209.44.102.205/FreeBSD/distfiles/
http://mirror.amdmi3.ru/distfiles/
DISTNAME= instead_${PORTVERSION}
MAINTAINER= neuroworker@gmail.com
@ -23,15 +22,15 @@ USE_SDL= sdl image ttf mixer
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

4
games/instead/distinfo
View file

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

141
games/instead/files/patch-configure
View file

@ -1,141 +0,0 @@
--- 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..."

66
games/instead/files/patch-configure.sh Normal file
View file

@ -0,0 +1,66 @@
--- 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..."

26
games/instead/pkg-plist
View file

@ -1,19 +1,19 @@
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/main.lua
%%DATADIR%%/games/tutorial3/main-ua.lua
%%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
@ -23,7 +23,6 @@ share/applications/instead.desktop
%%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
@ -40,6 +39,7 @@ share/applications/instead.desktop
%%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
@ -72,10 +72,10 @@ share/applications/instead.desktop
%%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
@ -85,7 +85,9 @@ share/applications/instead.desktop
%%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