5 files changed, 39 insertions, 73 deletions

diff --git a/games/kbilliards/Makefile b/games/kbilliards/Makefile
index 3b19b4d08d76..118b5d909d96 100644
--- a/games/kbilliards/Makefile
+++ b/games/kbilliards/Makefile
@@ -5,19 +5,29 @@
 # $FreeBSD$
 
 PORTNAME=	kbilliards
-PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	games kde
 MASTER_SITES=	http://www.hostnotfound.it/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_REINPLACE=	yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.mk>
+EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 501000
+BROKEN=         "does not compile"
+.endif
+	
+post-patch:
+	${REINPLACE_CMD} -e 's|sqrtl|sqrt|' \
+	${WRKSRC}/src/ball.cpp ${WRKSRC}/src/aiplayer.cpp
+
+.include <bsd.port.post.mk>
diff --git a/games/kbilliards/distinfo b/games/kbilliards/distinfo
index 8c712abdf266..dce6b690f1f9 100644
--- a/games/kbilliards/distinfo
+++ b/games/kbilliards/distinfo
@@ -1,2 +1,2 @@
-MD5 (kbilliards-0.7.1.tar.bz2) = e0b80a2f6576e979edb37dbb9a971659
-SIZE (kbilliards-0.7.1.tar.bz2) = 2064496
+MD5 (kbilliards-0.8.5.tar.bz2) = 605e541e10f2f81a4d1f4a066d5d9e32
+SIZE (kbilliards-0.8.5.tar.bz2) = 1950376
diff --git a/games/kbilliards/files/patch-src::graphicvector.cpp b/games/kbilliards/files/patch-src::graphicvector.cpp
deleted file mode 100644
index 20d21dbc504e..000000000000
--- a/games/kbilliards/files/patch-src::graphicvector.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index 2e69c7485b23..000000000000
--- a/games/kbilliards/files/patch-src::kbilliards.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/kbilliards.cpp.orig	Thu Feb 17 23:58:08 2005
-+++ src/kbilliards.cpp	Fri Feb 18 13:20:19 2005
-@@ -105,7 +105,7 @@
-     // load game optios like players name , multiplayer, game type ..
-     loadGameOptions();
- 
--    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/");
-@@ -901,7 +901,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
-       }
- 
-       if (isvisible) {
diff --git a/games/kbilliards/pkg-plist b/games/kbilliards/pkg-plist
index af40bb2cb61c..02158c1c5d02 100644
--- a/games/kbilliards/pkg-plist
+++ b/games/kbilliards/pkg-plist
@@ -1,6 +1,5 @@
 bin/kbilliards
 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
@@ -35,32 +34,9 @@ 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
-share/apps/kbilliards/blcl.png
-share/apps/kbilliards/blcr.png
-share/apps/kbilliards/bottom_central_corner.png
-share/apps/kbilliards/bottom_left_corner.png
-share/apps/kbilliards/bottom_left_edge.png
-share/apps/kbilliards/bottom_right_corner.png
-share/apps/kbilliards/bottom_right_edge.png
-share/apps/kbilliards/brcl.png
-share/apps/kbilliards/brcr.png
-share/apps/kbilliards/holebc.png
-share/apps/kbilliards/holebl.png
-share/apps/kbilliards/holebr.png
-share/apps/kbilliards/holetc.png
-share/apps/kbilliards/holetl.png
-share/apps/kbilliards/holetr.png
-share/apps/kbilliards/icona-16.png
-share/apps/kbilliards/icona-32.png
-share/apps/kbilliards/icona-48.png
-share/apps/kbilliards/icona-64.png
-share/apps/kbilliards/kbilliards.png
 share/apps/kbilliards/kbilliardsui.rc
-share/apps/kbilliards/left_edge.png
 share/apps/kbilliards/leftarrow.png
-share/apps/kbilliards/right_edge.png
+share/apps/kbilliards/maps/kbilliards2004.kbm
 share/apps/kbilliards/rightarrow.png
 share/apps/kbilliards/sound/applause.wav
 share/apps/kbilliards/sound/ballinhole.wav
@@ -69,18 +45,6 @@ share/apps/kbilliards/sound/hitball.wav
 share/apps/kbilliards/sound/hitedge.wav
 share/apps/kbilliards/sound/music01.mp3
 share/apps/kbilliards/sound/shot.wav
-share/apps/kbilliards/tccl.png
-share/apps/kbilliards/tccr.png
-share/apps/kbilliards/tlcl.png
-share/apps/kbilliards/tlcr.png
-share/apps/kbilliards/top_central_corner.png
-share/apps/kbilliards/top_left_corner.png
-share/apps/kbilliards/top_left_edge.png
-share/apps/kbilliards/top_right_corner.png
-share/apps/kbilliards/top_right_edge.png
-share/apps/kbilliards/trcl.png
-share/apps/kbilliards/trcr.png
-share/doc/HTML/en/kbilliards/common
 share/doc/HTML/en/kbilliards/index.cache.bz2
 share/doc/HTML/en/kbilliards/index.docbook
 share/icons/hicolor/16x16/apps/kbilliards.png
@@ -89,9 +53,30 @@ share/icons/hicolor/48x48/apps/kbilliards.png
 share/icons/locolor/16x16/apps/kbilliards.png
 share/icons/locolor/32x32/apps/kbilliards.png
 share/locale/cs/LC_MESSAGES/kbilliards.mo
+share/locale/fr/LC_MESSAGES/kbilliards.mo
 share/locale/it/LC_MESSAGES/kbilliards.mo
 share/locale/ru/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
+@dirrm share/doc/HTML/en/kbilliards/common
 @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/maps
 @dirrm share/apps/kbilliards/balls
 @dirrm share/apps/kbilliards
+@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true