Update kde-baseapps4 to 15.12.0

minor bugfixes.
renamed dolphin to dolphin4 in anticipation of kf5 version.

4 files changed, 71 insertions, 37 deletions

diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile
index a7abf83fd87..9275505095c 100644
--- a/x11/kde-baseapps4/Makefile
+++ b/x11/kde-baseapps4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2015/04/25 14:25:07 tnn Exp $
+# $NetBSD: Makefile,v 1.33 2016/01/10 19:03:55 markd Exp $
 
-DISTNAME=	kde-baseapps-${_KDE_VERSION}
-PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	2
+DISTNAME=	kde-baseapps-15.12.0
+PKGNAME=	${DISTNAME:S/-1/4-1/}
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 4 integrated X11 desktop
+MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.12.0/src/}
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
diff --git a/x11/kde-baseapps4/PLIST b/x11/kde-baseapps4/PLIST
index 62806dca5a0..ab9a039ca56 100644
--- a/x11/kde-baseapps4/PLIST
+++ b/x11/kde-baseapps4/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2014/11/13 10:53:49 markd Exp $
-bin/dolphin
+@comment $NetBSD: PLIST,v 1.9 2016/01/10 19:03:55 markd Exp $
+bin/dolphin4
 bin/fsview
 bin/kbookmarkmerger
 bin/kdepasswd
@@ -73,27 +73,28 @@ lib/kde4/uachangerplugin.so
 lib/kde4/validatorsplugin.so
 lib/kde4/webarchiverplugin.so
 lib/kde4/webarchivethumbnail.so
-lib/libdolphinprivate.so
-lib/libdolphinprivate.so.4
-lib/libdolphinprivate.so.${PKGVERSION}
+lib/libdolphinprivate4.so
+lib/libdolphinprivate4.so.4
+lib/libdolphinprivate4.so.${KDELIBSVER}
 lib/libkbookmarkmodel_private.so
 lib/libkbookmarkmodel_private.so.4
-lib/libkbookmarkmodel_private.so.${PKGVERSION}
-lib/libkdeinit4_dolphin.so
+lib/libkbookmarkmodel_private.so.${KDELIBSVER}
+lib/libkdeinit4_dolphin4.so
 lib/libkdeinit4_keditbookmarks.so
 lib/libkdeinit4_kfmclient.so
 lib/libkdeinit4_konqueror.so
 lib/libkonq.so
 lib/libkonq.so.5
-lib/libkonq.so.5.14.3
+lib/libkonq.so.${KDELIBSPVER}
 lib/libkonqsidebarplugin.so
 lib/libkonqsidebarplugin.so.4
-lib/libkonqsidebarplugin.so.${PKGVERSION}
+lib/libkonqsidebarplugin.so.${KDELIBSVER}
 lib/libkonquerorprivate.so.4
-lib/libkonquerorprivate.so.${PKGVERSION}
+lib/libkonquerorprivate.so.${KDELIBSVER}
 man/man1/kbookmarkmerger.1
 man/man1/kfind.1
-share/appdata/dolphin.appdata.xml
+share/appdata/kfind.appdata.xml
+share/appdata/konqueror.appdata.xml
 share/applications/kde4/Home.desktop
 share/applications/kde4/dolphin.desktop
 share/applications/kde4/kdepasswd.desktop
@@ -114,28 +115,6 @@ share/dbus-1/interfaces/org.kde.nsplugins.CallBack.xml
 share/dbus-1/interfaces/org.kde.nsplugins.class.xml
 share/dbus-1/interfaces/org.kde.nsplugins.instance.xml
 share/dbus-1/interfaces/org.kde.nsplugins.viewer.xml
-share/doc/kde/HTML/en/dolphin/common
-share/doc/kde/HTML/en/dolphin/default-ui.png
-share/doc/kde/HTML/en/dolphin/grouping-view.png
-share/doc/kde/HTML/en/dolphin/index.cache.bz2
-share/doc/kde/HTML/en/dolphin/index.docbook
-share/doc/kde/HTML/en/dolphin/locationbar-breadcrumb.png
-share/doc/kde/HTML/en/dolphin/locationbar-context-menu.png
-share/doc/kde/HTML/en/dolphin/locationbar-editable.png
-share/doc/kde/HTML/en/dolphin/locationbar-kioslaves-menu.png
-share/doc/kde/HTML/en/dolphin/locationbar-places-icon.png
-share/doc/kde/HTML/en/dolphin/nepomuk-search-more-options.png
-share/doc/kde/HTML/en/dolphin/nepomuk-search.png
-share/doc/kde/HTML/en/dolphin/preferences-general-behavior.png
-share/doc/kde/HTML/en/dolphin/preferences-navigation.png
-share/doc/kde/HTML/en/dolphin/preferences-services.png
-share/doc/kde/HTML/en/dolphin/preferences-startup.png
-share/doc/kde/HTML/en/dolphin/preferences-trash.png
-share/doc/kde/HTML/en/dolphin/preferences-viewmodes-icons.png
-share/doc/kde/HTML/en/dolphin/toolbar-navigation.png
-share/doc/kde/HTML/en/dolphin/toolbar-view-appearance.png
-share/doc/kde/HTML/en/dolphin/toolbar.png
-share/doc/kde/HTML/en/dolphin/viewproperties-dialog.png
 share/doc/kde/HTML/en/kdepasswd/common
 share/doc/kde/HTML/en/kdepasswd/index.cache.bz2
 share/doc/kde/HTML/en/kdepasswd/index.docbook
diff --git a/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt b/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt
new file mode 100644
index 00000000000..64baeeac410
--- /dev/null
+++ b/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt
@@ -0,0 +1,42 @@
+$NetBSD: patch-dolphin_src_CMakeLists.txt,v 1.1 2016/01/10 19:03:55 markd Exp $
+
+Install config files until such time as we have a kf5-based dolphin
+package.
+
+--- dolphin/src/CMakeLists.txt.orig	2015-12-08 07:04:21.000000000 +0000
++++ dolphin/src/CMakeLists.txt
+@@ -347,17 +347,17 @@ install(TARGETS kio_filenamesearch DESTI
+ ########### install files ###############
+ 
+ # Disabled since Applications/15.08 contains kf5-based dolphin from dolphin.git
+-#install( PROGRAMS dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
++install( PROGRAMS dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ 
+-#install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
+-#settings/dolphin_generalsettings.kcfg
+-#settings/dolphin_compactmodesettings.kcfg
+-#settings/dolphin_iconsmodesettings.kcfg
+-#settings/dolphin_detailsmodesettings.kcfg
+-#settings/dolphin_versioncontrolsettings.kcfg
+-#DESTINATION ${KCFG_INSTALL_DIR} )
++install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
++settings/dolphin_generalsettings.kcfg
++settings/dolphin_compactmodesettings.kcfg
++settings/dolphin_iconsmodesettings.kcfg
++settings/dolphin_detailsmodesettings.kcfg
++settings/dolphin_versioncontrolsettings.kcfg
++DESTINATION ${KCFG_INSTALL_DIR} )
+ install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
+ #install( FILES dolphin.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
+ install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+ install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
+ ${SERVICES_INSTALL_DIR} )
+@@ -365,6 +365,6 @@ install( FILES settings/kcm/kcmdolphinna
+ install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+ install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+ install( FILES settings/services/servicemenu.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
+-#install( PROGRAMS settings/services/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} )
+-#install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )
++install( PROGRAMS settings/services/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} )
++install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )
+ 
diff --git a/x11/kde-baseapps4/patches/patch-dolphin_src_dolphin.desktop b/x11/kde-baseapps4/patches/patch-dolphin_src_dolphin.desktop
new file mode 100644
index 00000000000..44607c2612a
--- /dev/null
+++ b/x11/kde-baseapps4/patches/patch-dolphin_src_dolphin.desktop
@@ -0,0 +1,13 @@
+$NetBSD: patch-dolphin_src_dolphin.desktop,v 1.1 2016/01/10 19:03:55 markd Exp $
+
+--- dolphin/src/dolphin.desktop.orig	2015-12-08 07:04:21.000000000 +0000
++++ dolphin/src/dolphin.desktop
+@@ -86,7 +86,7 @@ Name[wa]=Dolphin
+ Name[x-test]=xxDolphinxx
+ Name[zh_CN]=Dolphin
+ Name[zh_TW]=Dolphin
+-Exec=dolphin %i -caption %c %u
++Exec=dolphin4 %i -caption %c %u
+ Icon=system-file-manager
+ Type=Application
+ X-DocPath=dolphin/index.html