From 44b2180e0b792db9d59ba967b52aa695b4bc1651 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 3 Nov 2005 15:56:57 +0000
Subject: [PATCH] samba support. We do this as a build-depends. If people
 install samba, then smb:// works, otherwise it does not.

---
 x11/kde/base3/Makefile  | 11 +++++++----
 x11/kde/base3/pkg/DESCR |  3 +++
 x11/kde/base3/pkg/PLIST | 12 +++++++++++-
 x11/kde/kde.port.mk     |  4 ++--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile
index f1a0013c9d3..d58bf5af861 100644
--- a/x11/kde/base3/Makefile
+++ b/x11/kde/base3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.46 2005/10/24 10:56:03 espie Exp $
+# $OpenBSD: Makefile,v 1.47 2005/11/03 15:56:57 espie Exp $
 
 COMMENT= 		"K Desktop Environment, basic applications"
 COMMENT-plugins=	"Konqueror nsplugins, essentially native JDK"
 CATEGORIES=		x11 x11/kde
 VERSION=		3.4.3
 DISTNAME=		kdebase-${VERSION}
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 MODKDE_VERSION?=	3.4
 
 FLAVORS=		debug
@@ -26,9 +26,12 @@ EXTRA_CONFIG=	xdg/menus/kde-settings.menu \
 LIB_DEPENDS+= \
 	glib-2.0.0.0,gmodule-2.0.0.0,gthread-2.0.0.0::devel/glib2
 
+.if !defined(PACKAGING)
+LIB_DEPENDS+=	lib/samba/smbclient:samba->=3:net/samba
+.endif
 
-CONFIGURE_ENV+=ac_cv_header_libsmbclient=no \
-	PKG_CONFIG_PATH=${X11BASE}/lib/pkgconfig
+
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${X11BASE}/lib/pkgconfig
 
 SAMPLECONFDIR=${PREFIX}/share/apps/kde-conf-sample
 
diff --git a/x11/kde/base3/pkg/DESCR b/x11/kde/base3/pkg/DESCR
index 161ec71fedd..230897e1638 100644
--- a/x11/kde/base3/pkg/DESCR
+++ b/x11/kde/base3/pkg/DESCR
@@ -72,3 +72,6 @@ over on your .kde files.  Managing legacy config files is quite buggy yet.
 - Konqueror does not execute JavaScript nor Java by default. You will need
 a recent JVM installed, and referenced from Konqueror's menu, for Java to
 work.
+
+- samba share do only work is you install samba. There is no hard coded
+dependency on samba, though...
diff --git a/x11/kde/base3/pkg/PLIST b/x11/kde/base3/pkg/PLIST
index 1caf04d437f..20c27df5b1a 100644
--- a/x11/kde/base3/pkg/PLIST
+++ b/x11/kde/base3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.31 2005/08/16 09:49:53 espie Exp $
+@comment $OpenBSD: PLIST,v 1.32 2005/11/03 15:56:57 espie Exp $
 @conflict kdeartwork-<=3.4
 @conflict kdeedu-<3.4
 bin/appletproxy
@@ -389,6 +389,8 @@ ${KDE}/kio_settings.la
 ${KDE}/kio_settings.so
 ${KDE}/kio_sftp.la
 ${KDE}/kio_sftp.so
+${KDE}/kio_smb.la
+${KDE}/kio_smb.so
 ${KDE}/kio_smtp.la
 ${KDE}/kio_smtp.so
 ${KDE}/kio_system.la
@@ -1718,6 +1720,9 @@ share/apps/konqueror/about/plugins_rtl.html
 share/apps/konqueror/about/specs.html
 share/apps/konqueror/about/tips.html
 share/apps/konqueror/about/top-right-konqueror.png
+share/apps/konqueror/dirtree/
+share/apps/konqueror/dirtree/remote/
+share/apps/konqueror/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/
 share/apps/konqueror/icons/crystalsvg/
 share/apps/konqueror/icons/crystalsvg/16x16/
@@ -1975,6 +1980,8 @@ share/apps/naughtyapplet/pics/naughty-happy.png
 share/apps/naughtyapplet/pics/naughty-sad.png
 share/apps/plugin/
 share/apps/plugin/nspluginpart.rc
+share/apps/remoteview/
+share/apps/remoteview/smb-network.desktop
 share/apps/systemview/
 share/apps/systemview/home.desktop
 share/apps/systemview/media.desktop
@@ -4209,6 +4216,8 @@ share/mimelnk/application/x-kate-project.desktop
 share/mimelnk/application/x-konsole.desktop
 share/mimelnk/application/x-ksysguard.desktop
 share/mimelnk/application/x-ktheme.desktop
+share/mimelnk/application/x-smb-server.desktop
+share/mimelnk/application/x-smb-workgroup.desktop
 share/mimelnk/fonts/
 share/mimelnk/fonts/folder.desktop
 share/mimelnk/fonts/system-folder.desktop
@@ -4404,6 +4413,7 @@ share/services/searchproviders/wikipedia.desktop
 share/services/searchproviders/wordref.desktop
 share/services/settings.protocol
 share/services/sftp.protocol
+share/services/smb.protocol
 share/services/smtp.protocol
 share/services/smtps.protocol
 share/services/system.protocol
diff --git a/x11/kde/kde.port.mk b/x11/kde/kde.port.mk
index 62315c90e34..f104aa8c8ab 100644
--- a/x11/kde/kde.port.mk
+++ b/x11/kde/kde.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: kde.port.mk,v 1.17 2005/09/18 12:21:07 espie Exp $
+# $OpenBSD: kde.port.mk,v 1.18 2005/11/03 15:56:57 espie Exp $
 
 SHARED_ONLY?=	Yes
 
@@ -14,7 +14,7 @@ FLAVORS+=	debug
 FLAVOR?=
 
 MODKDE_CONFIGURE_ARGS=${MODQT_CONFIGURE_ARGS}
-MODKDE_CONFIGURE_ARGS+=	--with-extra-libs="${LOCALBASE}/lib"
+MODKDE_CONFIGURE_ARGS+=	--with-extra-libs="${LOCALBASE}/lib/samba:${LOCALBASE}/lib"
 MODKDE_CONFIGURE_ARGS+=	--with-extra-includes="${LOCALBASE}/include/libpng:${LOCALBASE}/include"
 MODKDE_CONFIGURE_ARGS+=	--with-xdmdir=/var/X11/kdm
 MODKDE_CONFIGURE_ARGS+=	--enable-mitshm