Fix finding Xkb rules file in intree X11R7 case (PR#44364)

Fix path to iso-codes (PR#44364)
Fix perms on kcheckpass (noted by David Brownlee)
Bump PKGREVISION

3 files changed, 54 insertions, 4 deletions

diff --git a/x11/kdebase-workspace4/Makefile b/x11/kdebase-workspace4/Makefile
index 9b8d17503f0..847de54d0c1 100644
--- a/x11/kdebase-workspace4/Makefile
+++ b/x11/kdebase-workspace4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2011/01/13 13:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2011/01/18 10:59:12 markd Exp $
 
 DISTNAME=	kdebase-workspace-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	base workspace for the KDE 4 integrated X11 desktop
 
@@ -38,6 +38,9 @@ CONF_FILES+=		${PREFIX}/share/examples/kde4-dbus/org.kde.fontinst.conf \
 CONF_FILES+=		${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf \
 			${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
 
+SPECIAL_PERMS+=		${PREFIX}/lib/kde4/libexec/kcheckpass \
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 6555
+
 REPLACE_PERL+= \
 	kcontrol/keys/convertShortcuts.pl \
 	kwin/data/kwin3_plugin.pl \
@@ -48,7 +51,7 @@ PY_PATCHPLIST=	yes
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-SUBST_CLASSES+=		paths qtpath
+SUBST_CLASSES+=		paths qtpath isocodes
 SUBST_FILES.paths=	kcontrol/kdm/main.cpp
 SUBST_SED.paths=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_STAGE.paths=	post-patch
@@ -57,6 +60,10 @@ SUBST_FILES.qtpath=	startkde.cmake
 SUBST_SED.qtpath=	-e 's,/usr/pkg/qt4,${QTDIR},g'
 SUBST_STAGE.qtpath=	post-patch
 
+SUBST_FILES.isocodes=	kcontrol/keyboard/iso_codes.h
+SUBST_SED.isocodes=	-e 's,/usr/share/xml/iso-codes,${BUILDLINK_PREFIX.iso-codes}/share/xml/iso-codes,g'
+SUBST_STAGE.isocodes=	post-patch
+
 ICONDIR=		share/icons
 
 .include "../../mk/bsd.prefs.mk"
@@ -102,6 +109,7 @@ PYTHON_VERSIONS_ACCEPTED= 26 25 # because kdebindings4-python
 #  I don't know how consolekit works
 #.include "../../sysutils/consolekit/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/kdebindings4-python/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../misc/kdepimlibs4/buildlink3.mk"
diff --git a/x11/kdebase-workspace4/distinfo b/x11/kdebase-workspace4/distinfo
index 87f84296bef..67f68b7c63c 100644
--- a/x11/kdebase-workspace4/distinfo
+++ b/x11/kdebase-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2011/01/10 11:55:18 markd Exp $
+$NetBSD: distinfo,v 1.15 2011/01/18 10:59:12 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -18,6 +18,7 @@ SHA1 (patch-ad) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
 SHA1 (patch-ae) = 736fc439a34298f51c9fb09200b9dc8628eabc43
 SHA1 (patch-af) = 00f4fd7dff0e44af433e52d732129cee2e38e84e
 SHA1 (patch-ag) = 89848c5dbc416eb874d553c072790e9a3ebfd77b
+SHA1 (patch-ah) = e4569e0671c55e990cbc0913e5abaead046a8e71
 SHA1 (patch-bb) = 3652162d6419963fdfcd952af116a0e944ad1618
 SHA1 (patch-bc) = c4fabab37cc4cb70b974a9455c2d640b3bd63fd7
 SHA1 (patch-bd) = 9d02eaa299847ac32a128696bb6d35f73bae0551
diff --git a/x11/kdebase-workspace4/patches/patch-ah b/x11/kdebase-workspace4/patches/patch-ah
new file mode 100644
index 00000000000..c79f4753142
--- /dev/null
+++ b/x11/kdebase-workspace4/patches/patch-ah
@@ -0,0 +1,41 @@
+$NetBSD: patch-ah,v 1.1 2011/01/18 10:59:13 markd Exp $
+
+Handle location of xkb/rules in NetBSD's intree X11R7
+(/usr/X11R7/lib/X11/xkb/rules)
+
+--- kcontrol/keyboard/xkb_rules.cpp.orig	2010-08-27 10:10:21.000000000 +0200
++++ kcontrol/keyboard/xkb_rules.cpp	2011-01-11 21:47:03.000000000 +0100
+@@ -138,12 +138,18 @@
+ {
+ 	QString rulesFile;
+ 	QString rulesName = Rules::getRulesName();
++	QString xkbRulesSubDir = "xkb/rules";
+ 
+ 	if ( ! rulesName.isNull() ) {
+ 		QString xkbParentDir;
+ 
+ 		QString base(XLIBDIR);
+ 		if( base.count('/') >= 3 ) {
++			// /usr/X11R7/lib/X11 with xkb/rules subdirectory below it
++			QDir xkbRulesDir(base + "/" + xkbRulesSubDir);
++			if( xkbRulesDir.exists() ) {
++				xkbParentDir = base;
++			} else {
+ 			// .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb
+ 			QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11";
+ 			QDir baseDir(base + delta);
+@@ -157,12 +163,13 @@
+ 				}
+ 			}
+ 		}
++		}
+ 
+ 		if( xkbParentDir.isEmpty() ) {
+ 			xkbParentDir = "/usr/share/X11";
+ 		}
+ 
+-		rulesFile = QString("%1/xkb/rules/%2.xml").arg(xkbParentDir, rulesName);
++		rulesFile = QString("%1/%2/%3.xml").arg(xkbParentDir, xkbRulesSubDir, rulesName);
+ 	}
+ 
+ 	return rulesFile;