5 files changed, 118 insertions, 67 deletions

diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 9d692b94e5e0..aa76b491ca91 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -6,30 +6,32 @@
 #
 
 PORTNAME=	gtkballs
-PORTVERSION=	1.04
+PORTVERSION=	2.0.1
 CATEGORIES=	games
-MASTER_SITES=	http://gtkballs.antex.ru/dist/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	games/strategy
+MASTER_SITES=	http://gtkballs.antex.ru/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_GTK=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=${DATADIR}
 
-MAN6=		gtkballs.6
+MAN6=		gtkballs.6x
 
-do-install:
-	${INSTALL_PROGRAM} -m 2755 -o root -g games ${WRKSRC}/gtkballs ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/gtkballs.6 ${PREFIX}/man/man6
-	@${MKDIR} ${PREFIX}/share/gtkballs
-	${INSTALL_DATA} ${WRKSRC}/gtkballs-data/*.xpm ${PREFIX}/share/gtkballs
-	${INSTALL_DATA} ${WRKSRC}/score ${PREFIX}/share/gtkballs/score
-	@${CHMOD} g+rw ${PREFIX}/share/gtkballs/score
-	@${CHOWN} root:games ${PREFIX}/share/gtkballs/score
+post-patch:
+	@${PERL} -pi -e 's|^install-data-local|#install-data-local|g' \
+		${WRKSRC}/Makefile.in
+
+post-install:
+	${CHMOD} 2755 ${PREFIX}/bin/gtkballs
+	${CHOWN} root:games ${PREFIX}/bin/gtkballs
+	${CHMOD} 0666 ${DATADIR}/gtkballs-scores
+	${CHOWN} root:games ${DATADIR}/gtkballs-scores
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/gtkballs
+	@${MKDIR} ${DOCSDIR}
 .for file in README README.russian TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtkballs
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/games/gtkballs/distinfo b/games/gtkballs/distinfo
index a8ba60165d18..d1cee93a17ea 100644
--- a/games/gtkballs/distinfo
+++ b/games/gtkballs/distinfo
@@ -1 +1 @@
-MD5 (gtkballs-1.04.tar.gz) = 362bd7fc8c1196787c832581d478f7cf
+MD5 (gtkballs-2.0.1.tar.gz) = c0ed8d05c84b9cdfdb3d892567861fa3
diff --git a/games/gtkballs/files/patch-aa b/games/gtkballs/files/patch-aa
deleted file mode 100644
index 61497e164496..000000000000
--- a/games/gtkballs/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	Tue Mar 30 21:30:09 1999
-+++ Makefile	Wed Mar 29 21:10:12 2000
-@@ -6,15 +6,14 @@
- #
- # Installation prefix
- #
--PREFIX=/usr/local
-+PREFIX?=/usr/local
- 
- #
- # C options
- #
--CFLAGS = -Wall -pedantic -g
- CFLAGS+= -DPREFIX=\"$(PREFIX)\"
--CFLAGS+= `gtk-config --cflags` 
--CLIBS= `gtk-config --libs`
-+CFLAGS+= `${GTK_CONFIG} --cflags` 
-+CLIBS= `${GTK_CONFIG} --libs`
- 
- RM=rm -f
- PROGS=gtkballs
diff --git a/games/gtkballs/files/patch-src:gtkballs.c b/games/gtkballs/files/patch-src:gtkballs.c
new file mode 100644
index 000000000000..bb1a7d11cbe6
--- /dev/null
+++ b/games/gtkballs/files/patch-src:gtkballs.c
@@ -0,0 +1,12 @@
+$FreeBSD$
+
+--- src/gtkballs.c.orig	Wed Oct 10 01:11:10 2001
++++ src/gtkballs.c	Thu Oct 11 04:20:16 2001
+@@ -471,6 +471,7 @@
+         }
+   	new_turn(5);
+ 
++	setregid(getegid(), -1);
+   	gtk_init(&argc, &argv);
+ 
+   	main_window=gtk_widget_new(gtk_window_get_type(),
diff --git a/games/gtkballs/pkg-plist b/games/gtkballs/pkg-plist
index 3c15fb7af68d..110e5364d150 100644
--- a/games/gtkballs/pkg-plist
+++ b/games/gtkballs/pkg-plist
@@ -1,32 +1,90 @@
 bin/gtkballs
-share/doc/gtkballs/README
-share/doc/gtkballs/README.russian
-share/doc/gtkballs/TODO
-share/gtkballs/blue_ball.xpm
-share/gtkballs/brown_ball.xpm
-share/gtkballs/cyan_ball.xpm
-share/gtkballs/empty_cell.xpm
-share/gtkballs/green_ball.xpm
-share/gtkballs/gtkballs.xpm
-share/gtkballs/gtkballs_about.xpm
-share/gtkballs/paw_down_1.xpm
-share/gtkballs/paw_down_2.xpm
-share/gtkballs/paw_left_1.xpm
-share/gtkballs/paw_left_2.xpm
-share/gtkballs/paw_right_1.xpm
-share/gtkballs/paw_right_2.xpm
-share/gtkballs/paw_up_1.xpm
-share/gtkballs/paw_up_2.xpm
-share/gtkballs/pink_ball.xpm
-share/gtkballs/red_ball.xpm
-share/gtkballs/score
-share/gtkballs/small_blue_ball.xpm
-share/gtkballs/small_brown_ball.xpm
-share/gtkballs/small_cyan_ball.xpm
-share/gtkballs/small_green_ball.xpm
-share/gtkballs/small_pink_ball.xpm
-share/gtkballs/small_red_ball.xpm
-share/gtkballs/small_yellow_ball.xpm
-share/gtkballs/yellow_ball.xpm
-@dirrm share/doc/gtkballs
+%%PORTDOCS%%share/doc/gtkballs/README
+%%PORTDOCS%%share/doc/gtkballs/README.russian
+%%PORTDOCS%%share/doc/gtkballs/TODO
+share/gtkballs/gtkballs-logo.xpm
+share/gtkballs/gtkballs-scores
+share/gtkballs/gtkballs_16x16.xpm
+share/gtkballs/themes/Default/blue_ball.xpm
+share/gtkballs/themes/Default/blue_ball1.xpm
+share/gtkballs/themes/Default/brown_ball.xpm
+share/gtkballs/themes/Default/cyan_ball.xpm
+share/gtkballs/themes/Default/empty_cell.xpm
+share/gtkballs/themes/Default/green_ball.xpm
+share/gtkballs/themes/Default/paw_down.xpm
+share/gtkballs/themes/Default/paw_down_left.xpm
+share/gtkballs/themes/Default/paw_down_right.xpm
+share/gtkballs/themes/Default/paw_left.xpm
+share/gtkballs/themes/Default/paw_right.xpm
+share/gtkballs/themes/Default/paw_up.xpm
+share/gtkballs/themes/Default/paw_up_left.xpm
+share/gtkballs/themes/Default/paw_up_right.xpm
+share/gtkballs/themes/Default/pink_ball.xpm
+share/gtkballs/themes/Default/red_ball.xpm
+share/gtkballs/themes/Default/small_blue_ball.xpm
+share/gtkballs/themes/Default/small_brown_ball.xpm
+share/gtkballs/themes/Default/small_cyan_ball.xpm
+share/gtkballs/themes/Default/small_empty_cell.xpm
+share/gtkballs/themes/Default/small_green_ball.xpm
+share/gtkballs/themes/Default/small_pink_ball.xpm
+share/gtkballs/themes/Default/small_red_ball.xpm
+share/gtkballs/themes/Default/small_yellow_ball.xpm
+share/gtkballs/themes/Default/yellow_ball.xpm
+share/gtkballs/themes/Skull/blue_ball.xpm
+share/gtkballs/themes/Skull/brown_ball.xpm
+share/gtkballs/themes/Skull/cyan_ball.xpm
+share/gtkballs/themes/Skull/empty_cell.xpm
+share/gtkballs/themes/Skull/green_ball.xpm
+share/gtkballs/themes/Skull/paw_down.xpm
+share/gtkballs/themes/Skull/paw_down_left.xpm
+share/gtkballs/themes/Skull/paw_down_right.xpm
+share/gtkballs/themes/Skull/paw_left.xpm
+share/gtkballs/themes/Skull/paw_right.xpm
+share/gtkballs/themes/Skull/paw_up.xpm
+share/gtkballs/themes/Skull/paw_up_left.xpm
+share/gtkballs/themes/Skull/paw_up_right.xpm
+share/gtkballs/themes/Skull/pink_ball.xpm
+share/gtkballs/themes/Skull/red_ball.xpm
+share/gtkballs/themes/Skull/small_blue_ball.xpm
+share/gtkballs/themes/Skull/small_brown_ball.xpm
+share/gtkballs/themes/Skull/small_cyan_ball.xpm
+share/gtkballs/themes/Skull/small_empty_cell.xpm
+share/gtkballs/themes/Skull/small_green_ball.xpm
+share/gtkballs/themes/Skull/small_pink_ball.xpm
+share/gtkballs/themes/Skull/small_red_ball.xpm
+share/gtkballs/themes/Skull/small_yellow_ball.xpm
+share/gtkballs/themes/Skull/yellow_ball.xpm
+share/gtkballs/themes/small/blue_ball.xpm
+share/gtkballs/themes/small/brown_ball.xpm
+share/gtkballs/themes/small/cyan_ball.xpm
+share/gtkballs/themes/small/empty_cell.xpm
+share/gtkballs/themes/small/green_ball.xpm
+share/gtkballs/themes/small/paw_down.xpm
+share/gtkballs/themes/small/paw_down_left.xpm
+share/gtkballs/themes/small/paw_down_right.xpm
+share/gtkballs/themes/small/paw_left.xpm
+share/gtkballs/themes/small/paw_right.xpm
+share/gtkballs/themes/small/paw_up.xpm
+share/gtkballs/themes/small/paw_up_left.xpm
+share/gtkballs/themes/small/paw_up_right.xpm
+share/gtkballs/themes/small/pink_ball.xpm
+share/gtkballs/themes/small/red_ball.xpm
+share/gtkballs/themes/small/small_blue_ball.xpm
+share/gtkballs/themes/small/small_brown_ball.xpm
+share/gtkballs/themes/small/small_cyan_ball.xpm
+share/gtkballs/themes/small/small_empty_cell.xpm
+share/gtkballs/themes/small/small_green_ball.xpm
+share/gtkballs/themes/small/small_pink_ball.xpm
+share/gtkballs/themes/small/small_red_ball.xpm
+share/gtkballs/themes/small/small_yellow_ball.xpm
+share/gtkballs/themes/small/yellow_ball.xpm
+share/locale/de/LC_MESSAGES/gtkballs.mo
+share/locale/fr/LC_MESSAGES/gtkballs.mo
+share/locale/pl/LC_MESSAGES/gtkballs.mo
+share/locale/ru/LC_MESSAGES/gtkballs.mo
+@dirrm share/gtkballs/themes/small
+@dirrm share/gtkballs/themes/Skull
+@dirrm share/gtkballs/themes/Default
+@dirrm share/gtkballs/themes
 @dirrm share/gtkballs
+%%PORTDOCS%%@dirrm share/doc/gtkballs