Update to KDE 3.3.1. Also provide pkgsrc option to build in SMB support.

Changes:
* kinfocenter: fixed crash in USB viewer
* konqueror: "Advanced Add Bookmark" didn't affect right-click bookmarking
* konqueror: "Duplicate Tab" now respects "After Current Tab" setting
* konqueror: Only let linked views in same tab follow changes
* konsole: Added AppScreen support to keytab
* konsole: Cycling trough tabs with keyboard caused terminal size to be
  printed
* konsole: Don't crash when showing tabbar with centered background

3 files changed, 20 insertions, 6 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index a0f3ee9d38a..afe42001cfc 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: Makefile,v 1.59 2004/10/13 11:54:11 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
@@ -59,6 +58,10 @@ CONFIGURE_ENV+=		RUN_KAPPFINDER=no
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kdebase
+PKG_SUPPORTED_OPTIONS=	samba
+.include "../../mk/bsd.options.mk"
+
 .if exists(${X11BASE}/include/X11/extensions/Xrandr.h)
 HAVE_RANDR!=		${GREP} XRRSetScreenConfigAndRateX  ${X11BASE}/include/X11/extensions/Xrandr.h; ${ECHO}
 .endif
@@ -74,6 +77,12 @@ PLIST_SUBST+=		HAVE_XCURSOR=""
 PLIST_SUBST+=		HAVE_XCURSOR="@comment "
 .endif
 
+.if !empty(PKG_OPTIONS:Msamba)
+.include "../../net/samba/buildlink3.mk"
+LIBS+=			-L${BUILDLINK_PREFIX.samba}/lib/samba -Wl,-R${BUILDLINK_PREFIX.samba}/lib/samba
+PLIST_SUBST+=		HAVE_SMB=""
+.endif
+
 ICONDIR=		share/kde/icons
 
 .if ${OPSYS} == "NetBSD"
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index c3681428702..d2a962545ec 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2004/09/22 08:10:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.24 2004/10/13 11:54:11 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -244,6 +244,7 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_print.la
 lib/kde3/kio_settings.la
 lib/kde3/kio_sftp.la
+${HAVE_SMB}lib/kde3/kio_smb.la
 lib/kde3/kio_smtp.la
 lib/kde3/kio_tar.la
 lib/kde3/kio_thumbnail.la
@@ -1762,6 +1763,7 @@ share/kde/apps/konqueror/about/specs.html
 share/kde/apps/konqueror/about/specs_rtl.html
 share/kde/apps/konqueror/about/tips.html
 share/kde/apps/konqueror/about/tips_rtl.html
+${HAVE_SMB}share/kde/apps/konqueror/dirtree/remote/smb-network.desktop
 share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
 share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png
@@ -3193,6 +3195,8 @@ share/kde/mimelnk/application/x-kate-project.desktop
 share/kde/mimelnk/application/x-konsole.desktop
 share/kde/mimelnk/application/x-ksysguard.desktop
 share/kde/mimelnk/application/x-ktheme.desktop
+${HAVE_SMB}share/kde/mimelnk/application/x-smb-server.desktop
+${HAVE_SMB}share/kde/mimelnk/application/x-smb-workgroup.desktop
 share/kde/mimelnk/fonts/folder.desktop
 share/kde/mimelnk/fonts/system-folder.desktop
 share/kde/mimelnk/print/class.desktop
@@ -3340,6 +3344,7 @@ share/kde/services/searchproviders/wikipedia.desktop
 share/kde/services/searchproviders/wordref.desktop
 share/kde/services/settings.protocol
 share/kde/services/sftp.protocol
+${HAVE_SMB}share/kde/services/smb.protocol
 share/kde/services/smtp.protocol
 share/kde/services/smtps.protocol
 share/kde/services/tar.protocol
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index f06a1315203..342dbfb7309 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.55 2004/08/21 12:35:15 markd Exp $
+$NetBSD: distinfo,v 1.56 2004/10/13 11:54:11 markd Exp $
 
-SHA1 (kdebase-3.3.0.tar.bz2) = 25248e685559631b65ff91800bc198242e2e08b7
-Size (kdebase-3.3.0.tar.bz2) = 19849208 bytes
+SHA1 (kdebase-3.3.1.tar.bz2) = b3eafb32553ab621569301bb7628a5063a497dcf
+Size (kdebase-3.3.1.tar.bz2) = 19906317 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b