Update to KDE 1.94, the fifth and final beta release of KDE 2.0. If you

have not tried KDE 2.0 or haven't done so in awhile (i.e. since July or
before), you should try this.  This version is extremely stable and offers
better functionality than before.  This update also introduces the KDE2
modules kdegraphics and kdemultimedia to our ports tree.  Additionally,
this marks the first time FreeBSD packages were announced as part of the
KDE2 beta release announcement!  :-)

Most (if not all) of the remaining modules in KDE2 will be added for the
update WRT the final release.

A hack was added to fix building with SSL in kdelibs; this has been merged
in the main tree and will go away with 2.0 release update.  Thanks to David
Faure <david@mandrakesoft.com> for his help regarding this.

Also, building the docs should now succeed because I've added a build
dependency on jade and linuxdoc (should be enough).

People can get my precompiled packages from the usual location on the KDE
FTP server (should spread to the mirrors Real Soon Now (tm)):

	http://ftp.kde.org/pub/kde/unstable/distribution/2.0Beta5/tar/FreeBSD/

Have fun!  Remember to reports bugs through http://bugs.kde.org/.

9 files changed, 54 insertions, 63 deletions

diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index 524c36102643..dc05a67cebad 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	kdetoys
-PORTVERSION=	20000829A
+PORTVERSION=	1.94
 CATEGORIES=	x11-clocks kde
-MASTER_SITES=	http://www.physics.purdue.edu/~will/
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt
 		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/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo
index 2d22339988bc..8031ef277bc5 100644
--- a/x11-clocks/kdetoys2/distinfo
+++ b/x11-clocks/kdetoys2/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-20000829A.tar.bz2) = 7947fb94b033841c1d549a4bd882dd91
+MD5 (kdetoys-1.94.tar.bz2) = 19c419b3ddc32b9d96fb5c5c625b9a55
diff --git a/x11-clocks/kdetoys2/pkg-plist b/x11-clocks/kdetoys2/pkg-plist
index 926d645b995a..c205db7359ec 100644
--- a/x11-clocks/kdetoys2/pkg-plist
+++ b/x11-clocks/kdetoys2/pkg-plist
@@ -3,6 +3,7 @@ bin/kmoon
 bin/kteatime
 bin/kworldwatch
 lib/libkeyesapplet.la
+lib/libkeyesapplet.so
 lib/libkeyesapplet.so.1
 share/applnk/Toys/amor.desktop
 share/applnk/Toys/kmoon.desktop
@@ -303,6 +304,7 @@ share/apps/amor/pingu/walk_r6.xpm
 share/apps/amor/pingu/walk_r7.xpm
 share/apps/amor/pingu/walk_r8.xpm
 share/apps/amor/pingurc
+share/apps/amor/tips-default
 share/apps/amor/tips-en
 share/apps/amor/worm/w-a1.xpm
 share/apps/amor/worm/w-a2.xpm
@@ -380,16 +382,17 @@ share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
 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
-share/doc/HTML/en/mouse/guide.png
-share/doc/HTML/en/mouse/howitworks.html
-share/doc/HTML/en/mouse/index.cvlog
-share/doc/HTML/en/mouse/index.docbook
-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/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
+share/doc/HTML/en/kodo/compilationandinstallation.html
+share/doc/HTML/en/kodo/guide.png
+share/doc/HTML/en/kodo/howitworks.html
+share/doc/HTML/en/kodo/index.cvlog
+share/doc/HTML/en/kodo/index.docbook
+share/doc/HTML/en/kodo/index.html
+share/doc/HTML/en/kodo/installation.html
+share/doc/HTML/en/kodo/introduction.html
+share/doc/HTML/en/kodo/onscreenoperation.html
 share/icons/hicolor/32x32/apps/amor.png
 share/icons/hicolor/32x32/apps/kmoon.png
 share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -401,11 +404,7 @@ share/icons/locolor/16x16/apps/kteatime.png
 share/icons/locolor/16x16/apps/kworldwatch.png
 share/icons/locolor/32x32/apps/kmoon.png
 share/icons/locolor/32x32/apps/kworldwatch.png
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/mouse
+@dirrm share/doc/HTML/en/kodo
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 524c36102643..dc05a67cebad 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	kdetoys
-PORTVERSION=	20000829A
+PORTVERSION=	1.94
 CATEGORIES=	x11-clocks kde
-MASTER_SITES=	http://www.physics.purdue.edu/~will/
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt
 		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/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index 2d22339988bc..8031ef277bc5 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-20000829A.tar.bz2) = 7947fb94b033841c1d549a4bd882dd91
+MD5 (kdetoys-1.94.tar.bz2) = 19c419b3ddc32b9d96fb5c5c625b9a55
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index 926d645b995a..c205db7359ec 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -3,6 +3,7 @@ bin/kmoon
 bin/kteatime
 bin/kworldwatch
 lib/libkeyesapplet.la
+lib/libkeyesapplet.so
 lib/libkeyesapplet.so.1
 share/applnk/Toys/amor.desktop
 share/applnk/Toys/kmoon.desktop
@@ -303,6 +304,7 @@ share/apps/amor/pingu/walk_r6.xpm
 share/apps/amor/pingu/walk_r7.xpm
 share/apps/amor/pingu/walk_r8.xpm
 share/apps/amor/pingurc
+share/apps/amor/tips-default
 share/apps/amor/tips-en
 share/apps/amor/worm/w-a1.xpm
 share/apps/amor/worm/w-a2.xpm
@@ -380,16 +382,17 @@ share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
 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
-share/doc/HTML/en/mouse/guide.png
-share/doc/HTML/en/mouse/howitworks.html
-share/doc/HTML/en/mouse/index.cvlog
-share/doc/HTML/en/mouse/index.docbook
-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/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
+share/doc/HTML/en/kodo/compilationandinstallation.html
+share/doc/HTML/en/kodo/guide.png
+share/doc/HTML/en/kodo/howitworks.html
+share/doc/HTML/en/kodo/index.cvlog
+share/doc/HTML/en/kodo/index.docbook
+share/doc/HTML/en/kodo/index.html
+share/doc/HTML/en/kodo/installation.html
+share/doc/HTML/en/kodo/introduction.html
+share/doc/HTML/en/kodo/onscreenoperation.html
 share/icons/hicolor/32x32/apps/amor.png
 share/icons/hicolor/32x32/apps/kmoon.png
 share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -401,11 +404,7 @@ share/icons/locolor/16x16/apps/kteatime.png
 share/icons/locolor/16x16/apps/kworldwatch.png
 share/icons/locolor/32x32/apps/kmoon.png
 share/icons/locolor/32x32/apps/kworldwatch.png
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/mouse
+@dirrm share/doc/HTML/en/kodo
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 524c36102643..dc05a67cebad 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	kdetoys
-PORTVERSION=	20000829A
+PORTVERSION=	1.94
 CATEGORIES=	x11-clocks kde
-MASTER_SITES=	http://www.physics.purdue.edu/~will/
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt
 		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 2d22339988bc..8031ef277bc5 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-20000829A.tar.bz2) = 7947fb94b033841c1d549a4bd882dd91
+MD5 (kdetoys-1.94.tar.bz2) = 19c419b3ddc32b9d96fb5c5c625b9a55
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index 926d645b995a..c205db7359ec 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -3,6 +3,7 @@ bin/kmoon
 bin/kteatime
 bin/kworldwatch
 lib/libkeyesapplet.la
+lib/libkeyesapplet.so
 lib/libkeyesapplet.so.1
 share/applnk/Toys/amor.desktop
 share/applnk/Toys/kmoon.desktop
@@ -303,6 +304,7 @@ share/apps/amor/pingu/walk_r6.xpm
 share/apps/amor/pingu/walk_r7.xpm
 share/apps/amor/pingu/walk_r8.xpm
 share/apps/amor/pingurc
+share/apps/amor/tips-default
 share/apps/amor/tips-en
 share/apps/amor/worm/w-a1.xpm
 share/apps/amor/worm/w-a2.xpm
@@ -380,16 +382,17 @@ share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
 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
-share/doc/HTML/en/mouse/guide.png
-share/doc/HTML/en/mouse/howitworks.html
-share/doc/HTML/en/mouse/index.cvlog
-share/doc/HTML/en/mouse/index.docbook
-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/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
+share/doc/HTML/en/kodo/compilationandinstallation.html
+share/doc/HTML/en/kodo/guide.png
+share/doc/HTML/en/kodo/howitworks.html
+share/doc/HTML/en/kodo/index.cvlog
+share/doc/HTML/en/kodo/index.docbook
+share/doc/HTML/en/kodo/index.html
+share/doc/HTML/en/kodo/installation.html
+share/doc/HTML/en/kodo/introduction.html
+share/doc/HTML/en/kodo/onscreenoperation.html
 share/icons/hicolor/32x32/apps/amor.png
 share/icons/hicolor/32x32/apps/kmoon.png
 share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -401,11 +404,7 @@ share/icons/locolor/16x16/apps/kteatime.png
 share/icons/locolor/16x16/apps/kworldwatch.png
 share/icons/locolor/32x32/apps/kmoon.png
 share/icons/locolor/32x32/apps/kworldwatch.png
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/mouse
+@dirrm share/doc/HTML/en/kodo
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics