* Use buildlink2.

* Use bsd.pkg.install.mk and install the example xdm config files.
* Rename the rc.d script to "xdm_krb4.sh" and make it use /etc/rc.subr.
* Remove redundant MESSAGE; the INSTALL script says all the right things.

7 files changed, 112 insertions, 46 deletions

diff --git a/security/xdm-krb4/MESSAGE b/security/xdm-krb4/MESSAGE
deleted file mode 100644
index 630618f914d..00000000000
--- a/security/xdm-krb4/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:36 wiz Exp $
-
-xdm-krb4 now has been installed on your system.
-
-A startup file (e.g. for inclusion into your /etc/rc.local) is provided
-in ${PREFIX}/etc/rc.d/xdm-krb4.sh
-
-===========================================================================
diff --git a/security/xdm-krb4/Makefile b/security/xdm-krb4/Makefile
index c6e7bfa934f..aa0f1b476cc 100644
--- a/security/xdm-krb4/Makefile
+++ b/security/xdm-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/04/05 11:49:37 wennmach Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/26 23:59:00 jlam Exp $
 #
 
 DISTNAME=		xdm-krb4-3.3.6.3
@@ -8,36 +8,38 @@ MASTER_SITES=		ftp://gutemine.geo.Uni-Koeln.DE/pub/xdm-krb4/
 MAINTAINER=		wennmach@netbsd.org
 COMMENT=		Kerberos IV and AFS aware xdm
 
+USE_BUILDLINK2=		# defined
+USE_IMAKE=		# defined
+
 .if exists(/usr/lib/libroken.a)
-KRB4_INCLUDE=		-I/usr/include/kerberosIV
-KRB4_LIBS=		-L/usr/lib -lkafs -lkrb -ldes -lkrb5 -lroken -lasn1 -lcom_err
+KRB4_INCLUDE=	-I/usr/include/kerberosIV
+KRB4_LIBS=	-L/usr/lib -lkafs -lkrb -ldes -lkrb5 -lroken -lasn1 -lcom_err
 .else
-.include "../../security/kth-krb4/buildlink.mk"
-USE_BUILDLINK_ONLY=	# defined
-KRB4_INCLUDE=		-I${BUILDLINK_DIR}/include/kerberosIV
-KRB4_LIBS=		-L${BUILDLINK_DIR}/lib -lkafs -lkrb -ldes
+.  include "../../security/kth-krb4/buildlink2.mk"
+KRB4_INCLUDE=	-I${BUILDLINK_PREFIX.kth-krb4}/include/kerberosIV
+KRB4_LIBS=	-L${BUILDLINK_PREFIX.kth-krb4}/lib -lkafs -lkrb -ldes
 .endif
 
-USE_X11BASE=		yes
-USE_IMAKE=		yes
+MAKE_ENV+=	XDM_EXAMPLEDIR="${EXAMPLEDIR}"
+
+XDM_CONFDIR=	${PREFIX}/lib/X11/xdm
+EXAMPLEDIR=	${PREFIX}/share/examples/${PKGBASE}
+CFILES=		GiveConsole TakeConsole
+CFILES+=	Xaccess Xresources Xservers Xsession Xsetup_0
+CFILES+=	xdm-config
+.for FILE in ${CFILES}
+CONF_FILES+=	${EXAMPLEDIR}/${FILE} ${XDM_CONFDIR}/${FILE}
+.endfor
 
-.include "../../mk/bsd.prefs.mk"
+RCD_SCRIPTS=	xdm_krb4
 
 post-patch:
-	@${SED} -e 's|@KRB4_INCLUDE@|${KRB4_INCLUDE}|g'                       \
-	        -e 's|@KRB4_LIBS@|${KRB4_LIBS}|g'                             \
-		< ${WRKSRC}/Imakefile.in                                      \
-		> ${WRKSRC}/Imakefile
+	@${SED} -e 's|@KRB4_INCLUDE@|${KRB4_INCLUDE}|g'			\
+	        -e 's|@KRB4_LIBS@|${KRB4_LIBS}|g'			\
+		${WRKSRC}/Imakefile.in > ${WRKSRC}/Imakefile
 
 pre-install:
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
-		${FILESDIR}/xdm_krb4                                          \
-		>${WRKDIR}/xdm_krb4   
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/rc.d
-	${INSTALL_DATA}                                                       \
-		${WRKDIR}/xdm_krb4                                            \
-		${PREFIX}/etc/rc.d/xdm_krb4
+	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/xdm-krb4/PLIST b/security/xdm-krb4/PLIST
index 912c58c781f..a9bd5988bec 100644
--- a/security/xdm-krb4/PLIST
+++ b/security/xdm-krb4/PLIST
@@ -1,4 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:18:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/26 23:59:00 jlam Exp $
 bin/xdm-krb4
-man/cat1/xdm-krb4.0
 etc/rc.d/xdm_krb4
+man/cat1/xdm-krb4.0
+share/examples/xdm-krb4/GiveConsole
+share/examples/xdm-krb4/TakeConsole
+share/examples/xdm-krb4/Xaccess
+share/examples/xdm-krb4/Xresources
+share/examples/xdm-krb4/Xservers
+share/examples/xdm-krb4/Xsession
+share/examples/xdm-krb4/Xsetup_0
+share/examples/xdm-krb4/xdm-config
+@dirrm share/examples/xdm-krb4
diff --git a/security/xdm-krb4/distinfo b/security/xdm-krb4/distinfo
index a28dde172e5..4c6ad39fa8a 100644
--- a/security/xdm-krb4/distinfo
+++ b/security/xdm-krb4/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/04/11 12:52:57 wennmach Exp $
+$NetBSD: distinfo,v 1.5 2002/09/26 23:59:00 jlam Exp $
 
 SHA1 (xdm-krb4-3.3.6.3.tar.gz) = 050032632d5c6b9abae87fcf0cd5a9a89a0cff97
 Size (xdm-krb4-3.3.6.3.tar.gz) = 119208 bytes
+SHA1 (patch-aa) = daa8d7e01eb4045798acf7d740630cbac763f4a0
diff --git a/security/xdm-krb4/files/xdm_krb4 b/security/xdm-krb4/files/xdm_krb4
deleted file mode 100644
index 4ec34e931c9..00000000000
--- a/security/xdm-krb4/files/xdm_krb4
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# $NetBSD: xdm_krb4,v 1.1 2001/06/25 22:50:19 wiz Exp $
-if [ -f @PREFIX@/bin/xdm-krb4 ]; then
-	echo -n " xdm-krb4"
-	@PREFIX@/bin/xdm-krb4
-elif [-f @PREFIX@/bin/xdm ]; then
-# Fallback to xdm when xdm-krb4 is unavailable
-	echo -n " xdm(fallback for xdm-krb4)"
-	@PREFIX@/bin/xdm
-else echo " WARNING: no xdm found."
-fi
diff --git a/security/xdm-krb4/files/xdm_krb4.sh b/security/xdm-krb4/files/xdm_krb4.sh
new file mode 100644
index 00000000000..efe0ddb5fde
--- /dev/null
+++ b/security/xdm-krb4/files/xdm_krb4.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $NetBSD: xdm_krb4.sh,v 1.1 2002/09/26 23:59:01 jlam Exp $
+#
+
+# PROVIDE: xdm-krb4
+# REQUIRE: DAEMON LOGIN wscons
+# KEYWORD: shutdown
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="xdm-krb4"
+rcvar="xdm_krb4"
+pidfile="/var/run/xdm.pid"
+extra_commands="reload"
+
+if [ -x @PREFIX@/bin/${name} ]; then
+	command="@PREFIX@/bin/${name}"
+elif [ -x @PREFIX@/bin/xdm ]; then
+	command="@X11BASE@/bin/xdm"
+fi
+
+if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
+	load_rc_config $name
+	eval [ -z "\$${rcvar}" ] && eval ${rcvar}=NO
+	run_rc_command "$1"
+else
+	echo -n ' ${name}'
+	${command} ${xdm_krb4_flags} ${command_args}
+fi
diff --git a/security/xdm-krb4/patches/patch-aa b/security/xdm-krb4/patches/patch-aa
new file mode 100644
index 00000000000..2fd020eea43
--- /dev/null
+++ b/security/xdm-krb4/patches/patch-aa
@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.1 2002/09/26 23:59:01 jlam Exp $
+
+--- config/Imakefile.orig	Mon Nov 23 07:41:12 1998
++++ config/Imakefile
+@@ -17,21 +17,21 @@ CppFileTarget(xdm-config,xdm-conf.cpp,-D
+ LinkFile(Xservers,Xservers.$(SERVERSTYPE))
+ 
+ #if InstallXdmConfig
+-InstallNonExecFile(xdm-config,$(XDMDIR))
+-InstallNonExecFile(Xresources,$(XDMDIR))
+-InstallNonExecFile(Xservers,$(XDMDIR))
+-InstallNonExecFile(Xaccess,$(XDMDIR))
+-InstallNamedProg(Xsession,Xsession,$(XDMDIR))
+-InstallNamedProg(GiveConsole,GiveConsole,$(XDMDIR))
+-InstallNamedProg(TakeConsole,TakeConsole,$(XDMDIR))
+-InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMDIR))
++InstallNonExecFile(xdm-config,$(XDM_EXAMPLEDIR))
++InstallNonExecFile(Xresources,$(XDM_EXAMPLEDIR))
++InstallNonExecFile(Xservers,$(XDM_EXAMPLEDIR))
++InstallNonExecFile(Xaccess,$(XDM_EXAMPLEDIR))
++InstallNamedProg(Xsession,Xsession,$(XDM_EXAMPLEDIR))
++InstallNamedProg(GiveConsole,GiveConsole,$(XDM_EXAMPLEDIR))
++InstallNamedProg(TakeConsole,TakeConsole,$(XDM_EXAMPLEDIR))
++InstallNamedProg(Xsetup_0,Xsetup_0,$(XDM_EXAMPLEDIR))
+ #else
+-InstallNonExecFileNoClobber(xdm-config,$(XDMDIR))
+-InstallNonExecFileNoClobber(Xresources,$(XDMDIR))
+-InstallNonExecFileNoClobber(Xservers,$(XDMDIR))
+-InstallNonExecFileNoClobber(Xaccess,$(XDMDIR))
+-InstallNamedProgNoClobber(Xsession,Xsession,$(XDMDIR))
+-InstallNamedProgNoClobber(GiveConsole,GiveConsole,$(XDMDIR))
+-InstallNamedProgNoClobber(TakeConsole,TakeConsole,$(XDMDIR))
+-InstallNamedProgNoClobber(Xsetup_0,Xsetup_0,$(XDMDIR))
++InstallNonExecFileNoClobber(xdm-config,$(XDM_EXAMPLEDIR))
++InstallNonExecFileNoClobber(Xresources,$(XDM_EXAMPLEDIR))
++InstallNonExecFileNoClobber(Xservers,$(XDM_EXAMPLEDIR))
++InstallNonExecFileNoClobber(Xaccess,$(XDM_EXAMPLEDIR))
++InstallNamedProgNoClobber(Xsession,Xsession,$(XDM_EXAMPLEDIR))
++InstallNamedProgNoClobber(GiveConsole,GiveConsole,$(XDM_EXAMPLEDIR))
++InstallNamedProgNoClobber(TakeConsole,TakeConsole,$(XDM_EXAMPLEDIR))
++InstallNamedProgNoClobber(Xsetup_0,Xsetup_0,$(XDM_EXAMPLEDIR))
+ #endif