Add PKG_SYSCONFDIR support for kdm. Bump PKGREVISION.

Closes PR pkg/24844

4 files changed, 28 insertions, 15 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index b08c7a12c64..f3b6202ce44 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2004/05/26 13:20:53 markd Exp $
+# $NetBSD: Makefile,v 1.53 2004/05/31 12:21:06 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
@@ -34,6 +34,9 @@ REPLACE_PERL= \
 			kwin/pluginlibFix.pl \
 			konsole/schemaStrip.pl
 
+CONF_FILES=		${PREFIX}/share/kde/config/kdm/kdmrc \
+			${PKG_SYSCONFDIR}/kdm/kdmrc
+OWN_DIRS=		${PKG_SYSCONFDIR}/kdm
 RCD_SCRIPTS=		kdm
 
 .include "../../mk/bsd.prefs.mk"
@@ -105,16 +108,7 @@ SPECIAL_PERMS+=	${PREFIX}/bin/ksysguardd	${ROOT_USER} kmem 2755
 
 pre-configure:
 	cd ${WRKSRC};							\
-	files="kioslave/info/kde-info2html.conf";			\
-	for file in $${files}; do					\
-		${SED} -e 's|@LOCALBASE@|${LOCALBASE}|' $${file} >	\
-			$${file}.new;					\
-		${MV} -f $${file}.new $${file};				\
-	done
-
-post-build:
-	cd ${WRKSRC};							\
-	files="kioslave/info/kde-info2html.conf";			\
+	files="kcontrol/kdm/main.cpp kioslave/info/kde-info2html.conf";	\
 	for file in $${files}; do					\
 		${SED} ${FILES_SUBST_SED} $${file} > $${file}.new;	\
 		${MV} -f $${file}.new $${file};				\
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index db6d11d10f1..c7a59952e40 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2004/05/26 13:20:53 markd Exp $
+$NetBSD: distinfo,v 1.52 2004/05/31 12:21:06 markd Exp $
 
 SHA1 (kdebase-3.2.2.tar.bz2) = bc941b3faa4440ca2048d9332371c974d0e17f5b
 Size (kdebase-3.2.2.tar.bz2) = 17216476 bytes
@@ -16,6 +16,7 @@ SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
 SHA1 (patch-ah) = dad5cd23522073d088329b4da2c2978d807005bc
 SHA1 (patch-ai) = 5638690e617dd27b88aa00928828d3ef585bd6ff
 SHA1 (patch-aj) = 3ed17b109394ce3d24accbbd6afcad40013d6b48
+SHA1 (patch-ak) = 234c9a4d01b15ab803a182c51c14a7c0cf249576
 SHA1 (patch-bb) = 1b6c717a1bedafbeae0037ee382795d8aa59f081
 SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
diff --git a/x11/kdebase3/files/kdm.sh b/x11/kdebase3/files/kdm.sh
index a134298a592..47abab7cb6a 100644
--- a/x11/kdebase3/files/kdm.sh
+++ b/x11/kdebase3/files/kdm.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: kdm.sh,v 1.2 2004/05/01 11:14:41 xtraeme Exp $
+# $NetBSD: kdm.sh,v 1.3 2004/05/31 12:21:06 markd Exp $
 #
 
 # PROVIDE: kdm
@@ -15,7 +15,8 @@ name="kdm"
 rcvar=$name
 command="@PREFIX@/bin/${name}"
 pidfile="/var/run/kdm.pid"
-required_files="@PREFIX@/share/kde/config/kdm/kdmrc"
+required_files="@PKG_SYSCONFDIR@/kdm/kdmrc"
+command_args="-config ${required_files}"
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
diff --git a/x11/kdebase3/patches/patch-ak b/x11/kdebase3/patches/patch-ak
new file mode 100644
index 00000000000..5f2adaa4369
--- /dev/null
+++ b/x11/kdebase3/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.5 2004/05/31 12:21:06 markd Exp $
+
+--- kcontrol/kdm/main.cpp.orig	2003-11-30 22:42:26.000000000 +1300
++++ kcontrol/kdm/main.cpp
+@@ -89,7 +89,11 @@ KDModule::KDModule(QWidget *parent, cons
+     usermap.insert( QString::fromLocal8Bit( ps->pw_name ), ps->pw_uid );
+   endpwent();
+ 
+-  config = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
++  QFile confFile (QString::fromLatin1( "@PKG_SYSCONFDIR@" "/kdm/kdmrc" ));
++  if ( !confFile.exists() )
++	confFile.setName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
++
++  config = new KSimpleConfig( confFile.name());
+ 
+   QVBoxLayout *top = new QVBoxLayout(this);
+   tab = new QTabWidget(this);