Upgrade to KDE 3.0.1. The delay in this upgrade is mainly due to the

rigorous testing performed on the part of the KDE/FreeBSD Project
over the last three weeks.  Thanks to everyone who helped test!

General changes:
	[1] Follow KDE2 style by moving KDE core specific macros and
	    the like to x11/kde3/Makefile.kde.
	[2] Fix a variety of comments or miscellaneous data to reflect
	    that this is KDE3 and not KDE2.
	[3] Account for more empty directories in the PLISTs.

deskutils/kdepim3:
	[4] More #include <malloc.h> -> #include <stdlib.h>.

audio/arts:
	[5] Upgrade to 1.0.1.
	[6] Point at MASTER_SITE_KDE not my own mirror.

audio/kdemultimedia3:
	[7] Account for the removal of the <machine/soundcard.h> symlink.
	    Simply point all such includes at <sys/soundcard.h>.

editors/koffice-kde3:
	[8] Get rid of #include <values.h> preemptively.

devel/kdesdk3:
	[9] Remove cervisia from build if building on -CURRENT due to
	    C++-unsafe sys/wait.h.  The header is believed to have been
	    fixed in newer -CURRENT (>= Jun 5) but we have not tested that.

devel/kdevelop:
	[10] Upgrade to 2.1.1 and use KDE 3 version.
	[11] Remove a number of suggested dependencies that no longer fit.
	[12] Account for where the docs for Qt went since they got moved
	     to fit in hier(7) better.

graphics/kdegraphics3:
	[13] Turn off kuickshow by default because it depends on imlib,
	     which in turn depends on gtk/glib.  This will be revisited
	     when we split up the KDE ports a bit.

games/kdegames3:
	[14] Fix compile error on -CURRENT where kpat/freecell-solver/md5.h
	     tried to define uint32_t after sys/types.h already had.

sysutils/kdeadmin3:
	No particular changes.

misc/kdeaddons3:
	No particular changes.

misc/kdeedu3:
	[15] Re-add the huge number of missing @dirrm's.

misc/kdeutils3:
	No particular changes.

misc/kde3-i18n-* and */kde3-i18n:
	For the most part, no particular changes.  A huge number of I18N
	message updates went into this release, though.

french/kde3-i18n:
	[16] Fix build Makefile error due to tarball builder's env.

net/kdenetwork3:
	No particular changes.

x11-clocks/kdetoys3:
	No particular changes.

x11/kdebase3:
	[17] Account for mkfontdir "soft" build-time dependency.  If
	     mkfontdir is available, use it to build fonts.dir where
	     kdebase installs fonts.  Otherwise, don't bother.
	[18] Patch ElectricEyes.desktop to use the name of the program
	     that FreeBSD uses when you install the port for it.
	[19] Patches for KDM merged into KDE 3.0.1.
	[20] Properly fix kdm/backend/xdmcp.c string format error.

x11/kdelibs3:
	[21] Support the KDE3 version check to make sure no one
	     tries to install KDE2 then KDE3.  The 'kde-version-check'
	     target is centralized in x11/kde3/Makefile.kde.
	[22] Remove patch for kdeprint/configure.in.in.
	[23] Add patch to fix critical icon loader bug.

x11/kde3:
	[24] Add Makefile.kde for centralizing KDE core-specific macros
	     that don't belong in bsd.kde.mk.

x11-toolkits/qt30:
	[25] Mark broken on any XFree86 version < 4 due to packing list
	     related problems if we tried to support XFree86 3.
	[26] Error out if the user has Qt2 installed already.

x11-wm/kdeartwork3:
	[27] Add USE_MESA to explicitly support the 3D screensavers.
	[28] Re-add a large number of missing @dirrm's.

Credits:

[1] [4] [5] [6] [7]
[9] [10] [14] [16]
[21] [22] [24] [26]:	will

[2] [3] [8] [15] [17]
[19] [25] [27] [28]:	alane

[11] [12]
Submitted by:		Lauri Watts <lauri@kde.org>

[13] Found by:		mi
     Removed by:	will

[18] [23]
Submitted by:		Andy Fawcett <andy@athame.co.uk>

Tested by:		[in addition to the above, in no particular order]
			knu
			Mattias Douhan <matt@athame.co.uk>
			Bradley T. Hughes <bhughes@trolltech.com>
			Erik H. Bakke <ebakke@trolltech.com>
			David Johnson <david@usermode.org>
			JJ Behrens <jj@nttmcl.com>
			Michael W. Collette <metrol@metrol.net>
			Adriaan de Groot <adridg@sci.kun.nl>
			Mark Rowlands <mark.rowlands@minmail.net>
			Mark Stosberg <mark@summersault.com>
			Dave Cantrell <phaedrus@alltel.net>
			Mark Miller <joup@bigfoot.com>
			Wesley Morgan <morganw@chemikals.org>
			Arjan van Leeuwen <avl@operamail.com>

5 files changed, 28 insertions, 15 deletions

diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 383e50438e12..804a297746f2 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdenetwork
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES?=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -21,17 +20,11 @@ USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
-CONFIGURE_ARGS+=--enable-final
-.endif
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.endif
 USE_GMAKE=	yes
 MAKE_ENV=	${CONFIGURE_ENV}
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
 UTMP?=	/var/run/utmp
 .if exists(${UTMP})
 PLIST_SUB+=	KTALKD=""
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 1ca1ce7c97e5..b95b8c5cd165 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdenetwork-3.0.tar.bz2) = 3daa7a1b7f1b2990089d933588b1228d
+MD5 (KDE/kdenetwork-3.0.1.tar.bz2) = 4c8fd0d02855efdf2f02372bb7cf137e
diff --git a/net/kdenetwork3/pkg-comment b/net/kdenetwork3/pkg-comment
index bf5dcda48324..5e7e38a43ed1 100644
--- a/net/kdenetwork3/pkg-comment
+++ b/net/kdenetwork3/pkg-comment
@@ -1 +1 @@
-Network modules for KDE2
+Network modules for KDE3
diff --git a/net/kdenetwork3/pkg-descr b/net/kdenetwork3/pkg-descr
index f7425da6373d..b2a34d9e5c45 100644
--- a/net/kdenetwork3/pkg-descr
+++ b/net/kdenetwork3/pkg-descr
@@ -1,6 +1,6 @@
 KDE provides an integrated X11 based environment, much like CDE.
 This particular port installs the networking components of KDE,
 which includes applications for Internet things like email, web,
-irc, and so forth.  Note that this is for KDE2, not KDE 1.x.
+irc, and so forth.  Note that this is for KDE3, not KDE 1.x or 2.x.
 
 WWW: http://www.kde.org/
diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist
index 1c3cd4496801..8b961be978c6 100644
--- a/net/kdenetwork3/pkg-plist
+++ b/net/kdenetwork3/pkg-plist
@@ -407,7 +407,6 @@ share/apps/kppp/Rules/Denmark/Worldonline-ISDN.rst
 share/apps/kppp/Rules/Estonia/Eesti_Telefon.rst
 share/apps/kppp/Rules/Finland/Vaasan_LP.rst
 share/apps/kppp/Rules/France/France_Telecom_Local.rst
-share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
 share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
 share/apps/kppp/Rules/France/France_Telecom_National.rst
 share/apps/kppp/Rules/Germany/2.5min.rst
@@ -807,7 +806,22 @@ share/services/kxmlrpcd.desktop
 share/services/lan.protocol
 share/services/rlan.protocol
 %%KTALKD%%share/sounds/ktalkd.wav
-@comment dirs
+@comment directories
+@dirrm share/sounds
+@dirrm share/services
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/lisa
 @dirrm share/doc/HTML/en/ktalkd
 @dirrm share/doc/HTML/en/ksirc
@@ -819,6 +833,10 @@ share/services/rlan.protocol
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en/kit
 @dirrm share/doc/HTML/en/kdict
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/config
 @dirrm share/apps/lisa
 @dirrm share/apps/ksirc/pics/emoticons
 @dirrm share/apps/ksirc/pics
@@ -925,6 +943,7 @@ share/services/rlan.protocol
 @dirrm share/apps/kdict/icons
 @dirrm share/apps/kdict
 @dirrm share/apps/kconf_update
+@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/Settings/System
 @dirrm share/applnk/Settings/Personalization
@@ -933,4 +952,5 @@ share/services/rlan.protocol
 @dirrm share/applnk/Internet
 @dirrm share/applnk/.hidden
 @dirrm share/applnk
+@dirrm lib/kde3
 @dirrm include/mimelib