Fix NetBSD current build.

5 files changed, 21 insertions, 19 deletions

diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
index ffb7c8b2c3f..64f5f332b5f 100644
--- a/x11/kde-workspace4/distinfo
+++ b/x11/kde-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2016/07/16 00:47:00 markd Exp $
+$NetBSD: distinfo,v 1.18 2017/06/25 19:58:04 youri Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -19,7 +19,7 @@ Size (kde-workspace-4.11.22.tar.xz) = 13553668 bytes
 SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
 SHA1 (patch-kcontrol_randr_randroutput.cpp) = 6f9e6f18007023941018d2088a585c2ab30a7299
 SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
-SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
+SHA1 (patch-kdm_kcm_main.cpp) = 1e53580285f4201e328f6596544c4a6f807ef751
 SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
 SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 28829bb285df6a3d252eb1bf7043cbd44e10500f
 SHA1 (patch-kinfocenter_Modules_nics_nic.cpp) = 0f7e846eac8d694e0ab6018d4f4c571b4e0c84db
@@ -31,7 +31,7 @@ SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.c) = 05312793f0c66cacf1bb61c081a8b15
 SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.h) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d
 SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.c) = 38f18a03c1b99fddbbc51fe52fd6e3b66e5d9f13
 SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.h) = e58dc4a0a7be7350251f26de34a8949e7508c983
-SHA1 (patch-ksysguard_ksysguardd_NetBSD_ProcessList.c) = 0921fe9569bd54f5e381ebead738b95e431bb1d5
+SHA1 (patch-ksysguard_ksysguardd_NetBSD_ProcessList.c) = 55e33c0b12258e1bcc9c5395c1f743cfdb07f0e1
 SHA1 (patch-ksysguard_ksysguardd_Solaris_LoadAvg.c) = bc3c434d09485cdf03a357ab5621271adcc3627b
 SHA1 (patch-kwin_effects_mousemark_mousemark.cpp) = 4b6625f9bebf6bd2c6057d7045d9ce6af3103578
 SHA1 (patch-kwin_glxbackend.cpp) = c0e1c43cfb832cdc966156c54e5e12d78e78e7ab
@@ -41,10 +41,10 @@ SHA1 (patch-libs_kephal_service_xrandr12_randroutput.cpp) = 03fc906e4ec34b31d923
 SHA1 (patch-libs_ksysguard_ksgrd_SensorManager.cpp) = 5fa92fa4876514198813f900f71f3364794b8248
 SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80
 SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
-SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 9fa5c51c28537c4b242847d3d54c893d28ddcaf4
+SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 37303769e7b3890b47cc4f1f2715f55f2015a3ca
 SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43
 SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c
 SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
 SHA1 (patch-plasma_generic_dataengines_time_solarsystem.h) = 474bbf3bc9f9bc0c75772f01218c1739d49fd31c
 SHA1 (patch-plasma_generic_dataengines_time_timesource.h) = 85ccf0ed379c94e174880bc239daee60afccc788
-SHA1 (patch-startkde.cmake) = 36421affc2af12a50623ecfd4f3b0cb320796634
+SHA1 (patch-startkde.cmake) = 0068ac6836a668eaee50d3641f64a3ef843f1a34
diff --git a/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp b/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp
index e840c1ce98e..40fa7dc3232 100644
--- a/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp
+++ b/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp
@@ -1,14 +1,14 @@
-$NetBSD: patch-kdm_kcm_main.cpp,v 1.1 2012/03/19 19:44:03 markd Exp $
+$NetBSD: patch-kdm_kcm_main.cpp,v 1.2 2017/06/25 19:58:04 youri Exp $
 
 Allow $PKG_SYSCONFDIR/kdm/kdmrc to override the one under $PREFIX
 
---- kdm/kcm/main.cpp.orig	2010-05-27 17:23:09.000000000 +0000
+--- kdm/kcm/main.cpp.orig	2015-08-12 07:03:15.000000000 +0000
 +++ kdm/kcm/main.cpp
 @@ -281,8 +281,12 @@ KConfig *KDModule::createTempConfig()
      pTempConfigFile->open();
      QString tempConfigName = pTempConfigFile->fileName();
  
-+    QFile confFile (QString::fromLatin1( "@PKG_SYSCONFDIR@" "/kdm/kdmrc" ));
++    QFile confFile (QString::fromLatin1( "/usr/pkg/etc" "/kdm/kdmrc" ));
 +    if ( !confFile.exists() )
 +	confFile.setFileName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
 +
diff --git a/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_ProcessList.c b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_ProcessList.c
index 2097fa29954..b6af163e0a9 100644
--- a/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_ProcessList.c
+++ b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_ProcessList.c
@@ -1,11 +1,12 @@
-$NetBSD: patch-ksysguard_ksysguardd_NetBSD_ProcessList.c,v 1.1 2013/01/17 16:05:53 joerg Exp $
+$NetBSD: patch-ksysguard_ksysguardd_NetBSD_ProcessList.c,v 1.2 2017/06/25 19:58:04 youri Exp $
 
---- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig	2013-01-16 23:02:11.000000000 +0000
+--- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig	2015-08-12 07:03:15.000000000 +0000
 +++ ksysguard/ksysguardd/NetBSD/ProcessList.c
-@@ -35,6 +35,7 @@
+@@ -34,7 +34,7 @@
+ #include <sys/sysctl.h>
  #include <sys/time.h>
  #include <sys/types.h>
- #include <sys/user.h>
+-#include <sys/user.h>
 +#include <sys/resource.h>
  #include <unistd.h>
  #include <signal.h>
diff --git a/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_processes__netbsd__p.cpp b/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_processes__netbsd__p.cpp
index 08d65e00a9c..24948630308 100644
--- a/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_processes__netbsd__p.cpp
+++ b/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_processes__netbsd__p.cpp
@@ -1,11 +1,12 @@
-$NetBSD: patch-libs_ksysguard_processcore_processes__netbsd__p.cpp,v 1.1 2013/01/17 16:05:53 joerg Exp $
+$NetBSD: patch-libs_ksysguard_processcore_processes__netbsd__p.cpp,v 1.2 2017/06/25 19:58:04 youri Exp $
 
---- libs/ksysguard/processcore/processes_netbsd_p.cpp.orig	2013-01-16 23:10:41.000000000 +0000
+--- libs/ksysguard/processcore/processes_netbsd_p.cpp.orig	2015-08-12 07:03:15.000000000 +0000
 +++ libs/ksysguard/processcore/processes_netbsd_p.cpp
-@@ -30,6 +30,7 @@
+@@ -29,7 +29,7 @@
+ #include <sys/param.h>
  #include <sys/sysctl.h>
  #include <sys/types.h>
- #include <sys/user.h>
+-#include <sys/user.h>
 +#include <sys/resource.h>
  #include <sys/stat.h>
  #include <signal.h>
diff --git a/x11/kde-workspace4/patches/patch-startkde.cmake b/x11/kde-workspace4/patches/patch-startkde.cmake
index bb7a22ffd7d..be3ed1e19b1 100644
--- a/x11/kde-workspace4/patches/patch-startkde.cmake
+++ b/x11/kde-workspace4/patches/patch-startkde.cmake
@@ -1,12 +1,12 @@
-$NetBSD: patch-startkde.cmake,v 1.3 2013/11/07 13:35:56 markd Exp $
+$NetBSD: patch-startkde.cmake,v 1.4 2017/06/25 19:58:04 youri Exp $
 
---- startkde.cmake.orig	2013-03-01 06:32:24.000000000 +0000
+--- startkde.cmake.orig	2015-08-12 07:03:15.000000000 +0000
 +++ startkde.cmake
 @@ -29,6 +29,12 @@ else
    qdbus=qdbus
  fi
  
-+qtbindir=@QTDIR@/bin
++qtbindir=/usr/pkg/qt4/bin
 +case $PATH in
 +  $qtbindir|$qtbindir:*|*:$qtbindir|*:$qtbindir:*) ;;
 +  *) PATH=$qtbindir:$PATH; export PATH;;