From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 25 18:10:12 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 BA0E6106564A for ; Wed, 25 Jul 2012 18:10:12 +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 8F04A8FC38 for ; Wed, 25 Jul 2012 18:10:12 +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 q6PIABMW060753 for ; Wed, 25 Jul 2012 18:10:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6PIABkl060752; Wed, 25 Jul 2012 18:10:11 GMT (envelope-from gnats) Resent-Date: Wed, 25 Jul 2012 18:10:11 GMT Resent-Message-Id: <201207251810.q6PIABkl060752@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B0F471065677 for ; Wed, 25 Jul 2012 18:01:34 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 599158FC24 for ; Wed, 25 Jul 2012 18:01:34 +0000 (UTC) Received: from localhost.localdomain (ZT029177.ppp.dion.ne.jp [59.128.29.177]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id 976BA50036 for ; Thu, 26 Jul 2012 03:01:30 +0900 (JST) Message-Id: <20120726024309.5ee2d329e31e33e6fcdb2588@yahoo.com> Date: Thu, 26 Jul 2012 02:43:09 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/170147: games/bastet: Update to version 0.43 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: Wed, 25 Jul 2012 18:10:12 -0000 >Number: 170147 >Category: ports >Synopsis: games/bastet: Update to version 0.43 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 25 18:10:11 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p9 i386 >Organization: >Environment: >Description: - Update to version 0.43 >How-To-Repeat: >Fix: diff -urN /usr/ports/games/bastet/Makefile games/bastet/Makefile --- /usr/ports/games/bastet/Makefile 2012-02-28 05:32:26.000000000 +0900 +++ games/bastet/Makefile 2012-07-07 04:57:23.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= bastet -PORTVERSION= 0.41 -PORTREVISION= 1 +PORTVERSION= 0.43 CATEGORIES= games MASTER_SITES= http://fph.altervista.org/prog/files/ EXTRACT_SUFX= .tgz @@ -15,7 +14,28 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An ncurses Tetris clone which is harder than every other Tetris +LICENSE= GPLv3 # (or later) + +LIB_DEPENDS= boost_program_options:${PORTSDIR}/devel/boost-libs + +USE_NCURSES= yes USE_GMAKE= yes -MAKE_ENV= DATADIR=${DATADIR} +MAKE_JOBS_SAFE= yes + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +MAN6= bastet.6 +PLIST_FILES= bin/bastet + +post-patch: + @${REINPLACE_CMD} -e \ + 's|^CXXFLAGS+=-D|CXXFLAGS+=$$(CPPFLAGS) -D| ; \ + s|$$(CXX) -MM|$$(CXX) $$(CPPFLAGS) -MM| ; \ + s| -ggdb | |' ${WRKSRC}/Makefile + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/bastet ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/bastet.6 ${MAN6PREFIX}/man/man6 .include diff -urN /usr/ports/games/bastet/distinfo games/bastet/distinfo --- /usr/ports/games/bastet/distinfo 2011-07-03 23:23:30.000000000 +0900 +++ games/bastet/distinfo 2012-07-07 04:30:29.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (bastet-0.41.tgz) = 32e58210499d4c525a2b2c82e08e1bbbc53de455b74922c94ac25a1fb7e17463 -SIZE (bastet-0.41.tgz) = 24195 +SHA256 (bastet-0.43.tgz) = e208c68684cc9b818a08b0d3f5f1e7ef381b1e4d8bc801a90b5ff6a8f00d8168 +SIZE (bastet-0.43.tgz) = 29115 diff -urN /usr/ports/games/bastet/files/patch-Makefile games/bastet/files/patch-Makefile --- /usr/ports/games/bastet/files/patch-Makefile 2004-10-22 03:57:58.000000000 +0900 +++ games/bastet/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,21 +0,0 @@ ---- Makefile.orig Tue Oct 19 19:54:58 2004 -+++ Makefile Thu Oct 21 20:43:02 2004 -@@ -1,8 +1,8 @@ - #makefile for bastet (c) 2004 Federico Poloni - - #default paths --BIN_PREFIX=/usr/bin/ --DATA_PREFIX=/var/games/ -+BIN_PREFIX=$(PREFIX)/bin/ -+DATA_PREFIX=$(PREFIX)/share/bastet/ - HISCORE=bastet.scores - - #in order to handle highscores properly, bastet must be setuid. -@@ -41,6 +41,7 @@ - cp $(EXNAME) $(BIN_PREFIX) - chown $(GAME_USER) $(BIN_PREFIX)$(EXNAME) - chmod u+s $(BIN_PREFIX)$(EXNAME) -+ mkdir -p $(DATA_PREFIX) - touch $(DATA_PREFIX)$(HISCORE) - chown $(GAME_USER) $(DATA_PREFIX)$(HISCORE) - chmod 644 $(DATA_PREFIX)$(HISCORE) diff -urN /usr/ports/games/bastet/files/patch-bast.c games/bastet/files/patch-bast.c --- /usr/ports/games/bastet/files/patch-bast.c 2004-10-22 03:57:58.000000000 +0900 +++ games/bastet/files/patch-bast.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- bast.c.orig Thu Oct 21 20:32:29 2004 -+++ bast.c Thu Oct 21 20:32:39 2004 -@@ -1,7 +1,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff -urN /usr/ports/games/bastet/files/patch-game.c games/bastet/files/patch-game.c --- /usr/ports/games/bastet/files/patch-game.c 2004-12-23 15:27:14.000000000 +0900 +++ games/bastet/files/patch-game.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,67 +0,0 @@ -diff -ru game.c bastet-0.41/game.c ---- game.c Sat Dec 18 00:28:00 2004 -+++ bastet-0.41/game.c Sat Dec 18 00:56:26 2004 -@@ -12,6 +12,9 @@ - #include "game.h" - #include "main.h" - #include "bast.h" -+#include -+ -+void bast_clear(); - - const DOT block_data[BLOCK_TYPES][BLOCK_ORIENTS][BLOCK_DOTS] = - { -@@ -66,7 +70,7 @@ - - /* Delay before block drop one step down (usec). - We start at one sec. and then decreases the delay by 23% at each level. */ --const int delay[NO_LEVELS] = {1000000, 770000, 593000, 457000, 352000, 271000, 208000, 160000, 124000, 95000}; -+const int delay[NO_LEVELS] = {999999, 770000, 593000, 457000, 352000, 271000, 208000, 160000, 124000, 95000}; - - /* Window in which the action takes place. */ - WINDOW *well_win; -@@ -278,6 +282,7 @@ - refresh(); - } - -+struct timeval mytimeout; - /* Drop a block in the well. When done return y-cord. of where block - ended. If it's not possible to even start with a new block return -1. */ - int drop_block(int type, int level) -@@ -288,14 +293,13 @@ - int orient = 0; - int ch; - fd_set inputs, test_fds; -- struct timeval timeout; - int sel_ret; - - if (0 == check_block_pos(y, x, type, orient)) - return -1; /* Oh no, game over. */ - -- timeout.tv_sec = 0; -- timeout.tv_usec = delay[level]; -+ mytimeout.tv_sec = 0; -+ mytimeout.tv_usec = delay[level]; - - FD_ZERO(&inputs); - FD_SET(0, &inputs); -@@ -308,7 +312,7 @@ - while(1) { - test_fds = inputs; - -- sel_ret = select(FD_SETSIZE, &test_fds, (fd_set *) 0, (fd_set *) 0, &timeout); -+ sel_ret = select(FD_SETSIZE, &test_fds, (fd_set *) 0, (fd_set *) 0, &mytimeout); - - ch = getch(); - -@@ -391,8 +402,8 @@ - set_block(y, x, type, orient); - return y; - } -- timeout.tv_sec = 0; -- timeout.tv_usec = delay[level]; -+ mytimeout.tv_sec = 0; -+ mytimeout.tv_usec = delay[level]; - } - } - } diff -urN /usr/ports/games/bastet/pkg-descr games/bastet/pkg-descr --- /usr/ports/games/bastet/pkg-descr 2004-10-22 10:18:55.000000000 +0900 +++ games/bastet/pkg-descr 2012-07-07 04:59:49.000000000 +0900 @@ -1,15 +1,13 @@ -Have you ever thought Tetris(R) was evil because it wouldn't send -you that straight "I" brick you needed in order to clear four rows -at the same time? +Have you ever thought Tetris(R) was evil because it wouldn't send you +that straight "I" brick you needed in order to clear four rows at the +same time? -Well Tetris(R) probably isn't evil, but Bastet -certainly is. Bastet stands for "bastard tetris", and is a -simple ncurses-based Tetris(R) clone for Linux. Unlike normal -Tetris(R), however, Bastet does not choose your next brick at random. -Instead, Bastet uses a special algorithm designed to choose the -worst brick possible. +Well Tetris(R) probably isn't evil, but Bastet certainly is. Bastet +stands for "bastard tetris", and is a simple ncurses-based Tetris(R) +clone for Linux. Unlike normal Tetris(R), however, Bastet does not +choose your next brick at random. Instead, Bastet uses a special +algorithm designed to choose the worst brick possible. -As you can imagine, playing Bastet can be a -very frustrating experience! +As you can imagine, playing Bastet can be a very frustrating experience! WWW: http://fph.altervista.org/prog/bastet.shtml diff -urN /usr/ports/games/bastet/pkg-plist games/bastet/pkg-plist --- /usr/ports/games/bastet/pkg-plist 2004-10-22 03:57:58.000000000 +0900 +++ games/bastet/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,3 +0,0 @@ -bin/bastet -%%DATADIR%%/bastet.scores -@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: