From 05323901f642a5c8304549d9d63cb52b6d71cd51 Mon Sep 17 00:00:00 2001 From: zhuk Date: Wed, 23 Dec 2015 10:31:43 +0000 Subject: [PATCH] The smbd binary now lives under sbin/, and not under libexec/. Noticed by jca@, thanks! --- x11/kde4/libs/Makefile | 4 ++-- x11/kde4/libs/patches/patch-kio_kio_ksambashare_cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11/kde4/libs/Makefile b/x11/kde4/libs/Makefile index ec8bcdee0cb..69931e37858 100644 --- a/x11/kde4/libs/Makefile +++ b/x11/kde4/libs/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.71 2015/11/02 11:56:54 espie Exp $ +# $OpenBSD: Makefile,v 1.72 2015/12/23 10:31:43 zhuk Exp $ COMMENT-main = KDE core libraries COMMENT-en_US = KDE en_US locale data COMMENT-langlist = list of languages supported by KDE CATEGORIES = devel V = 4.14.10 -REVISION-main = 1 +REVISION-main = 2 DISTNAME = kdelibs-$V PKGNAME-main = ${DISTNAME} PKGNAME-en_US = kde4-locale-en_US-$V diff --git a/x11/kde4/libs/patches/patch-kio_kio_ksambashare_cpp b/x11/kde4/libs/patches/patch-kio_kio_ksambashare_cpp index 242bc36a6b9..aea7c70b570 100644 --- a/x11/kde4/libs/patches/patch-kio_kio_ksambashare_cpp +++ b/x11/kde4/libs/patches/patch-kio_kio_ksambashare_cpp @@ -1,4 +1,4 @@ -$OpenBSD: patch-kio_kio_ksambashare_cpp,v 1.1 2014/01/26 07:02:18 zhuk Exp $ +$OpenBSD: patch-kio_kio_ksambashare_cpp,v 1.2 2015/12/23 10:31:43 zhuk Exp $ Allow to detect Samba presence. Should fine better way before sending the patch upstream. --- kio/kio/ksambashare.cpp.orig Sun Jan 26 06:51:21 2014 @@ -7,7 +7,7 @@ sending the patch upstream. bool KSambaSharePrivate::isSambaInstalled() { if (QFile::exists("/usr/sbin/smbd") -+ || QFile::exists("${LOCALBASE}/libexec/smbd") ++ || QFile::exists("${LOCALBASE}/sbin/smbd") || QFile::exists("/usr/local/sbin/smbd")) { return true; }