From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 9 21:50:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E339106566C for ; Thu, 9 Feb 2012 21:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 610A28FC16 for ; Thu, 9 Feb 2012 21:50:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q19LoAod044494 for ; Thu, 9 Feb 2012 21:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q19LoApi044493; Thu, 9 Feb 2012 21:50:10 GMT (envelope-from gnats) Resent-Date: Thu, 9 Feb 2012 21:50:10 GMT Resent-Message-Id: <201202092150.q19LoApi044493@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBE421065670 for ; Thu, 9 Feb 2012 21:44:53 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.116.57]) by mx1.freebsd.org (Postfix) with ESMTP id 608C68FC14 for ; Thu, 9 Feb 2012 21:44:52 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.76) (envelope-from ) id 1Rvbn3-0003F4-O7; Fri, 10 Feb 2012 01:44:29 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 5D023B84D; Fri, 10 Feb 2012 01:44:29 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 4F61EB0D; Fri, 10 Feb 2012 01:44:29 +0400 (MSK) Message-Id: <20120209214429.4F61EB0D@hades.panopticon> Date: Fri, 10 Feb 2012 01:44:29 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: neuroworker@gmail.com Subject: ports/164944: [PATCH] games/instead: update to 1.6.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2012 21:50:10 -0000 >Number: 164944 >Category: ports >Synopsis: [PATCH] games/instead: update to 1.6.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Feb 09 21:50:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 10 01:33:18 MSK 2012 >Description: - Update to 1.6.2 Added file(s): - files/patch-configure.sh Removed file(s): - files/patch-configure Port maintainer (neuroworker@gmail.com) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- instead-1.6.2.patch begins here --- Index: Makefile =================================================================== RCS file: /usr/home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/games/instead/Makefile,v retrieving revision 1.3 diff -u -u -r1.3 Makefile --- Makefile 30 Aug 2011 20:21:32 -0000 1.3 +++ Makefile 9 Feb 2012 21:42:51 -0000 @@ -5,7 +5,7 @@ # $FreeBSD: ports/games/instead/Makefile,v 1.3 2011/08/30 20:21:32 pawel Exp $ PORTNAME= instead -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.2 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://209.44.102.205/FreeBSD/distfiles/ @@ -22,15 +22,15 @@ 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 Index: distinfo =================================================================== RCS file: /usr/home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/games/instead/distinfo,v retrieving revision 1.2 diff -u -u -r1.2 distinfo --- distinfo 30 Aug 2011 20:21:32 -0000 1.2 +++ distinfo 9 Feb 2012 14:16:10 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /usr/home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/games/instead/pkg-plist,v retrieving revision 1.2 diff -u -u -r1.2 pkg-plist --- pkg-plist 30 Aug 2011 20:21:32 -0000 1.2 +++ pkg-plist 9 Feb 2012 15:00:25 -0000 @@ -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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- files/patch-configure 30 Aug 2011 20:21:32 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 --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..." - Index: files/patch-configure.sh =================================================================== RCS file: files/patch-configure.sh diff -N files/patch-configure.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure.sh 9 Feb 2012 14:58:54 -0000 @@ -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..." + --- instead-1.6.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: