5 files changed, 253 insertions, 58 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index d25f1d64af7e..f8fc8cddafcf 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	KDE libraries 2
+# New ports collection makefile for:	KDE libraries 3
 # Date created:				Fri Apr 14 2000 15:05:00 EDT
 # Whom:					will
 #
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -36,19 +35,9 @@ SOMINOR=	0
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install
-.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
 
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS=		-O0 ${KDE_CFLAGS}
-.endif
+.include "${.CURDIR}/../kde3/Makefile.kde"
 
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
@@ -56,7 +45,7 @@ PLIST_SUB+=	LIBVER="${SOMAJOR}" LDCONFIG="${LDCONFIG}"
 
 .include <bsd.port.pre.mk>
 
-pre-fetch:
+pre-fetch: kde-version-check
 .if ${OSVERSION} <= 410002
 	@${ECHO}
 	@${ECHO} "			NOTICE"
@@ -64,24 +53,13 @@ pre-fetch:
 	@${ECHO} "Your OpenSSL installation could be out of date.  This is"
 	@${ECHO} "just a warning, but if your system's world was built on"
 	@${ECHO} "sources earlier than August 20 along RELENG_4 or older,"
-	@${ECHO} "then KDE2 will not build with SSL support."
+	@${ECHO} "then KDE3 will not build with SSL support."
 	@${ECHO}
 .endif
 
 pre-configure:
 	cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs
 
-pre-extract:
-.if exists(${LOCALBASE}/include/kfm.h)
-	@${ECHO}
-	@${ECHO} "			NOTICE"
-	@${ECHO}
-	@${ECHO} "You have KDE1 headers installed!  Installing this port"
-	@${ECHO} "will result in conflicts between KDE2 and KDE1!"
-	@${ECHO}
-	@${FALSE}
-.endif
-
 post-install:
 	${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh
 	${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 28cdd8726b76..42d3ecee384f 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.0.tar.bz2) = 8455a5cf2d7c06d62f749459a01cfaba
+MD5 (KDE/kdelibs-3.0.1.tar.bz2) = d85d8cca1b1dd47958f6fd1fdd46b85e
diff --git a/x11/kdelibs4/files/patch-configure b/x11/kdelibs4/files/patch-configure
deleted file mode 100644
index 088311a730e5..000000000000
--- a/x11/kdelibs4/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdeprint/configure.in.in	2001/10/15 08:28:25	1.10
-+++ kdeprint/configure.in.in.new	2002/04/11 16:14:37
-@@ -5,7 +5,8 @@ kde_save_libs="$LIBS"
- LIBS="$all_libraries $USER_LDFLAGS -lcups $LIBDL $LIBSOCKET"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- AC_MSG_CHECKING(CUPS version >= $1)
--ac_link='${CC} $CFLAGS -o conftest conftest.c $LIBS 1>&5'
-+AC_LANG_SAVE
-+AC_LANG_C
- cat > conftest.c <<EOF
- #include <cups/cups.h>
- #include <stdio.h>
-@@ -30,6 +31,7 @@ else
-   ac_have_new_cups="no"
- fi
- rm -f conftest*
-+AC_LANG_RESTORE
- CFLAGS="$kde_save_cflags"
- LIBS="$kde_save_libs"
- AC_MSG_RESULT("$ac_have_new_cups")
diff --git a/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp b/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp
new file mode 100644
index 000000000000..0fc6507298c4
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp
@@ -0,0 +1,55 @@
+--- kdecore/kiconloader.cpp	Wed May  8 14:27:24 2002
++++ /home/alane/kiconloader-3.0.cpp	Sat Jun  8 12:05:25 2002
+@@ -1,6 +1,6 @@
+ /* vi: ts=8 sts=4 sw=4
+  *
+- * $Id: kiconloader.cpp,v 1.186 2002/03/18 00:27:25 carewolf Exp $
++ * $Id: kiconloader.cpp,v 1.186.2.2 2002/06/03 11:14:08 faure Exp $
+  *
+  * This file is part of the KDE project, module kdecore.
+  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
+@@ -220,7 +220,7 @@
+ 	d->mpGroups[i].size = config->readNumEntry("Size", 0);
+ 	d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false);
+ 	if (QPixmap::defaultDepth()>8)
+-	    d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", false);
++	    d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", true);
+ 	else
+ 	    d->mpGroups[i].alphaBlending = false;
+ 
+@@ -266,21 +266,23 @@
+ 
+ void KIconLoader::addAppThemes(const QString& appname)
+ {
+-    KIconThemeNode *node = 0L;
+-    KIconTheme *theme = 0L;
+-
+-    theme = new KIconTheme("hicolor", appname);
+-    if (theme->isValid())
+-	node = new KIconThemeNode(theme);
+-    else
+-	delete theme;
+-
+-    if (node)
++    if ( KIconTheme::current() != "hicolor" )
+     {
+-	node->links.append(d->mpThemeRoot);
+-	d->mpThemeRoot = node;
++        KIconTheme *def = new KIconTheme(KIconTheme::current(), appname);
++        if (def->isValid())
++        {
++            KIconThemeNode* node = new KIconThemeNode(def);
++            d->mpThemeRoot->links.append(node);
++            addBaseThemes(node, appname);
++        }
++        else
++            delete def;
+     }
+ 
++    KIconTheme *def = new KIconTheme(QString::fromLatin1("hicolor"), appname);
++    KIconThemeNode* node = new KIconThemeNode(def);
++    d->mpThemeRoot->links.append(node);
++    addBaseThemes(node, appname);
+ }
+ 
+ void KIconLoader::addBaseThemes(KIconThemeNode *node, const QString &appname)
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 09990d019ca3..70777cdbe926 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -533,6 +533,8 @@ lib/kde3/kdeprint_rlpr.la
 lib/kde3/kdeprint_rlpr.so
 lib/kde3/kgzipfilter.la
 lib/kde3/kgzipfilter.so
+lib/kde3/khtmlimagepart.la
+lib/kde3/khtmlimagepart.so
 lib/kde3/kimg_eps.la
 lib/kde3/kimg_eps.so
 lib/kde3/kimg_g3.la
@@ -620,8 +622,6 @@ lib/libkdeui.so.4
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.4
-lib/libkhtmlimage.la
-lib/libkhtmlimage.so
 lib/libkio.la
 lib/libkio.so
 lib/libkio.so.4
@@ -3187,13 +3187,195 @@ share/servicetypes/ktexteditoreditor.desktop
 share/servicetypes/kurifilterplugin.desktop
 share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@comment empty dirs
 @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
 @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@comment directories
+@dirrm share/servicetypes
+@dirrm share/services/kded
+@dirrm share/services
+@dirrm share/mimelnk/video
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk/multipart
+@dirrm share/mimelnk/message
+@dirrm share/mimelnk/inode
+@dirrm share/mimelnk/image
+@dirrm share/mimelnk/audio
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk/all
+@dirrm share/mimelnk
+@dirrm share/icons/hicolor/64x64/mimetypes
+@dirrm share/icons/hicolor/64x64/filesystems
+@dirrm share/icons/hicolor/64x64
+@dirrm share/icons/hicolor/48x48/mimetypes
+@dirrm share/icons/hicolor/48x48/filesystems
+@dirrm share/icons/hicolor/48x48/devices
+@dirrm share/icons/hicolor/48x48/actions
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/mimetypes
+@dirrm share/icons/hicolor/32x32/filesystems
+@dirrm share/icons/hicolor/32x32/devices
+@dirrm share/icons/hicolor/32x32/actions/kde
+@dirrm share/icons/hicolor/32x32/actions
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/22x22/actions/kde
+@dirrm share/icons/hicolor/22x22/actions
+@dirrm share/icons/hicolor/22x22
+@dirrm share/icons/hicolor/16x16/mimetypes
+@dirrm share/icons/hicolor/16x16/filesystems
+@dirrm share/icons/hicolor/16x16/devices
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16/actions
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kspell
+@dirrm share/doc/HTML/en/common
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/config/ui
+@dirrm share/config/colors
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle/pixmaps/riscos
+@dirrm share/apps/kstyle/pixmaps
+@dirrm share/apps/kstyle
+@dirrm share/apps/kssl
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools
+@dirrm share/apps/ksgmltools2/docbook/xsl/params
+@dirrm share/apps/ksgmltools2/docbook/xsl/lib
+@dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
+@dirrm share/apps/ksgmltools2/docbook/xsl/images
+@dirrm share/apps/ksgmltools2/docbook/xsl/html
+@dirrm share/apps/ksgmltools2/docbook/xsl/common
+@dirrm share/apps/ksgmltools2/docbook/xsl
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
+@dirrm share/apps/ksgmltools2/docbook
+@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
+@dirrm share/apps/ksgmltools2/customization/zh-TW
+@dirrm share/apps/ksgmltools2/customization/xsl
+@dirrm share/apps/ksgmltools2/customization/uk/entities
+@dirrm share/apps/ksgmltools2/customization/uk
+@dirrm share/apps/ksgmltools2/customization/tr/entities
+@dirrm share/apps/ksgmltools2/customization/tr
+@dirrm share/apps/ksgmltools2/customization/sv/entities
+@dirrm share/apps/ksgmltools2/customization/sv
+@dirrm share/apps/ksgmltools2/customization/sr/entities
+@dirrm share/apps/ksgmltools2/customization/sr
+@dirrm share/apps/ksgmltools2/customization/sl/entities
+@dirrm share/apps/ksgmltools2/customization/sl
+@dirrm share/apps/ksgmltools2/customization/sk/entities
+@dirrm share/apps/ksgmltools2/customization/sk
+@dirrm share/apps/ksgmltools2/customization/ru/entities
+@dirrm share/apps/ksgmltools2/customization/ru
+@dirrm share/apps/ksgmltools2/customization/ro/entities
+@dirrm share/apps/ksgmltools2/customization/ro
+@dirrm share/apps/ksgmltools2/customization/pt/entities
+@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
+@dirrm share/apps/ksgmltools2/customization/pt-BR
+@dirrm share/apps/ksgmltools2/customization/pt
+@dirrm share/apps/ksgmltools2/customization/pl/entities
+@dirrm share/apps/ksgmltools2/customization/pl
+@dirrm share/apps/ksgmltools2/customization/no/entities
+@dirrm share/apps/ksgmltools2/customization/no
+@dirrm share/apps/ksgmltools2/customization/nn/entities
+@dirrm share/apps/ksgmltools2/customization/nn
+@dirrm share/apps/ksgmltools2/customization/nl/entities
+@dirrm share/apps/ksgmltools2/customization/nl
+@dirrm share/apps/ksgmltools2/customization/ko/entities
+@dirrm share/apps/ksgmltools2/customization/ko
+@dirrm share/apps/ksgmltools2/customization/ja/entities
+@dirrm share/apps/ksgmltools2/customization/ja
+@dirrm share/apps/ksgmltools2/customization/it/entities
+@dirrm share/apps/ksgmltools2/customization/it
+@dirrm share/apps/ksgmltools2/customization/id/entities
+@dirrm share/apps/ksgmltools2/customization/id
+@dirrm share/apps/ksgmltools2/customization/hu/entities
+@dirrm share/apps/ksgmltools2/customization/hu
+@dirrm share/apps/ksgmltools2/customization/fr/entities
+@dirrm share/apps/ksgmltools2/customization/fr
+@dirrm share/apps/ksgmltools2/customization/fi/entities
+@dirrm share/apps/ksgmltools2/customization/fi
+@dirrm share/apps/ksgmltools2/customization/et/entities
+@dirrm share/apps/ksgmltools2/customization/et
+@dirrm share/apps/ksgmltools2/customization/es/entities
+@dirrm share/apps/ksgmltools2/customization/es
+@dirrm share/apps/ksgmltools2/customization/entities
+@dirrm share/apps/ksgmltools2/customization/en/entities
+@dirrm share/apps/ksgmltools2/customization/en-GB/entities
+@dirrm share/apps/ksgmltools2/customization/en-GB
+@dirrm share/apps/ksgmltools2/customization/en
+@dirrm share/apps/ksgmltools2/customization/el/entities
+@dirrm share/apps/ksgmltools2/customization/el
+@dirrm share/apps/ksgmltools2/customization/dtd
+@dirrm share/apps/ksgmltools2/customization/de/entities
+@dirrm share/apps/ksgmltools2/customization/de
+@dirrm share/apps/ksgmltools2/customization/da/entities
+@dirrm share/apps/ksgmltools2/customization/da
+@dirrm share/apps/ksgmltools2/customization/cs/entities
+@dirrm share/apps/ksgmltools2/customization/cs
+@dirrm share/apps/ksgmltools2/customization/ca/entities
+@dirrm share/apps/ksgmltools2/customization/ca
+@dirrm share/apps/ksgmltools2/customization/af/entities
+@dirrm share/apps/ksgmltools2/customization/af
+@dirrm share/apps/ksgmltools2/customization
+@dirrm share/apps/ksgmltools2
+@dirrm share/apps/knotify
+@dirrm share/apps/kjava
+@dirrm share/apps/kio_uiserver/icons/hicolor/16x16/apps
+@dirrm share/apps/kio_uiserver/icons/hicolor/16x16
+@dirrm share/apps/kio_uiserver/icons/hicolor
+@dirrm share/apps/kio_uiserver/icons
+@dirrm share/apps/kio_uiserver
+@dirrm share/apps/khtml/icons/hicolor/32x32/actions
+@dirrm share/apps/khtml/icons/hicolor/32x32
+@dirrm share/apps/khtml/icons/hicolor/22x22/actions
+@dirrm share/apps/khtml/icons/hicolor/22x22
+@dirrm share/apps/khtml/icons/hicolor/16x16/actions
+@dirrm share/apps/khtml/icons/hicolor/16x16
+@dirrm share/apps/khtml/icons/hicolor
+@dirrm share/apps/khtml/icons
+@dirrm share/apps/khtml/css
+@dirrm share/apps/khtml
+@dirrm share/apps/kdewidgets/pics
+@dirrm share/apps/kdewidgets
+@dirrm share/apps/kdeui/pics
+@dirrm share/apps/kdeui
+@dirrm share/apps/kdeprint/plugins
+@dirrm share/apps/kdeprint/pics
+@dirrm share/apps/kdeprint/icons/hicolor/32x32/apps
+@dirrm share/apps/kdeprint/icons/hicolor/32x32/actions
+@dirrm share/apps/kdeprint/icons/hicolor/32x32
+@dirrm share/apps/kdeprint/icons/hicolor/22x22/actions
+@dirrm share/apps/kdeprint/icons/hicolor/22x22
+@dirrm share/apps/kdeprint/icons/hicolor/16x16/apps
+@dirrm share/apps/kdeprint/icons/hicolor/16x16/actions
+@dirrm share/apps/kdeprint/icons/hicolor/16x16
+@dirrm share/apps/kdeprint/icons/hicolor
+@dirrm share/apps/kdeprint/icons
+@dirrm share/apps/kdeprint/filters
+@dirrm share/apps/kdeprint
+@dirrm share/apps/kconf_update
+@dirrm share/apps/kcertpart
+@dirrm share/apps/kate/syntax
+@dirrm share/apps/kate
+@dirrm share/apps/LICENSES
+@dirrm share/apps
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins/designer
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
+@dirrm include/libkmid
+@dirrm include/ktexteditor
+@dirrm include/kparts
+@dirrm include/kjs
+@dirrm include/kio
+@dirrm include/kdesu
+@dirrm include/kdeprint
+@dirrm include/kate
+@dirrm include/kabc
+@dirrm include/dom