14 files changed, 542 insertions, 33 deletions

diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile
index fb7fa0969683..ae7b93b3cac2 100644
--- a/games/gtkpool/Makefile
+++ b/games/gtkpool/Makefile
@@ -7,24 +7,26 @@
 
 PORTNAME=	gtkpool
 PORTVERSION=	0.5.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
-MASTER_SITES=	http://gtkpool.seul.org/
+MASTER_SITES=	ftp://ftp.seul.org/pub/gtkpool/ \
+		http://www.sourcefiles.org/Games/Sports/Pool/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 2D pool game using the GTK+ toolkit
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-09-01
-
-GNU_CONFIGURE=	yes
-USE_GNOME=	gtk12
-USE_PERL5=	yes
-MAKE_JOBS_UNSAFE=	yes
+USE_GNOME=	gtk20
+USE_PERL5_BUILD=yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	aclocal automake autoheader autoconf
+ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	--add-missing
+MAKE_JOBS_SAFE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,-O2 -O0 -Wall `gtk-config --cflags` -lgtk -lgdk -lglib -lm -lX11,${CXXFLAGS} `gtk-config --cflags` `gtk-config --libs`,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,/usr/local/share/gtkpool,${DATADIR},' \
-		${WRKSRC}/gtkpool/application.cpp ${WRKSRC}/gtkpool/options.cpp
+.for file in application.cpp options.cpp
+	@${REINPLACE_CMD} -e 's|/usr/local/share/gtkpool|${DATADIR}|' \
+		${WRKSRC}/gtkpool/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/games/gtkpool/distinfo b/games/gtkpool/distinfo
index 53f57c1e3a35..1e822342528f 100644
--- a/games/gtkpool/distinfo
+++ b/games/gtkpool/distinfo
@@ -1,2 +1,4 @@
 SHA256 (gtkpool-0.5.0.tar.gz) = d6e283fd5c376e38a71950d0834613d50f03de565c32929880a965b601e9aec5
 SIZE (gtkpool-0.5.0.tar.gz) = 636226
+SHA256 (gtkpool_0.5.0-9.diff.gz) = 312e502d104ac70f5c52dc1449d2b06ff9c59685b262f8e72ee56c3b41d01e38
+SIZE (gtkpool_0.5.0-9.diff.gz) = 15335
diff --git a/games/gtkpool/files/patch-Makefile.am b/games/gtkpool/files/patch-Makefile.am
new file mode 100644
index 000000000000..d05c445f437f
--- /dev/null
+++ b/games/gtkpool/files/patch-Makefile.am
@@ -0,0 +1,35 @@
+--- Makefile.am.orig	2002-08-16 07:27:30.000000000 +0900
++++ Makefile.am	2011-08-19 04:51:34.000000000 +0900
+@@ -1,30 +1,7 @@
+-####### kdevelop will overwrite this part!!! (begin)##########
+-
+ SUBDIRS = gtkpool 
+ 
+-EXTRA_DIST = gtkpool.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO gtkpool.lsm gtkpool.spec 
++EXTRA_DIST = config.rpath  gtkpool.kdevprj AUTHORS COPYING ChangeLog INSTALL README TODO gtkpool.lsm gtkpool.spec
+ 
+-####### kdevelop will overwrite this part!!! (end)############
+-# not a GNU package. You can remove this line, if
+-# have all needed files, that a GNU package needs
+ AUTOMAKE_OPTIONS = foreign
+ 
+-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
+-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
+-
+-$(top_srcdir)/subdirs:
+-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
+-
+-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
+-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
+-
+-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
+-
+-package-messages:
+-	$(MAKE) -f admin/Makefile.common package-messages
+-
+-dist-hook:
+-	cd $(top_distdir) && perl admin/am_edit -padmin
+-	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
+-
+-
++CXXFLAGS = 
diff --git a/games/gtkpool/files/patch-configure.in b/games/gtkpool/files/patch-configure.in
new file mode 100644
index 000000000000..4a9f2ead58ef
--- /dev/null
+++ b/games/gtkpool/files/patch-configure.in
@@ -0,0 +1,105 @@
+--- configure.in.orig	2002-08-16 07:27:48.000000000 +0900
++++ configure.in	2011-08-19 04:52:03.000000000 +0900
+@@ -1,95 +1,12 @@
+-dnl    This file is part of the KDE libraries/packages
+-dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
+-dnl                       modified by Walter Tasin (tasin@kdevelop.org)
+-dnl                       for c++ console applications
+-
+-dnl    This file is free software; you can redistribute it and/or
+-dnl    modify it under the terms of the GNU Library General Public
+-dnl    License as published by the Free Software Foundation; either
+-dnl    version 2 of the License, or (at your option) any later version.
+-
+-dnl    This library is distributed in the hope that it will be useful,
+-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-dnl    Library General Public License for more details.
+-
+-dnl    You should have received a copy of the GNU Library General Public License
+-dnl    along with this library; see the file COPYING.LIB.  If not, write to
+-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-dnl    Boston, MA 02111-1307, USA.
+-
+-# Original Author was Kalle@kde.org
+-# I lifted it in some mater. (Stephan Kulow)
+-# I used much code from Janos Farkas
+-
+-dnl Process this file with autoconf to produce a configure script.
+-
+-AC_INIT(acinclude.m4) dnl a source file from your sub dir
+-
+-dnl This is so we can use kde-common
+-AC_CONFIG_AUX_DIR(admin)
+-
+-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
+-unset CDPATH
+-
+-dnl Checking host/target/build systems, for make, install etc.
+-AC_CANONICAL_SYSTEM
+-dnl Perform program name transformation
+-AC_ARG_PROGRAM
+-
+-dnl Automake doc recommends to do this only here. (Janos)
+-AM_INIT_AUTOMAKE(gtkpool, 0.5.0) dnl searches for some needed programs
+-
+-dnl almost the same like KDE_SET_PEFIX but the path is /usr/local
+-dnl
+-unset CDPATH
+-dnl make /usr/local the default for the installation
++AC_INIT(gtkpool/main.cpp)
++AM_INIT_AUTOMAKE(gtkpool, 0.5.0)
++AM_MAINTAINER_MODE
+ AC_PREFIX_DEFAULT(/usr/local)
+-
+-if test "x$prefix" = "xNONE"; then
+-  prefix=$ac_default_prefix
+-  ac_configure_args="$ac_configure_args --prefix $prefix"
+-fi
+-KDE_FAST_CONFIGURE
+-KDE_CONF_FILES
+-
+-dnl without this order in this file, automake will be confused!
+-dnl
++AC_PROG_CXX
++AC_PROG_CPP
++AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(GTK+ version less than 2.0!))
+ AM_CONFIG_HEADER(config.h)
+-
+-dnl checks for programs.
+-dnl first check for c/c++ compilers
+-AC_CHECK_COMPILERS
+-dnl CXXFLAGS="-DHAVE_CONFIG_H -I. -I.. -O2 -O0 -g3 -Wall `gtk-config --cflags` -lgtk -lgdk -lglib -lm -lX11 $USE_EXCEPTIONS"
+-CXXFLAGS="-DHAVE_CONFIG_H -I. -I.. -O2 -O0 -Wall `gtk-config --cflags` -lgtk -lgdk -lglib -lm -lX11 $USE_EXCEPTIONS"
+-
+-dnl create only shared libtool-libraries
+-AC_ENABLE_SHARED(yes)
+-
+-dnl set the following to yes, if you want to create static
+-dnl libtool-libraries, too.
+-AC_ENABLE_STATIC(no)
+-
+-dnl create a working libtool-script
+-KDE_PROG_LIBTOOL
+-
+-dnl activate the next macro call for DLOPEN tests and setting LIBDL
+-dnl   (n.b. KDE_MISC_TESTS does the same to you, so use either this or the next one)
+-KDE_CHECK_DLOPEN
+-
+-dnl activate the next macro call for some additional tests
+-dnl   (compat, crypt, socket, nsl, dlopen, ...)
+-dnl KDE_MISC_TESTS
+-
+-KDE_CHECK_EXTRA_LIBS
+-all_libraries="$all_libraries $USER_LDFLAGS"
+-all_includes="$all_includes $USER_INCLUDES"
+-AC_SUBST(all_includes)
+-AC_SUBST(all_libraries)
+-
+-AC_SUBST(AUTODIRS)
+-
+-KDE_CREATE_SUBDIRSLIST
++AC_SUBST(CXXFLAGS)
+ AC_OUTPUT( \
+ ./Makefile \
+ gtkpool/Makefile \
diff --git a/games/gtkpool/files/patch-gtkpool__Makefile.am b/games/gtkpool/files/patch-gtkpool__Makefile.am
new file mode 100644
index 000000000000..88bf058ead71
--- /dev/null
+++ b/games/gtkpool/files/patch-gtkpool__Makefile.am
@@ -0,0 +1,30 @@
+--- gtkpool/Makefile.am.orig	2002-08-16 07:27:30.000000000 +0900
++++ gtkpool/Makefile.am	2011-08-19 04:52:03.000000000 +0900
+@@ -1,4 +1,3 @@
+-####### kdevelop will overwrite this part!!! (begin)##########
+ bin_PROGRAMS = gtkpool
+ gtkpool_SOURCES = moving.cpp game.cpp indentify_ball.cpp support.cpp ball.cpp circle.cpp point2d.cpp vec2d.cpp options.cpp sound.cpp check_pocket.cpp pointer_selects.cpp draw_ball.cpp apply_friction.cpp move_balls.cpp check_table_collision.cpp connectdialog.cpp application.cpp main.cpp 
+ gtkpool_LDADD   = 
+@@ -8,16 +7,12 @@
+ EXTRA_DIST = main.cpp application.cpp application.h connectdialog.cpp connectdialog.h check_table_collision.cpp check_table_collision.h move_balls.cpp move_balls.h apply_friction.cpp apply_friction.h draw_ball.cpp draw_ball.h pointer_selects.cpp pointer_selects.h check_pocket.cpp check_pocket.h sound.cpp sound.h options.h options.cpp vec2d.cpp vec2d.h point2d.cpp point2d.h circle.cpp circle.h ball.cpp ball.h support.h support.cpp pixmaps indentify_ball.cpp indentify_ball.h game.cpp game.h moving.h moving.cpp lo32-app-gtkpool.png 
+ 
+ install-data-local:
+-	$(mkinstalldirs) ${datadir}/icons/
+-	$(INSTALL_DATA) $(srcdir)/lo32-app-gtkpool.png ${datadir}/icons/gtkpool.png
++	$(mkinstalldirs) ${DESTDIR}${datadir}/icons/
++	$(INSTALL_DATA) $(srcdir)/lo32-app-gtkpool.png ${DESTDIR}${datadir}/icons/gtkpool.png
+ 
+ uninstall-local:
+-	-rm -f ${datadir}/icons/gtkpool.png
++	rm -f ${datadir}/icons/gtkpool.png
+ 
+-####### kdevelop will overwrite this part!!! (end)############
+-# set the include path found by configure
+-INCLUDES= $(all_includes)
+- 
+-# the library search path.
+-gtkpool_LDFLAGS = $(all_libraries) 
+-                                                                                
++AM_CXXFLAGS = @GTK_CFLAGS@
++
++gtkpool_LDADD += @GTK_LIBS@
diff --git a/games/gtkpool/files/patch-gtkpool__check_pocket.h b/games/gtkpool/files/patch-gtkpool__check_pocket.h
new file mode 100644
index 000000000000..7d8d0416492f
--- /dev/null
+++ b/games/gtkpool/files/patch-gtkpool__check_pocket.h
@@ -0,0 +1,10 @@
+--- gtkpool/check_pocket.h.orig	2002-07-29 09:56:57.000000000 +0900
++++ gtkpool/check_pocket.h	2011-08-19 04:36:39.000000000 +0900
+@@ -17,7 +17,6 @@
+ 
+ #ifndef CHECK_POCKET_H
+ #define CHECK_POCKET_H
+-#include "ball.h"
+ #include "game.h"
+ 
+ 
diff --git a/games/gtkpool/files/patch-gtkpool__game.cpp b/games/gtkpool/files/patch-gtkpool__game.cpp
new file mode 100644
index 000000000000..97a6472bae2b
--- /dev/null
+++ b/games/gtkpool/files/patch-gtkpool__game.cpp
@@ -0,0 +1,10 @@
+--- gtkpool/game.cpp.orig	2002-07-29 06:58:05.000000000 +0900
++++ gtkpool/game.cpp	2011-08-19 04:36:31.000000000 +0900
+@@ -16,6 +16,7 @@
+  ***************************************************************************/
+ 
+ #include "game.h"
++#include "moving.h"
+ #include <algorithm>
+ 
+ Game::Game(){
diff --git a/games/gtkpool/files/patch-gtkpool__main.cpp b/games/gtkpool/files/patch-gtkpool__main.cpp
new file mode 100644
index 000000000000..0f76128a382d
--- /dev/null
+++ b/games/gtkpool/files/patch-gtkpool__main.cpp
@@ -0,0 +1,16 @@
+--- gtkpool/main.cpp.orig	2002-08-06 02:36:10.000000000 +0900
++++ gtkpool/main.cpp	2011-08-19 04:36:56.000000000 +0900
+@@ -162,10 +162,10 @@
+ 	gtk_widget_show(button);*/
+ 
+ 	//setup chat box for multiplayer
+-	app.chat_text = gtk_text_new((GtkAdjustment *)NULL, (GtkAdjustment *)NULL);
++	app.chat_text = gtk_text_view_new();
+ 	gtk_widget_set_usize(app.chat_text, -2, 60);
+-	gtk_text_set_editable(GTK_TEXT(app.chat_text), FALSE);
+-	gtk_text_set_word_wrap(GTK_TEXT(app.chat_text), TRUE);
++	gtk_text_view_set_editable(GTK_TEXT_VIEW(app.chat_text), FALSE);
++	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(app.chat_text), GTK_WRAP_WORD);
+ 	gtk_widget_set_events (app.chat_text, GDK_NOTHING);
+ //	networking not ready for this version
+ 
diff --git a/games/gtkpool/files/patch-gtkpool__options.cpp b/games/gtkpool/files/patch-gtkpool__options.cpp
new file mode 100644
index 000000000000..d383284ddfa3
--- /dev/null
+++ b/games/gtkpool/files/patch-gtkpool__options.cpp
@@ -0,0 +1,11 @@
+--- gtkpool/options.cpp.orig	2002-07-29 14:16:51.000000000 +0900
++++ gtkpool/options.cpp	2011-08-19 04:36:56.000000000 +0900
+@@ -68,7 +68,7 @@
+ 	opt_dlg = gtk_dialog_new ();
+ 	gtk_object_set_data (GTK_OBJECT (opt_dlg), "opt_dlg", opt_dlg);
+ 	gtk_window_set_title (GTK_WINDOW (opt_dlg), _("GTKPool Options"));
+-	GTK_WINDOW (opt_dlg)->type = GTK_WINDOW_DIALOG;
++	GTK_WINDOW (opt_dlg)->type = GTK_WINDOW_TOPLEVEL;
+ 	gtk_window_set_position (GTK_WINDOW (opt_dlg), GTK_WIN_POS_CENTER);
+ 	gtk_window_set_policy (GTK_WINDOW (opt_dlg), FALSE, TRUE, FALSE);
+ 	gtk_widget_ref (opt_dlg);
diff --git a/games/gtkpool/files/patch-gtkpool__pixmaps__Makefile.am b/games/gtkpool/files/patch-gtkpool__pixmaps__Makefile.am
new file mode 100644
index 000000000000..f25a6752f232
--- /dev/null
+++ b/games/gtkpool/files/patch-gtkpool__pixmaps__Makefile.am
@@ -0,0 +1,265 @@
+--- gtkpool/pixmaps/Makefile.am.orig	2002-08-16 07:27:31.000000000 +0900
++++ gtkpool/pixmaps/Makefile.am	2011-08-19 04:51:34.000000000 +0900
+@@ -1,136 +1,132 @@
+-####### kdevelop will overwrite this part!!! (begin)##########
+-
+ 
+ EXTRA_DIST = ball-shadow.xpm ball_10_lg.xpm ball_10_sm.xpm ball_11_lg.xpm ball_11_sm.xpm ball_12_lg.xpm ball_12_sm.xpm ball_13_lg.xpm ball_13_sm.xpm ball_14_lg.xpm ball_14_sm.xpm ball_15_lg.xpm ball_15_sm.xpm ball_1_lg.xpm ball_1_sm.xpm ball_2_lg.xpm ball_2_sm.xpm ball_3_lg.xpm ball_3_sm.xpm ball_4_lg.xpm ball_4_sm.xpm ball_5_lg.xpm ball_5_sm.xpm ball_6_lg.xpm ball_6_sm.xpm ball_7_lg.xpm ball_7_sm.xpm ball_8_lg.xpm ball_8_sm.xpm ball_9_lg.xpm ball_9_sm.xpm ball_cue_lg.xpm ball_cue_sm.xpm bllq-icon.xpm blpl-icon.xpm mabl-icon.xpm maho-icon.xpm pool_table_black-laquer.xpm pool_table_black-pearl.xpm pool_table_mahogany.xpm pool_table_maple-burl.xpm ball_drop.raw ball_hit.raw 
+ 
+ install-data-local:
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_10_lg.xpm ${datadir}/gtkpool/ball_10_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_10_sm.xpm ${datadir}/gtkpool/ball_10_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_11_lg.xpm ${datadir}/gtkpool/ball_11_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_11_sm.xpm ${datadir}/gtkpool/ball_11_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_12_lg.xpm ${datadir}/gtkpool/ball_12_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_12_sm.xpm ${datadir}/gtkpool/ball_12_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_13_lg.xpm ${datadir}/gtkpool/ball_13_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_13_sm.xpm ${datadir}/gtkpool/ball_13_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_14_lg.xpm ${datadir}/gtkpool/ball_14_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_14_sm.xpm ${datadir}/gtkpool/ball_14_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_15_lg.xpm ${datadir}/gtkpool/ball_15_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_15_sm.xpm ${datadir}/gtkpool/ball_15_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_1_lg.xpm ${datadir}/gtkpool/ball_1_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_1_sm.xpm ${datadir}/gtkpool/ball_1_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_2_lg.xpm ${datadir}/gtkpool/ball_2_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_2_sm.xpm ${datadir}/gtkpool/ball_2_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_3_lg.xpm ${datadir}/gtkpool/ball_3_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_3_sm.xpm ${datadir}/gtkpool/ball_3_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_4_lg.xpm ${datadir}/gtkpool/ball_4_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_4_sm.xpm ${datadir}/gtkpool/ball_4_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_5_lg.xpm ${datadir}/gtkpool/ball_5_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_5_sm.xpm ${datadir}/gtkpool/ball_5_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_6_lg.xpm ${datadir}/gtkpool/ball_6_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_6_sm.xpm ${datadir}/gtkpool/ball_6_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_7_lg.xpm ${datadir}/gtkpool/ball_7_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_7_sm.xpm ${datadir}/gtkpool/ball_7_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_8_lg.xpm ${datadir}/gtkpool/ball_8_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_8_sm.xpm ${datadir}/gtkpool/ball_8_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_9_lg.xpm ${datadir}/gtkpool/ball_9_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_9_sm.xpm ${datadir}/gtkpool/ball_9_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_cue_lg.xpm ${datadir}/gtkpool/ball_cue_lg.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_cue_sm.xpm ${datadir}/gtkpool/ball_cue_sm.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/bllq-icon.xpm ${datadir}/gtkpool/bllq-icon.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/blpl-icon.xpm ${datadir}/gtkpool/blpl-icon.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/mabl-icon.xpm ${datadir}/gtkpool/mabl-icon.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/maho-icon.xpm ${datadir}/gtkpool/maho-icon.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/pool_table_black-laquer.xpm ${datadir}/gtkpool/pool_table_black-laquer.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/pool_table_black-pearl.xpm ${datadir}/gtkpool/pool_table_black-pearl.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/pool_table_mahogany.xpm ${datadir}/gtkpool/pool_table_mahogany.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/pool_table_maple-burl.xpm ${datadir}/gtkpool/pool_table_maple-burl.xpm
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_drop.raw ${datadir}/gtkpool/ball_drop.raw
+-	$(mkinstalldirs) ${datadir}/gtkpool/
+-	$(INSTALL_DATA) $(srcdir)/ball_hit.raw ${datadir}/gtkpool/ball_hit.raw
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_10_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_10_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_10_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_10_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_11_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_11_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_11_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_11_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_12_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_12_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_12_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_12_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_13_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_13_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_13_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_13_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_14_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_14_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_14_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_14_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_15_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_15_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_15_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_15_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_1_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_1_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_1_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_1_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_2_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_2_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_2_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_2_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_3_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_3_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_3_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_3_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_4_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_4_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_4_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_4_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_5_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_5_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_5_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_5_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_6_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_6_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_6_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_6_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_7_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_7_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_7_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_7_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_8_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_8_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_8_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_8_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_9_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_9_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_9_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_9_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_cue_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_cue_lg.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_cue_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_cue_sm.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/bllq-icon.xpm ${DESTDIR}${datadir}/gtkpool/bllq-icon.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/blpl-icon.xpm ${DESTDIR}${datadir}/gtkpool/blpl-icon.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/mabl-icon.xpm ${DESTDIR}${datadir}/gtkpool/mabl-icon.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/maho-icon.xpm ${DESTDIR}${datadir}/gtkpool/maho-icon.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/pool_table_black-laquer.xpm ${DESTDIR}${datadir}/gtkpool/pool_table_black-laquer.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/pool_table_black-pearl.xpm ${DESTDIR}${datadir}/gtkpool/pool_table_black-pearl.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/pool_table_mahogany.xpm ${DESTDIR}${datadir}/gtkpool/pool_table_mahogany.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/pool_table_maple-burl.xpm ${DESTDIR}${datadir}/gtkpool/pool_table_maple-burl.xpm
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_drop.raw ${DESTDIR}${datadir}/gtkpool/ball_drop.raw
++	$(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/
++	$(INSTALL_DATA) $(srcdir)/ball_hit.raw ${DESTDIR}${datadir}/gtkpool/ball_hit.raw
+ 
+ uninstall-local:
+-	-rm -f ${datadir}/gtkpool/ball_10_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_10_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_11_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_11_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_12_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_12_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_13_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_13_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_14_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_14_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_15_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_15_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_1_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_1_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_2_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_2_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_3_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_3_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_4_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_4_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_5_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_5_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_6_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_6_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_7_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_7_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_8_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_8_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_9_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_9_sm.xpm
+-	-rm -f ${datadir}/gtkpool/ball_cue_lg.xpm
+-	-rm -f ${datadir}/gtkpool/ball_cue_sm.xpm
+-	-rm -f ${datadir}/gtkpool/bllq-icon.xpm
+-	-rm -f ${datadir}/gtkpool/blpl-icon.xpm
+-	-rm -f ${datadir}/gtkpool/mabl-icon.xpm
+-	-rm -f ${datadir}/gtkpool/maho-icon.xpm
+-	-rm -f ${datadir}/gtkpool/pool_table_black-laquer.xpm
+-	-rm -f ${datadir}/gtkpool/pool_table_black-pearl.xpm
+-	-rm -f ${datadir}/gtkpool/pool_table_mahogany.xpm
+-	-rm -f ${datadir}/gtkpool/pool_table_maple-burl.xpm
+-	-rm -f ${datadir}/gtkpool/ball_drop.raw
+-	-rm -f ${datadir}/gtkpool/ball_hit.raw
+-
+-####### kdevelop will overwrite this part!!! (end)############
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_10_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_10_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_11_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_11_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_12_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_12_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_13_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_13_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_14_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_14_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_15_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_15_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_1_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_1_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_2_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_2_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_3_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_3_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_4_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_4_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_5_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_5_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_6_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_6_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_7_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_7_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_8_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_8_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_9_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_9_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_cue_lg.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_cue_sm.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/bllq-icon.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/blpl-icon.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/mabl-icon.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/maho-icon.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/pool_table_black-laquer.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/pool_table_black-pearl.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/pool_table_mahogany.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/pool_table_maple-burl.xpm
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_drop.raw
++	-rm -f ${DESTDIR}${datadir}/gtkpool/ball_hit.raw
diff --git a/games/gtkpool/files/patch-gtkpool_application.cpp b/games/gtkpool/files/patch-gtkpool_application.cpp
index 70dcaa98885e..fcd47e77c32c 100644
--- a/games/gtkpool/files/patch-gtkpool_application.cpp
+++ b/games/gtkpool/files/patch-gtkpool_application.cpp
@@ -1,5 +1,5 @@
---- gtkpool/application.cpp.orig	Tue Aug  6 11:02:45 2002
-+++ gtkpool/application.cpp	Mon Aug  1 16:01:35 2005
+--- gtkpool/application.cpp.orig	2002-08-06 13:02:45.000000000 +0900
++++ gtkpool/application.cpp	2011-08-19 04:36:56.000000000 +0900
 @@ -67,11 +67,11 @@
  		message_colours[14] = new GdkColor;
  
@@ -22,16 +22,29 @@
   	if(bb != balls.end())
   	{
 -#if _CPP_CSTDLIB == 1
-+#if _CPP_CSTDLIB == 1 || _GLIBCXX_CSTDLIB == 1
++#if 1 // _CPP_CSTDLIB == 1
  		// FIXME: horrible, non-portable, converting a vector iterator
  		// to a pointer using g++ 3.0 private interface :-(
  		// -- Philip Martin <philip_martin@ntlworld.com>
-@@ -815,7 +815,7 @@
+@@ -815,12 +815,18 @@
  		load_sounds();
  }
  
 -void Application::print_message(const char *message, int colour = 0)
 +void Application::print_message(const char *message, int colour)
  {
++	GtkTextBuffer *chat_textbuf;
++	GtkTextIter chat_textiter;
++
  	if (colour > 4)
  		colour = 14;
+ 	if (colour < 0)
+ 		colour = 14;
+-	gtk_text_insert(GTK_TEXT(chat_text), NULL, message_colours[colour], NULL, "\n", -1);
+-	gtk_text_insert(GTK_TEXT(chat_text), NULL, message_colours[colour], NULL, message, -1);
++
++	chat_textbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(chat_text));
++	gtk_text_buffer_get_iter_at_offset(chat_textbuf, &chat_textiter, 0);
++	gtk_text_buffer_insert(chat_textbuf, &chat_textiter, "\n", -1);
++	gtk_text_buffer_insert(chat_textbuf, &chat_textiter, message, -1);
+ }
diff --git a/games/gtkpool/files/patch-gtkpool_ball.h b/games/gtkpool/files/patch-gtkpool_ball.h
index f4f8854a5c03..e5149262c3a8 100644
--- a/games/gtkpool/files/patch-gtkpool_ball.h
+++ b/games/gtkpool/files/patch-gtkpool_ball.h
@@ -1,11 +1,13 @@
---- gtkpool/ball.h.orig	Mon Jul 29 08:02:15 2002
-+++ gtkpool/ball.h	Fri Jul 29 18:58:49 2005
-@@ -80,7 +80,7 @@
+--- gtkpool/ball.h.orig	2002-07-29 10:02:15.000000000 +0900
++++ gtkpool/ball.h	2011-08-19 04:36:31.000000000 +0900
+@@ -80,8 +80,8 @@
  	GdkColor *clr;
  
  	Ball(void);
 -	Ball (double x, double y, int d, GdkColor *c, int cat, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false);
+-	Ball (double x, double y, int d, int bn, GdkPixmap *pixmap, GdkBitmap *c_bmp, GdkPixmap *b_pixmap, GdkBitmap *b_clip_bmp, int cat, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false);
 +	Ball (double x, double y, int d, GdkColor *c, int cat = other, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false);
- 	Ball (double x, double y, int d, int bn, GdkPixmap *pixmap, GdkBitmap *c_bmp, GdkPixmap *b_pixmap, GdkBitmap *b_clip_bmp, int cat, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false);
++	Ball (double x, double y, int d, int bn, GdkPixmap *pixmap, GdkBitmap *c_bmp, GdkPixmap *b_pixmap, GdkBitmap *b_clip_bmp, int cat = other, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false);
  	bool moving ();
  	void decel (double val);
+ 	double pathIntercept (Ball b);
diff --git a/games/gtkpool/files/patch-gtkpool_game.h b/games/gtkpool/files/patch-gtkpool_game.h
index 75e7ccefc3a9..335f48aa0972 100644
--- a/games/gtkpool/files/patch-gtkpool_game.h
+++ b/games/gtkpool/files/patch-gtkpool_game.h
@@ -1,6 +1,6 @@
---- gtkpool/game.h.orig	Mon Aug  1 17:17:05 2005
-+++ gtkpool/game.h	Mon Aug  1 17:17:41 2005
-@@ -19,10 +19,6 @@
+--- gtkpool/game.h.orig	2002-07-29 10:02:15.000000000 +0900
++++ gtkpool/game.h	2011-08-19 04:36:48.000000000 +0900
+@@ -19,10 +19,7 @@
  #define GAME_H
  #include <gtk/gtk.h>
  #include <vector>
@@ -8,18 +8,26 @@
 -#include "check_pocket.h"
 -#include "move_balls.h"
 -#include "moving.h"
++#include <cstring>
  
  /**
    *@author Brian Ashe
-@@ -34,6 +30,11 @@
- enum catagories { stripes, solids, other };				// What are they shooting at
+@@ -31,10 +28,12 @@
+ class check_pocket;
+ 
+ enum turns { tplayer1, tplayer2 };				// Tell whose turn it is on
+-enum catagories { stripes, solids, other };				// What are they shooting at
++enum categories { stripes, solids, other };				// What are they shooting at
  enum player_types { human, computer, remote };	// What type of player (future use)
  enum game_types { eight_ball, nine_ball, rotation, snooker, continuous14_1, no_rules };
-+
-+#include "ball.h"
-+#include "check_pocket.h"
-+#include "move_balls.h"
-+#include "moving.h"
  
++#include "ball.h"
++
  struct player {
  	char player_name [30];		// Player's name
+ 	int category;				// Stripes or solids
+@@ -74,3 +73,4 @@
+ };
+ 
+ #endif
++
diff --git a/games/gtkpool/pkg-plist b/games/gtkpool/pkg-plist
index 7a71ebb00b28..a253ae9b3cdc 100644
--- a/games/gtkpool/pkg-plist
+++ b/games/gtkpool/pkg-plist
@@ -31,6 +31,8 @@ bin/gtkpool
 %%DATADIR%%/ball_9_sm.xpm
 %%DATADIR%%/ball_cue_lg.xpm
 %%DATADIR%%/ball_cue_sm.xpm
+%%DATADIR%%/ball_drop.raw
+%%DATADIR%%/ball_hit.raw
 %%DATADIR%%/bllq-icon.xpm
 %%DATADIR%%/blpl-icon.xpm
 %%DATADIR%%/mabl-icon.xpm
@@ -38,9 +40,7 @@ bin/gtkpool
 %%DATADIR%%/pool_table_black-laquer.xpm
 %%DATADIR%%/pool_table_black-pearl.xpm
 %%DATADIR%%/pool_table_mahogany.xpm
-%%DATADIR%%/ball_drop.raw
 %%DATADIR%%/pool_table_maple-burl.xpm
-%%DATADIR%%/ball_hit.raw
-@dirrm %%DATADIR%%
 share/icons/gtkpool.png
 @dirrmtry share/icons
+@dirrm %%DATADIR%%