Upgrade to 2.0.1

3 files changed, 34 insertions, 23 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 90ad5e7fb65d..2c79caa3c9a1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 x11-toolkits
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		mimelib.3:${PORTSDIR}/converters/kdesupport2
 
@@ -28,8 +26,7 @@ USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index c7a142afe021..763aa8c1e749 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.0.tar.bz2) = 7376ddd726b8f77223bf08a7de2dfb3d
+MD5 (kdelibs-2.0.1.tar.bz2) = 563d6b24a216a32be2f55f5b1c14e14c
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 92e2cb1e4a75..23caf2feb129 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -160,6 +160,7 @@ include/kdesu/defaults.h
 include/kdesu/kcookie.h
 include/kdesu/kdesu_pty.h
 include/kdesu/process.h
+include/kdesu/pty.h
 include/kdesu/ssh.h
 include/kdesu/stub.h
 include/kdesu/su.h
@@ -383,20 +384,6 @@ include/progressbase.h
 include/qconfigDB.h
 include/qxembed.h
 include/statusbarprogress.h
-lib/Arts/Synth_ADD.mcopclass
-lib/Arts/Synth_AMAN_PLAY.mcopclass
-lib/Arts/Synth_AMAN_RECORD.mcopclass
-lib/Arts/Synth_BUS_DOWNLINK.mcopclass
-lib/Arts/Synth_BUS_UPLINK.mcopclass
-lib/Arts/Synth_FREQUENCY.mcopclass
-lib/Arts/Synth_MUL.mcopclass
-lib/Arts/Synth_MULTI_ADD.mcopclass
-lib/Arts/Synth_PLAY.mcopclass
-lib/Arts/Synth_PLAY_WAV.mcopclass
-lib/Arts/Synth_RECORD.mcopclass
-lib/Arts/Synth_WAVE_SIN.mcopclass
-lib/Arts/WavPlayObject.mcopclass
-lib/Arts/X11GlobalComm.mcopclass
 lib/b3style.la
 lib/b3style.so
 lib/basicstyle.la
@@ -480,7 +467,6 @@ lib/libkdeui.so.4
 lib/libkfile.la
 lib/libkfile.so
 lib/libkfile.so.4
-lib/libkformula.so
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.4
@@ -526,6 +512,20 @@ lib/libsoundserver_idl.so.0
 lib/libx11globalcomm.la
 lib/libx11globalcomm.so
 lib/libx11globalcomm.so.0
+lib/mcop/Arts/Synth_ADD.mcopclass
+lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
+lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
+lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
+lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
+lib/mcop/Arts/Synth_FREQUENCY.mcopclass
+lib/mcop/Arts/Synth_MUL.mcopclass
+lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
+lib/mcop/Arts/Synth_PLAY.mcopclass
+lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
+lib/mcop/Arts/Synth_RECORD.mcopclass
+lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
+lib/mcop/Arts/WavPlayObject.mcopclass
+lib/mcop/Arts/X11GlobalComm.mcopclass
 share/apps/LICENSES/ARTISTIC
 share/apps/LICENSES/BSD
 share/apps/LICENSES/GPL_V2
@@ -1087,6 +1087,7 @@ share/doc/HTML/en/common/warning.png
 share/doc/HTML/en/common/x11-licence.html
 share/doc/HTML/en/common/xml.dcl
 share/doc/HTML/en/kspell/.anchors
+share/doc/HTML/en/kspell/common
 share/doc/HTML/en/kspell/configuration-dialog-.html
 share/doc/HTML/en/kspell/contact-information.html
 share/doc/HTML/en/kspell/encodings.html
@@ -2094,6 +2095,7 @@ share/servicetypes/krop.desktop
 share/servicetypes/krwp.desktop
 share/servicetypes/ktexteditor.desktop
 share/servicetypes/kurifilterplugin.desktop
+@dirrm share/doc/HTML/en/kspell
 @dirrm share/apps/kstyle/themes
 @dirrm share/apps/kstyle/pixmaps
 @dirrm share/apps/kstyle
@@ -2152,18 +2154,30 @@ share/servicetypes/kurifilterplugin.desktop
 @dirrm share/apps/ksgmltools/ca/entities
 @dirrm share/apps/ksgmltools/ca
 @dirrm share/apps/ksgmltools
+@dirrm share/apps/kssl
 @dirrm share/apps/kjava
 @dirrm share/apps/kio_uiserver/icons/locolor/16x16/apps
+@dirrm share/apps/kio_uiserver/icons/locolor/16x16
+@dirrm share/apps/kio_uiserver/icons/locolor
+@dirrm share/apps/kio_uiserver/icons
+@dirrm share/apps/kio_uiserver
 @dirrm share/apps/khtml/icons/locolor/16x16/actions
+@dirrm share/apps/khtml/icons/locolor/16x16
+@dirrm share/apps/khtml/icons/locolor
 @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
+@dirrm share/apps/khtml/icons
 @dirrm share/apps/khtml/css
 @dirrm share/apps/khtml
 @dirrm share/apps/kdeui/pics
 @dirrm share/apps/kdeui
 @dirrm share/apps/kab
 @dirrm share/apps/LICENSES
-@dirrm lib/Arts
+@dirrm lib/mcop/Arts
+@dirrm lib/mcop
 @dirrm include/libkmid
 @dirrm include/kparts
 @dirrm include/kjs