From owner-svn-ports-head@freebsd.org Wed Dec 13 09:00:35 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F078E96B9D; Wed, 13 Dec 2017 09:00:35 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1603568705; Wed, 13 Dec 2017 09:00:35 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBD90YnR064489; Wed, 13 Dec 2017 09:00:34 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBD90XEH064483; Wed, 13 Dec 2017 09:00:33 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712130900.vBD90XEH064483@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 13 Dec 2017 09:00:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456199 - in head/games/gtkballs: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/gtkballs: . files X-SVN-Commit-Revision: 456199 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Dec 2017 09:00:35 -0000 Author: amdmi3 Date: Wed Dec 13 09:00:33 2017 New Revision: 456199 URL: https://svnweb.freebsd.org/changeset/ports/456199 Log: - Move highscores to /var/games - Drop unneeded flags - Switch to options helpers - Regenerate patches - Fix binary permissings for highscores to properly work Modified: head/games/gtkballs/Makefile head/games/gtkballs/files/patch-src__game.c head/games/gtkballs/files/patch-src__gtkballs.c head/games/gtkballs/files/patch-src__gtkutils.c head/games/gtkballs/files/patch-src__savegame.c head/games/gtkballs/pkg-plist Modified: head/games/gtkballs/Makefile ============================================================================== --- head/games/gtkballs/Makefile Wed Dec 13 09:00:29 2017 (r456198) +++ head/games/gtkballs/Makefile Wed Dec 13 09:00:33 2017 (r456199) @@ -3,7 +3,7 @@ PORTNAME= gtkballs PORTVERSION= 3.1.5 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= http://gtkballs.antex.ru/dist/ @@ -16,26 +16,26 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${DATADIR} +CONFIGURE_ARGS= --localstatedir=/var/games -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - PORTDOCS= AUTHORS ChangeLog NEWS README README.russian +DESKTOP_ENTRIES="GtkBalls" "" ${PORTNAME} \ + "${PORTNAME}" "Game;ArcadeGame;" "" + OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -DESKTOP_ENTRIES="GtkBalls" "" ${PORTNAME} \ - "${PORTNAME}" "Game;ArcadeGame;" "" - post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-gtkballs.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + ${MV} ${STAGEDIR}/var/games/gtkballs-scores \ + ${STAGEDIR}/var/games/gtkballs-scores.sample +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/games/gtkballs/files/patch-src__game.c ============================================================================== --- head/games/gtkballs/files/patch-src__game.c Wed Dec 13 09:00:29 2017 (r456198) +++ head/games/gtkballs/files/patch-src__game.c Wed Dec 13 09:00:33 2017 (r456199) @@ -1,6 +1,6 @@ ---- ./src/game.c.orig 2004-10-06 13:06:46.000000000 +0200 -+++ ./src/game.c 2014-03-30 20:05:17.338033553 +0200 -@@ -406,7 +406,8 @@ +--- src/game.c.orig 2004-10-06 11:06:46 UTC ++++ src/game.c +@@ -406,7 +406,8 @@ gint game_destroy_lines(gboolean count_s for(i = 1; i < rules_get_width() - x && board_get_at_xy(x + i, y) == board_get_at_xy(x, y); @@ -10,7 +10,7 @@ if(i >= rules_get_destroy()) { have_del = 1; for(j = 0; j < i; j ++) { -@@ -419,7 +420,8 @@ +@@ -419,7 +420,8 @@ gint game_destroy_lines(gboolean count_s for(i = 1; i < rules_get_height() - y && board_get_at_xy(x, y + i) == board_get_at_xy(x, y); @@ -20,7 +20,7 @@ if(i >= rules_get_destroy()) { have_del = 1; for(j = 0; j < i; j ++) { -@@ -434,7 +436,8 @@ +@@ -434,7 +436,8 @@ gint game_destroy_lines(gboolean count_s i < rules_get_width() - x && i < rules_get_height() - y && board_get_at_xy(x + i, y + i) == board_get_at_xy(x, y); @@ -30,7 +30,7 @@ if(i >= rules_get_destroy()) { have_del = 1; for(j = 0; j < i; j ++) { -@@ -449,7 +452,8 @@ +@@ -449,7 +452,8 @@ gint game_destroy_lines(gboolean count_s i <= x && i < rules_get_height() - y && board_get_at_xy(x - i, y + i) == board_get_at_xy(x, y); @@ -40,7 +40,7 @@ if(i >= rules_get_destroy()) { have_del = 1; for(j = 0; j < i; j ++) { -@@ -495,8 +499,8 @@ +@@ -495,8 +499,8 @@ gint game_destroy_lines(gboolean count_s lock_actions(1); draw_board(); for(animtime = 0, i = 0; i < animcadres;) { Modified: head/games/gtkballs/files/patch-src__gtkballs.c ============================================================================== --- head/games/gtkballs/files/patch-src__gtkballs.c Wed Dec 13 09:00:29 2017 (r456198) +++ head/games/gtkballs/files/patch-src__gtkballs.c Wed Dec 13 09:00:33 2017 (r456199) @@ -1,6 +1,6 @@ ---- ./src/gtkballs.c.orig 2004-02-06 14:51:54.000000000 +0100 -+++ ./src/gtkballs.c 2014-03-30 20:05:17.338033553 +0200 -@@ -123,7 +123,7 @@ +--- src/gtkballs.c.orig 2004-02-06 13:51:54 UTC ++++ src/gtkballs.c +@@ -123,7 +123,7 @@ int main(int argc, char **argv) { #ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); Modified: head/games/gtkballs/files/patch-src__gtkutils.c ============================================================================== --- head/games/gtkballs/files/patch-src__gtkutils.c Wed Dec 13 09:00:29 2017 (r456198) +++ head/games/gtkballs/files/patch-src__gtkutils.c Wed Dec 13 09:00:33 2017 (r456199) @@ -1,6 +1,6 @@ ---- ./src/gtkutils.c.orig 2003-05-26 15:34:38.000000000 +0200 -+++ ./src/gtkutils.c 2014-03-30 20:05:17.338033553 +0200 -@@ -112,14 +112,14 @@ +--- src/gtkutils.c.orig 2003-05-26 13:34:38 UTC ++++ src/gtkutils.c +@@ -112,14 +112,14 @@ GtkWidget *ut_spin_button_start_new(gcha /* shows simple message box */ void ut_simple_message_box(gchar *message) { Modified: head/games/gtkballs/files/patch-src__savegame.c ============================================================================== --- head/games/gtkballs/files/patch-src__savegame.c Wed Dec 13 09:00:29 2017 (r456198) +++ head/games/gtkballs/files/patch-src__savegame.c Wed Dec 13 09:00:33 2017 (r456199) @@ -1,6 +1,6 @@ ---- ./src/savegame.c.orig 2003-05-21 18:06:05.000000000 +0200 -+++ ./src/savegame.c 2014-03-30 20:05:17.338033553 +0200 -@@ -166,7 +166,7 @@ +--- src/savegame.c.orig 2003-05-21 16:06:05 UTC ++++ src/savegame.c +@@ -166,7 +166,7 @@ gchar *save_game(gchar *rules, gint scor if((f = fopen(fname, "w")) != NULL) { chmod(fname, 0600); /* TODO: check for errors ! */ Modified: head/games/gtkballs/pkg-plist ============================================================================== --- head/games/gtkballs/pkg-plist Wed Dec 13 09:00:29 2017 (r456198) +++ head/games/gtkballs/pkg-plist Wed Dec 13 09:00:33 2017 (r456199) @@ -1,12 +1,7 @@ -bin/gtkballs +@(,games,2555) bin/gtkballs man/man6/gtkballs.6x.gz %%DATADIR%%/COPYING %%DATADIR%%/gtkballs-logo.png -@group games -@mode 664 -%%DATADIR%%/gtkballs-scores -@mode -@group %%DATADIR%%/gtkballs_16x16.png %%DATADIR%%/themes/5balls-Big/blue.xpm %%DATADIR%%/themes/5balls-Big/blue_destroy1.xpm @@ -533,3 +528,4 @@ man/man6/gtkballs.6x.gz %%NLS%%share/locale/pl/LC_MESSAGES/gtkballs.mo %%NLS%%share/locale/ru/LC_MESSAGES/gtkballs.mo share/pixmaps/gtkballs.png +@sample(,games,664) /var/games/gtkballs-scores.sample