3 files changed, 29 insertions, 22 deletions

diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index f6f3b493660c..9ca79c44d1f6 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -6,25 +6,31 @@
 #
 
 PORTNAME=	kdetoys
-PORTVERSION=	1.90
+PORTVERSION=	20000724A
 CATEGORIES=	x11-clocks kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	unstable/distribution/tar/src
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	will
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN=		"Does not compile/run properly"
+LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
+		kdecore.4:${PORTSDIR}/x11/kdelibs2
 
+WRKSRC=		${WRKDIR}/kdetoys
 MOC?=		${X11BASE}/bin/moc2
-USE_QT2=	yes
+USE_NEWGCC=	yes
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse MOC="${MOC}"
+		--with-qt-libraries=${X11BASE}/lib \
+		--with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes
 
+pre-install:
+	@(find ${WRKSRC} -name CVS | xargs rm -rf)
+
 .include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index a28c79c03130..73ef581f8005 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-1.90.tar.bz2) = 6f8883a62031af941dd2b6cd529c7f61
+MD5 (kdetoys-20000724A.tar.bz2) = 91e240c893a1a07239d58516f0be60e6
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index c3145370d637..bfad8e3fe070 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -2,10 +2,12 @@ bin/amor
 bin/kmoon
 bin/kteatime
 bin/kworldwatch
-share/applnk/Games/amor.kdelnk
-share/applnk/Utilities/kmoon.desktop
-share/applnk/Utilities/kteatime.desktop
-share/applnk/Utilities/kworldwatch.desktop
+lib/libkeyesapplet.la
+lib/libkeyesapplet.so.1
+share/applnk/Toys/amor.desktop
+share/applnk/Toys/kmoon.desktop
+share/applnk/Toys/kteatime.desktop
+share/applnk/Toys/kworldwatch.desktop
 share/apps/amor/b/b-f.xpm
 share/apps/amor/b/b-f2.xpm
 share/apps/amor/b/b1-r.xpm
@@ -173,6 +175,7 @@ share/apps/amor/ghost/ghost_z5.xpm
 share/apps/amor/ghostrc
 share/apps/amor/tips-en
 share/apps/kdesktop/programs/kdeworld.desktop
+share/apps/kicker/applets/eyesapplet.desktop
 share/apps/kmoon/pics/moon1.png
 share/apps/kmoon/pics/moon10.png
 share/apps/kmoon/pics/moon11.png
@@ -202,13 +205,13 @@ share/apps/kmoon/pics/moon6.png
 share/apps/kmoon/pics/moon7.png
 share/apps/kmoon/pics/moon8.png
 share/apps/kmoon/pics/moon9.png
-share/apps/kworldwatch/pics/bio_800.jpg
-share/apps/kworldwatch/pics/depths_400.jpg
+share/apps/kworldwatch/pics/bio_800.png
+share/apps/kworldwatch/pics/depths_400.png
 share/apps/kworldwatch/pics/flag-blue.xpm
 share/apps/kworldwatch/pics/flag-green.xpm
 share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
-share/apps/kworldwatch/pics/photo_400.jpg
+share/apps/kworldwatch/pics/photo_400.png
 share/apps/kworldwatch/pics/world2.png
 share/doc/HTML/en/mouse/.anchors
 share/doc/HTML/en/mouse/compilationandinstallation.html
@@ -220,6 +223,7 @@ share/doc/HTML/en/mouse/index.html
 share/doc/HTML/en/mouse/installation.html
 share/doc/HTML/en/mouse/introduction.html
 share/doc/HTML/en/mouse/onscreenoperation.html
+share/icons/hicolor/32x32/apps/amor.png
 share/icons/hicolor/32x32/apps/kmoon.png
 share/icons/hicolor/32x32/apps/kworldwatch.png
 share/icons/hicolor/48x48/apps/kmoon.png
@@ -228,18 +232,15 @@ share/icons/locolor/16x16/apps/amor.png
 share/icons/locolor/16x16/apps/kmoon.png
 share/icons/locolor/16x16/apps/kteatime.png
 share/icons/locolor/16x16/apps/kworldwatch.png
-share/icons/locolor/32x32/apps/amor.png
 share/icons/locolor/32x32/apps/kmoon.png
 share/icons/locolor/32x32/apps/kworldwatch.png
-@unexec rm -f %D/share/apps/amor/tips-default
-@unexec rm -f %D/share/doc/HTML/en/mouse/common
 @dirrm share/doc/HTML/en/mouse
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
 @dirrm share/apps/kmoon
+@dirrm share/apps/kicker/applets
 @dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop
 @dirrm share/apps/amor/ghost
 @dirrm share/apps/amor/eyes
 @dirrm share/apps/amor/blob