- Move highscores to /var/games

- Drop unneeded flags
- Switch to options helpers
- Regenerate patches
- Fix binary permissings for highscores to properly work

6 files changed, 26 insertions, 30 deletions

diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 40288dab6298..ea9a8ff780e1 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -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}
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--localstatedir=/var/games
 
 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}
 
diff --git a/games/gtkballs/files/patch-src__game.c b/games/gtkballs/files/patch-src__game.c
index e3bea5246afe..d1ff9d8d2b72 100644
--- a/games/gtkballs/files/patch-src__game.c
+++ b/games/gtkballs/files/patch-src__game.c
@@ -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;) {
diff --git a/games/gtkballs/files/patch-src__gtkballs.c b/games/gtkballs/files/patch-src__gtkballs.c
index ec80167af98e..6267760f6d52 100644
--- a/games/gtkballs/files/patch-src__gtkballs.c
+++ b/games/gtkballs/files/patch-src__gtkballs.c
@@ -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);
diff --git a/games/gtkballs/files/patch-src__gtkutils.c b/games/gtkballs/files/patch-src__gtkutils.c
index d8dabeb35be2..5ebb1c21f8ef 100644
--- a/games/gtkballs/files/patch-src__gtkutils.c
+++ b/games/gtkballs/files/patch-src__gtkutils.c
@@ -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) {
diff --git a/games/gtkballs/files/patch-src__savegame.c b/games/gtkballs/files/patch-src__savegame.c
index e1ad7bc3d890..fc144a7898ba 100644
--- a/games/gtkballs/files/patch-src__savegame.c
+++ b/games/gtkballs/files/patch-src__savegame.c
@@ -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 ! */
diff --git a/games/gtkballs/pkg-plist b/games/gtkballs/pkg-plist
index 91072ea54709..a5f830037401 100644
--- a/games/gtkballs/pkg-plist
+++ b/games/gtkballs/pkg-plist
@@ -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