Split libraries into separate package.

8 files changed, 96 insertions, 46 deletions

diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index b8384be7e74..f809fd27476 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.35 2016/03/05 11:27:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2016/05/08 10:44:02 markd Exp $
 
 DISTNAME=	kactivities-4.13.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 COMMENT=	KDE Activity Manager
 MASTER_SITES=	${MASTER_SITE_KDE:=4.13.3/src/}
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
+DEPENDS+=	libkactivities4-[0-9]*:../../x11/libkactivities4
+
+DISTINFO_FILE=	${.CURDIR}/../../x11/libkactivities4/distinfo
+
 # Needs C++11 features for kactivitymanager
 GCC_REQD+=	4.5
 
@@ -16,12 +20,10 @@ CMAKE_ARGS+=	-DWITH_NepomukCore:BOOL=OFF
 # The default MACOSX_DEPLOYMENT_TARGET is incompatible with the C++11 tests.
 CMAKE_ARGS.Darwin+=	-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION}
 
-PKGCONFIG_OVERRIDE+=	lib/libkactivities.pc.cmake
-
-INSTALLATION_DIRS= share/kde/config
+INSTALLATION_DIRS= bin
 
-post-install:
-	${INSTALL_DATA} ${FILESDIR}/activitymanagerrc ${DESTDIR}${PREFIX}/share/kde/config
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/_KDE_build/src/service/kactivitymanagerd ${DESTDIR}${PREFIX}/bin/kactivitymanagerd
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/x11/kactivities/PLIST b/x11/kactivities/PLIST
index 961a5b4e03e..2c3d48d0080 100644
--- a/x11/kactivities/PLIST
+++ b/x11/kactivities/PLIST
@@ -1,39 +1,2 @@
-@comment $NetBSD: PLIST,v 1.6 2014/11/13 10:53:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/05/08 10:44:02 markd Exp $
 bin/kactivitymanagerd
-include/KDE/KActivities/Consumer
-include/KDE/KActivities/Controller
-include/KDE/KActivities/Info
-include/KDE/KActivities/ResourceInstance
-include/KDE/KActivities/Version
-include/kactivities/consumer.h
-include/kactivities/controller.h
-include/kactivities/info.h
-include/kactivities/kactivities_export.h
-include/kactivities/resourceinstance.h
-include/kactivities/version.h
-lib/cmake/KActivities/KActivitiesConfig.cmake
-lib/cmake/KActivities/KActivitiesConfigVersion.cmake
-lib/cmake/KActivities/KActivitiesLibraryTargets-${TARGET}.cmake
-lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
-lib/kde4/activitymanager_plugin_activityranking.so
-lib/kde4/activitymanager_plugin_globalshortcuts.so
-lib/kde4/activitymanager_plugin_slc.so
-lib/kde4/activitymanager_plugin_sqlite.so
-lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
-lib/kde4/kcm_activities.so
-lib/libkactivities.so
-lib/libkactivities.so.6
-lib/libkactivities.so.6.2.0
-lib/pkgconfig/libkactivities.pc
-share/kde/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml
-share/kde/config/activitymanagerrc
-share/kde4/services/activitymanager-plugin-activityranking.desktop
-share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
-share/kde4/services/activitymanager-plugin-slc.desktop
-share/kde4/services/activitymanager-plugin-sqlite.desktop
-share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
-share/kde4/services/kactivitymanagerd.desktop
-share/kde4/services/kcm_activities.desktop
-share/kde4/servicetypes/activitymanager-plugin.desktop
-share/ontology/kde/kao.ontology
-share/ontology/kde/kao.trig
diff --git a/x11/libkactivities4/DESCR b/x11/libkactivities4/DESCR
new file mode 100644
index 00000000000..eb15cc00b15
--- /dev/null
+++ b/x11/libkactivities4/DESCR
@@ -0,0 +1 @@
+KDE Activity Manager
diff --git a/x11/libkactivities4/Makefile b/x11/libkactivities4/Makefile
new file mode 100644
index 00000000000..3bbb4de90b7
--- /dev/null
+++ b/x11/libkactivities4/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2016/05/08 10:44:02 markd Exp $
+
+DISTNAME=	kactivities-4.13.3
+PKGNAME=	libkactivities4-4.13.3
+CATEGORIES=	x11
+COMMENT=	KDE Activity Manager
+MASTER_SITES=	${MASTER_SITE_KDE:=4.13.3/src/}
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+CONFLICTS+=	kactivities<4.13.3nb4
+
+# Needs C++11 features for kactivitymanager
+GCC_REQD+=	4.5
+
+CMAKE_ARGS+=	-DWITH_NepomukCore:BOOL=OFF
+
+# The default MACOSX_DEPLOYMENT_TARGET is incompatible with the C++11 tests.
+CMAKE_ARGS.Darwin+=	-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION}
+
+PKGCONFIG_OVERRIDE+=	lib/libkactivities.pc.cmake
+
+INSTALLATION_DIRS= share/kde/config
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/activitymanagerrc ${DESTDIR}${PREFIX}/share/kde/config
+	rm -r ${DESTDIR}${PREFIX}/bin
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libkactivities4/PLIST b/x11/libkactivities4/PLIST
new file mode 100644
index 00000000000..21baa458197
--- /dev/null
+++ b/x11/libkactivities4/PLIST
@@ -0,0 +1,38 @@
+@comment $NetBSD: PLIST,v 1.1 2016/05/08 10:44:02 markd Exp $
+include/KDE/KActivities/Consumer
+include/KDE/KActivities/Controller
+include/KDE/KActivities/Info
+include/KDE/KActivities/ResourceInstance
+include/KDE/KActivities/Version
+include/kactivities/consumer.h
+include/kactivities/controller.h
+include/kactivities/info.h
+include/kactivities/kactivities_export.h
+include/kactivities/resourceinstance.h
+include/kactivities/version.h
+lib/cmake/KActivities/KActivitiesConfig.cmake
+lib/cmake/KActivities/KActivitiesConfigVersion.cmake
+lib/cmake/KActivities/KActivitiesLibraryTargets-${TARGET}.cmake
+lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
+lib/kde4/activitymanager_plugin_activityranking.so
+lib/kde4/activitymanager_plugin_globalshortcuts.so
+lib/kde4/activitymanager_plugin_slc.so
+lib/kde4/activitymanager_plugin_sqlite.so
+lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
+lib/kde4/kcm_activities.so
+lib/libkactivities.so
+lib/libkactivities.so.6
+lib/libkactivities.so.6.2.0
+lib/pkgconfig/libkactivities.pc
+share/kde/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml
+share/kde/config/activitymanagerrc
+share/kde4/services/activitymanager-plugin-activityranking.desktop
+share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
+share/kde4/services/activitymanager-plugin-slc.desktop
+share/kde4/services/activitymanager-plugin-sqlite.desktop
+share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
+share/kde4/services/kactivitymanagerd.desktop
+share/kde4/services/kcm_activities.desktop
+share/kde4/servicetypes/activitymanager-plugin.desktop
+share/ontology/kde/kao.ontology
+share/ontology/kde/kao.trig
diff --git a/x11/libkactivities4/buildlink3.mk b/x11/libkactivities4/buildlink3.mk
new file mode 100644
index 00000000000..87f96efa881
--- /dev/null
+++ b/x11/libkactivities4/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2016/05/08 10:44:02 markd Exp $
+
+BUILDLINK_TREE+=	libkactivities4
+
+.if !defined(LIBKACTIVITIES4_BUILDLINK3_MK)
+LIBKACTIVITIES4_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libkactivities4+=	libkactivities4>=4.7.95
+BUILDLINK_ABI_DEPENDS.libkactivities4+=	libkactivities4>=4.13.3
+BUILDLINK_PKGSRCDIR.libkactivities4?=	../../x11/libkactivities4
+
+.include "../../x11/kdelibs4/buildlink3.mk"
+.endif # LIBKACTIVITIES4_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libkactivities4
diff --git a/x11/kactivities/distinfo b/x11/libkactivities4/distinfo
index ee4cd1b0160..9810316579c 100644
--- a/x11/kactivities/distinfo
+++ b/x11/libkactivities4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:28:34 agc Exp $
+$NetBSD: distinfo,v 1.1 2016/05/08 10:44:02 markd Exp $
 
 SHA1 (kactivities-4.13.3.tar.xz) = 54813db8808da63dda7980711ba5d4e01e56d2b0
 RMD160 (kactivities-4.13.3.tar.xz) = e0c87daffd313b8146b3e110c4f183fb06020cd4
diff --git a/x11/kactivities/files/activitymanagerrc b/x11/libkactivities4/files/activitymanagerrc
index feb9ba29886..feb9ba29886 100644
--- a/x11/kactivities/files/activitymanagerrc
+++ b/x11/libkactivities4/files/activitymanagerrc