Various fixes for the Darwin build.

4 files changed, 41 insertions, 9 deletions

diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile
index 2b8d4863b4d..431ec1fe6f6 100644
--- a/x11/kde-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2016/04/11 17:06:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.64 2016/04/22 08:04:23 jperkin Exp $
 
 DISTNAME=	kde-runtime-15.12.0
 PKGNAME=	${DISTNAME:S/-1/4-1/}
@@ -11,8 +11,13 @@ MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.12.0/src/}
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 CMAKE_ARGS+=	-DWITH_LibSSH:BOOL=OFF
+.include "../../mk/bsd.prefs.mk"
 CMAKE_ARGS+=	-DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
+.if ${OPSYS} == "Darwin"
+CMAKE_ARGS+=	-DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.dylib
+.else
 CMAKE_ARGS+=	-DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
+.endif
 
 DEPENDS+=	htdig>=3.2.0:../../www/htdig
 DEPENDS+=	oxygen-icons-[0-9]*:../../graphics/oxygen-icons
@@ -22,7 +27,6 @@ USE_TOOLS+=		gmake
 CFLAGS.SunOS+=	-DPORTMAP
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
-.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
 # Some files are conditional on 'md5sum' or 'md5' being present.
@@ -33,6 +37,12 @@ PLIST.md5=	yes
 .  endif
 .endfor
 
+PLIST_VARS+=	polkit x11
+.if ${OPSYS} != "Darwin"
+PLIST.polkit=	yes
+PLIST.x11=	yes
+.endif
+
 SUBST_CLASSES+=		htdig
 SUBST_STAGE.htdig=	post-patch
 SUBST_MESSAGE.htdig=	Fix htdig paths.
diff --git a/x11/kde-runtime4/PLIST b/x11/kde-runtime4/PLIST
index 66d675b00d7..97db44bd2f8 100644
--- a/x11/kde-runtime4/PLIST
+++ b/x11/kde-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/01/10 19:05:27 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/04/22 08:04:23 jperkin Exp $
 bin/kcmshell4
 bin/kde-cp
 bin/kde-mv
@@ -18,7 +18,7 @@ bin/kmimetypefinder
 bin/knotify4
 bin/kquitapp
 bin/kreadconfig
-bin/kstart
+${PLIST.x11}bin/kstart
 bin/ksvgtopng
 bin/ktraderclient
 bin/ktrash
@@ -35,7 +35,7 @@ lib/attica_kde.so
 lib/kconf_update_bin/phonon_devicepreference_update
 lib/kconf_update_bin/phonon_deviceuids_update
 lib/kde4/comicbookthumbnail.so
-lib/kde4/cursorthumbnail.so
+${PLIST.x11}lib/kde4/cursorthumbnail.so
 lib/kde4/djvuthumbnail.so
 lib/kde4/exrthumbnail.so
 lib/kde4/fixhosturifilter.so
@@ -171,7 +171,7 @@ lib/kde4/libexec/drkonqi
 lib/kde4/libexec/kcmremotewidgetshelper
 lib/kde4/libexec/kdeeject
 lib/kde4/libexec/kdesu
-lib/kde4/libexec/kdesud
+${PLIST.x11}lib/kde4/libexec/kdesud
 lib/kde4/libexec/kdontchangethehostname
 lib/kde4/libexec/khc_docbookdig.pl
 lib/kde4/libexec/khc_htdig.pl
@@ -263,7 +263,7 @@ lib/libmolletnetwork.so.4
 lib/libmolletnetwork.so.${KDELIBSVER}
 man/man1/kdesu.1
 man/man1/plasmapkg.1
-share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
+${PLIST.polkit}share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
 share/applications/kde4/Help.desktop
 share/applications/kde4/knetattach.desktop
 share/dbus-1/interfaces/org.kde.KTimeZoned.xml
@@ -849,7 +849,7 @@ share/kde4/services/bzip2.protocol
 share/kde4/services/cgi.protocol
 share/kde4/services/comicbookthumbnail.desktop
 share/kde4/services/componentchooser.desktop
-share/kde4/services/cursorthumbnail.desktop
+${PLIST.x11}share/kde4/services/cursorthumbnail.desktop
 share/kde4/services/desktop.protocol
 share/kde4/services/desktopthumbnail.desktop
 share/kde4/services/device_automounter_kcm.desktop
diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo
index 19cd34a7fed..55c70afb228 100644
--- a/x11/kde-runtime4/distinfo
+++ b/x11/kde-runtime4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2016/01/10 19:05:27 markd Exp $
+$NetBSD: distinfo,v 1.14 2016/04/22 08:04:23 jperkin Exp $
 
 SHA1 (kde-runtime-15.12.0.tar.xz) = 30da08dfb51fade220df7f8cf3e3eab5669a2e18
 RMD160 (kde-runtime-15.12.0.tar.xz) = 37e6c3693e81b31a4b92a5eeb35f8c84602bf86d
@@ -12,5 +12,6 @@ SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896
 SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7
 SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a
 SHA1 (patch-ak) = 4fee3877613afddf179a7a8376586a6391b53c89
+SHA1 (patch-doc_kcontrol_CMakeLists.txt) = c6300735d29c009322e4fdb4d58a606940fb0c62
 SHA1 (patch-kioslave_nfs_rpc__nfs2__prot__xdr.c) = f1d8dc8224e68ef323f06602bf4b856c785f15e4
 SHA1 (patch-kwalletd_backend_blowfish.h) = 23bd9bf9671a770d203a10c46dc602145d2b9457
diff --git a/x11/kde-runtime4/patches/patch-doc_kcontrol_CMakeLists.txt b/x11/kde-runtime4/patches/patch-doc_kcontrol_CMakeLists.txt
new file mode 100644
index 00000000000..56f3eb3a600
--- /dev/null
+++ b/x11/kde-runtime4/patches/patch-doc_kcontrol_CMakeLists.txt
@@ -0,0 +1,21 @@
+$NetBSD: patch-doc_kcontrol_CMakeLists.txt,v 1.1 2016/04/22 08:04:23 jperkin Exp $
+
+Add various bits which build fine on Darwin.
+
+--- doc/kcontrol/CMakeLists.txt.orig	2015-11-05 04:25:02.000000000 +0000
++++ doc/kcontrol/CMakeLists.txt
+@@ -16,7 +16,7 @@ add_subdirectory(smb)
+ endif ( NOT Q_WS_WIN )
+ add_subdirectory(emoticons)
+ 
+-if ( Q_WS_X11 )
++if ( Q_WS_X11 OR Q_WS_MAC )
+ add_subdirectory(cache)
+ add_subdirectory(filemanager)
+ add_subdirectory(filetypes)
+@@ -35,4 +35,4 @@ add_subdirectory(trash)
+ add_subdirectory(history)
+ add_subdirectory(solid-device-automounter)
+ add_subdirectory(phonon)
+-endif ( Q_WS_X11 )
++endif ( Q_WS_X11 OR Q_WS_MAC )