5 files changed, 39 insertions, 31 deletions

diff --git a/games/kbilliards/Makefile b/games/kbilliards/Makefile
index 82f372849d93..602ec2dd52b8 100644
--- a/games/kbilliards/Makefile
+++ b/games/kbilliards/Makefile
@@ -5,24 +5,18 @@
 # $FreeBSD$
 
 PORTNAME=	kbilliards
-PORTVERSION=	0.5
+PORTVERSION=	0.6.1
 CATEGORIES=	games kde
 MASTER_SITES=	http://xoomer.virgilio.it/samuele_c/kbilliards/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Funny billiards simulator game for KDE
 
+EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
+
 USE_BZIP2=	yes
 USE_KDELIBS_VER=	3
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e \
-		's|$$(LIB_KDEPRINT)$$|$$(LIB_KDEPRINT) $$(LIBPTHREAD)|g' \
-			${WRKSRC}/src/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/games/kbilliards/distinfo b/games/kbilliards/distinfo
index 47ce4fa62155..35937ab57732 100644
--- a/games/kbilliards/distinfo
+++ b/games/kbilliards/distinfo
@@ -1,2 +1,2 @@
-MD5 (kbilliards-0.5.tar.bz2) = 6c2d740a5c196b8779ace441a86dec54
-SIZE (kbilliards-0.5.tar.bz2) = 1917502
+MD5 (kbilliards-0.6.1.tar.bz2) = cb0d68b91678bf7cdb79b238eb38f5fe
+SIZE (kbilliards-0.6.1.tar.bz2) = 2070937
diff --git a/games/kbilliards/files/patch-src::graphicvector.cpp b/games/kbilliards/files/patch-src::graphicvector.cpp
new file mode 100644
index 000000000000..20d21dbc504e
--- /dev/null
+++ b/games/kbilliards/files/patch-src::graphicvector.cpp
@@ -0,0 +1,9 @@
+--- src/graphicvector.cpp.orig	Wed Jan 19 08:09:41 2005
++++ src/graphicvector.cpp	Thu Jan 20 19:41:18 2005
+@@ -64,5 +64,5 @@
+  */
+ void GraphicVector::advance(int)
+ {
+-     setPoints((int)round(startx),(int)round(starty),(int)round(endx),(int)round(endy));
++     setPoints((int)rint(startx),(int)rint(starty),(int)rint(endx),(int)rint(endy));
+ }
diff --git a/games/kbilliards/files/patch-src::kbilliards.cpp b/games/kbilliards/files/patch-src::kbilliards.cpp
new file mode 100644
index 000000000000..c64e563e3a72
--- /dev/null
+++ b/games/kbilliards/files/patch-src::kbilliards.cpp
@@ -0,0 +1,20 @@
+--- src/kbilliards.cpp.orig	Wed Jan 19 10:43:51 2005
++++ src/kbilliards.cpp	Thu Jan 20 19:40:29 2005
+@@ -84,7 +84,7 @@
+     // and load musicconfiguration
+     loadSettings();
+     
+-    MaxThrowPower=round((actualconfig.check_speed)*0.36) ;
++    MaxThrowPower=rint((actualconfig.check_speed)*0.36) ;
+     
+     KStandardDirs sd;
+     path_data=(QString)(sd.findResourceDir("data","kbilliards/top_left_corner.png") + (QString)"kbilliards/");
+@@ -806,7 +806,7 @@
+ 
+       canvas->setAdvancePeriod(actualconfig.check_speed); // set current animation speed
+ 
+-      MaxThrowPower=round((actualconfig.check_speed)*0.36) ; // set proportional max power
++      MaxThrowPower=rint((actualconfig.check_speed)*0.36) ; // set proportional max power
+ 
+       }
+ 
diff --git a/games/kbilliards/pkg-plist b/games/kbilliards/pkg-plist
index 0d511ea32c6b..af40bb2cb61c 100644
--- a/games/kbilliards/pkg-plist
+++ b/games/kbilliards/pkg-plist
@@ -1,6 +1,6 @@
 bin/kbilliards
-share/applnk/Utilities/kbilliards.desktop
-share/apps/kbilliards/background.xpm
+share/applnk/Games/kbilliards.desktop
+share/apps/kbilliards/background.png
 share/apps/kbilliards/ball.png
 share/apps/kbilliards/balls/ball01.png
 share/apps/kbilliards/balls/ball01b.png
@@ -32,6 +32,8 @@ share/apps/kbilliards/balls/ball14.png
 share/apps/kbilliards/balls/ball14b.png
 share/apps/kbilliards/balls/ball15.png
 share/apps/kbilliards/balls/ball15b.png
+share/apps/kbilliards/balls/ball_shadow.png
+share/apps/kbilliards/balls/ball_shadowb.png
 share/apps/kbilliards/balls/whiteball.png
 share/apps/kbilliards/bccl.png
 share/apps/kbilliards/bccr.png
@@ -88,25 +90,8 @@ share/icons/locolor/16x16/apps/kbilliards.png
 share/icons/locolor/32x32/apps/kbilliards.png
 share/locale/cs/LC_MESSAGES/kbilliards.mo
 share/locale/it/LC_MESSAGES/kbilliards.mo
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+share/locale/ru/LC_MESSAGES/kbilliards.mo
 @dirrm share/doc/HTML/en/kbilliards
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/kbilliards/sound
 @dirrm share/apps/kbilliards/balls
 @dirrm share/apps/kbilliards
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true