Fix a REPLACE_INTERPRETER which cannot possibly have ever worked, fix a

PKG_DEVELOPER check, and avoid non-portable dirent ops for SunOS.

3 files changed, 29 insertions, 5 deletions

diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile
index e3a1d6a29c9..e624d398fa6 100644
--- a/x11/kde-baseapps4/Makefile
+++ b/x11/kde-baseapps4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/06/06 12:55:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2013/06/22 20:18:25 jperkin Exp $
 
 DISTNAME=	kde-baseapps-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
@@ -16,9 +16,11 @@ REPLACE_RUBY+=	dolphin/src/settings/services/servicemenuinstallation
 REPLACE_RUBY+=	dolphin/src/settings/services/servicemenudeinstallation
 
 REPLACE_INTERPRETER+=	xdg-open
-REPLACE.scheme.old=	.*/bin/env xdg-open
-REPLACE.scheme.new=	${PREFIX}/bin/xdg-open
-REPLACE_FILES.scheme=	lib/konq/Templates/Program.desktop
+REPLACE.xdg-open.old=	.*/bin/env xdg-open
+REPLACE.xdg-open.new=	${PREFIX}/bin/xdg-open
+REPLACE_FILES.xdg-open=	lib/konq/Templates/Program.desktop
+
+CHECK_INTERPRETER_SKIP=	share/kde/templates/.source/Program.desktop
 
 .include "../../lang/ruby/replace.mk"
 
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo
index 2c4c11109cf..128bf65a644 100644
--- a/x11/kde-baseapps4/distinfo
+++ b/x11/kde-baseapps4/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2013/05/21 12:49:37 markd Exp $
+$NetBSD: distinfo,v 1.6 2013/06/22 20:18:25 jperkin Exp $
 
 SHA1 (kde-baseapps-4.10.3.tar.xz) = c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08
 RMD160 (kde-baseapps-4.10.3.tar.xz) = 70caa3c27ac73330cbeb6c5ca26a7a94ec260479
 Size (kde-baseapps-4.10.3.tar.xz) = 2613696 bytes
+SHA1 (patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp) = ee7482a2dee09ea68907c899aac08be014136b88
diff --git a/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp b/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp
new file mode 100644
index 00000000000..4169a7e95a6
--- /dev/null
+++ b/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp
@@ -0,0 +1,21 @@
+$NetBSD: patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp,v 1.1 2013/06/22 20:18:26 jperkin Exp $
+
+Avoid non-portable dirent d_type on SunOS.
+
+--- dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp.orig	2013-05-03 04:36:32.006246684 +0000
++++ dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp
+@@ -1186,10 +1186,14 @@ int KFileItemModelRolesUpdater::subItems
+             // If only directories are counted, consider an unknown file type and links also
+             // as directory instead of trying to do an expensive stat()
+             // (see bugs 292642 and 299997).
++#ifdef __sun
++            const bool countEntry = !showFoldersOnly;
++#else
+             const bool countEntry = !showFoldersOnly ||
+                                     dirEntry->d_type == DT_DIR ||
+                                     dirEntry->d_type == DT_LNK ||
+                                     dirEntry->d_type == DT_UNKNOWN;
++#endif
+             if (countEntry) {
+                 ++count;
+             }