Update kth-krb4 to 1.1.1.

This is a prerequisite step for the new arla version (0.35.7).
While here, buildlinkify.

10 files changed, 358 insertions, 331 deletions

diff --git a/security/kth-krb4/MESSAGE b/security/kth-krb4/MESSAGE
index edb55348e0c..f1132e08668 100644
--- a/security/kth-krb4/MESSAGE
+++ b/security/kth-krb4/MESSAGE
@@ -1,5 +1,5 @@
 ===============================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 01:16:47 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2002/04/05 11:32:19 wennmach Exp $
 
 Kth-krb4 now has been installed on your system.
 
@@ -11,7 +11,7 @@ ${PREFIX}/share/examples/kth-krb4.
 At a minimum, to configure a Kerberos client, copy 
 ${PREFIX}/share/examples/kth-krb4/{krb.conf,krb.realms} to /etc and
 customize them. Also, apply the patches provided in services-1.4.2.diff
-(for NetBSD-1.4.2) or services-1.5.diff (for NetBSD-1.5/1.5.1) 
+(for NetBSD-1.4.2) or services-1.5.diff (for NetBSD-1.5/1.5.x) 
 to /etc/services.
 
 ===============================================================================
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index b3384b21d7c..432473b0eed 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/03/29 17:20:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2002/04/05 11:32:19 wennmach Exp $
 #
 
-DISTNAME=		krb4-1.0.9
-PKGNAME=		kth-krb4-1.0.9
+DISTNAME=		krb4-1.1.1
+PKGNAME=		kth-krb4-1.1.1 
 CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/krb/src/
 
@@ -10,6 +10,9 @@ MAINTAINER=		wennmach@netbsd.org
 HOMEPAGE=		http://www.pdc.kth.se/kth-krb/
 COMMENT=		Kerberos IV distribution from KTH
 
+# enable this once our autoconf has been upgraded to autoconf>=2.52:
+#BUILD_DEPENDS+=	automake>1.4:../../devel/automake  
+
 CONFLICTS+=		wu-ftpd-[0-9]*
 CONFLICTS+=		lukemftp-[0-9]*
 CONFLICTS+=		zephyr-[0-9]*
@@ -18,6 +21,12 @@ CONFLICTS+=		libdes-[0-9]*
 CRYPTO=			yes
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ARGS=		--includedir=${PREFIX}/include/kerberosIV
+
+.include "../../mk/x11.buildlink.mk"
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
 # this hangs while compiling one of the files, at least with the
 # toolchain as of 1.5ZC (20020329)
 .if ${MACHINE_ARCH} == "sparc64"
@@ -30,6 +39,14 @@ post-patch:
 		>${WRKSRC}/lib/kafs/kafs.h.sed
 	@${MV} ${WRKSRC}/lib/kafs/kafs.h.sed ${WRKSRC}/lib/kafs/kafs.h
 
+# enable this once our autoconf has been upgraded to autoconf>=2.52:
+#pre-configure:
+#	cd ${WRKSRC};                                                         \
+#	${LOCALBASE}/bin/aclocal;                                             \
+#	${LOCALBASE}/bin/autoheader;                                          \
+#	${LOCALBASE}/bin/automake -a --foreign -i;                            \
+#	${LOCALBASE}/bin/autoconf
+
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/kth-krb4
 	${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${PREFIX}/share/examples/kth-krb4
diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST
index 1c47d6ed20e..6f6b8a99f3e 100644
--- a/security/kth-krb4/PLIST
+++ b/security/kth-krb4/PLIST
@@ -1,116 +1,225 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:39 seb Exp $
-share/examples/kth-krb4/inetd.conf.changes
-share/examples/kth-krb4/krb.conf
-share/examples/kth-krb4/krb.realms
-share/examples/kth-krb4/services-1.4.2.diff
-share/examples/kth-krb4/services-1.5.diff
-@dirrm share/examples/kth-krb4
-include/acl.h
-include/com_err.h
-include/com_right.h
-include/des.h
-include/kadm.h
-include/kafs.h
-include/kdc.h
-include/klog.h
-include/krb.h
-include/krb-protos.h
-include/krb-archaeology.h
-include/krb_db.h
-include/ktypes.h
-include/md4.h
-include/md5.h
-include/otp.h
-include/prot.h
-include/sha.h
-include/sl.h
-include/krb_err.h
-include/kadm_err.h
-include/rc4.h
-include/roken.h
-include/roken-common.h
-include/ss/ss.h
-lib/libcom_err.a
-lib/libdes.a
-lib/libkrb.a
-lib/libkdb.a
-lib/libkadm.a
-lib/libacl.a
-lib/libkafs.a
-lib/libeditline.a
-lib/libsl.a
-lib/libss.a
-lib/libotp.a
-lib/libroken.a
+@comment $NetBSD: PLIST,v 1.3 2002/04/05 11:32:20 wennmach Exp $
+bin/afslog
 bin/compile_et
-bin/mk_cmds
-bin/kinit
+bin/ftp
+bin/kadmin
+bin/kauth
 bin/kdestroy
+bin/kinit
+bin/kip
 bin/klist
 bin/kpasswd
-bin/kadmin
-bin/kauth
+bin/krb4-config 
 bin/ksrvtgt
-bin/zrefresh
+bin/kstring2key
+bin/kx
 bin/login
-bin/rsh
+bin/mk_cmds
+bin/otp
+bin/otpprint
+bin/pagsh
+bin/pfrom
 bin/rcp
 bin/rlogin
-bin/su
-bin/pfrom
-bin/pagsh
-bin/afslog
-bin/kstring2key
-bin/xnlock
-bin/kx
-bin/rxterm
+bin/rsh
 bin/rxtelnet
-bin/tenletxr
-bin/otpprint
-bin/otp
-bin/kip
-bin/ftp
+bin/rxterm
+bin/sample_client
+bin/simple_client
+bin/su
 bin/telnet
+bin/tenletxr
+bin/xnlock
+bin/zrefresh
+include/kerberosIV/acl.h
+include/kerberosIV/base64.h
+include/kerberosIV/com_err.h
+include/kerberosIV/com_right.h
+include/kerberosIV/des.h
+include/kerberosIV/editline.h  
+include/kerberosIV/getarg.h
+include/kerberosIV/kadm.h
+include/kerberosIV/kadm_err.h
+include/kerberosIV/kafs.h
+include/kerberosIV/kdc.h
+include/kerberosIV/klog.h
+include/kerberosIV/krb-archaeology.h
+include/kerberosIV/krb-protos.h
+include/kerberosIV/krb.h
+include/kerberosIV/krb_db.h
+include/kerberosIV/krb_err.h
+include/kerberosIV/krb_log.h
+include/kerberosIV/ktypes.h
+include/kerberosIV/md4.h
+include/kerberosIV/md5.h
+include/kerberosIV/otp.h
+include/kerberosIV/parse_bytes.h
+include/kerberosIV/parse_time.h
+include/kerberosIV/parse_units.h
+include/kerberosIV/prot.h
+include/kerberosIV/protos.h
+include/kerberosIV/rc4.h
+include/kerberosIV/resolve.h
+include/kerberosIV/roken-common.h
+include/kerberosIV/roken.h
+include/kerberosIV/rtbl.h
+include/kerberosIV/sha.h
+include/kerberosIV/sl.h
+include/kerberosIV/xdbm.h
+include/kerberosIV/ss/ss.h
+@dirrm include/kerberosIV/ss
+@dirrm include/kerberosIV
+@unexec ${INSTALL_INFO} --delete %D/info/kth-krb.info %D/info/dir
+info/kth-krb.info
+@exec ${INSTALL_INFO} %D/info/kth-krb.info %D/info/dir
+lib/libacl.a
+lib/libacl.la
+lib/libacl.so
+lib/libacl.so.1
+lib/libacl.so.1.0
+lib/libcom_err.a
+lib/libcom_err.la
+lib/libcom_err.so
+lib/libcom_err.so.2
+lib/libcom_err.so.2.0
+lib/libdes.a
+lib/libdes.la
+lib/libdes.so
+lib/libdes.so.3
+lib/libdes.so.3.1
+lib/libeditline.a
+lib/libeditline.la
+lib/libkadm.a
+lib/libkadm.la
+lib/libkadm.so
+lib/libkadm.so.1
+lib/libkadm.so.1.10
+lib/libkafs.a
+lib/libkafs.la
+lib/libkafs.so
+lib/libkafs.so.3
+lib/libkafs.so.3.3
+lib/libkdb.a
+lib/libkdb.la
+lib/libkdb.so
+lib/libkdb.so.1
+lib/libkdb.so.1.10
+lib/libkrb.a
+lib/libkrb.la
+lib/libkrb.so
+lib/libkrb.so.2
+lib/libkrb.so.2.0
+lib/libotp.a
+lib/libotp.la  
+lib/libotp.so
+lib/libotp.so.1
+lib/libotp.so.1.3
+lib/libroken.a
+lib/libroken.la
+lib/libroken.so
+lib/libroken.so.15
+lib/libroken.so.15.0
+lib/libsl.a
+lib/libsl.la
+lib/libsl.so
+lib/libsl.so.1
+lib/libsl.so.1.2
+lib/libss.a
+lib/libss.la
+lib/libss.so
+lib/libss.so.1
+lib/libss.so.1.4
+libexec/ftpd
+libexec/kadmind
+libexec/kauthd
 libexec/kerberos
 libexec/kip-join-network
+libexec/kipd
 libexec/kipd-control
-libexec/kpropd
 libexec/kprop
-libexec/kadmind
-libexec/kauthd
-libexec/rshd
-libexec/rlogind
+libexec/kpropd
+libexec/kxd
 libexec/movemail
-libexec/push
 libexec/popper
-libexec/kxd
-libexec/kipd
-libexec/ftpd
+libexec/push
+libexec/rlogind
+libexec/rshd
+libexec/sample_server
+libexec/simple_server
 libexec/telnetd
-sbin/ext_srvtab
-sbin/kdb_destroy
-sbin/kdb_edit
-sbin/kdb_init
-sbin/kdb_util
-sbin/kstash
-sbin/ksrvutil
-man/man1/xnlock.1
+man/cat1/afslog.0
+man/cat1/ftp.0
+man/cat1/kauth.0
+man/cat1/kdestroy.0
+man/cat1/kerberos.0
+man/cat1/kinit.0
+man/cat1/klist.0
+man/cat1/krb4-config.0
+man/cat1/ksrvtgt.0
+man/cat1/kx.0
+man/cat1/login.0
+man/cat1/otp.0
+man/cat1/otpprint.0
+man/cat1/pagsh.0
+man/cat1/pfrom.0
+man/cat1/rcp.0
+man/cat1/rlogin.0
+man/cat1/rsh.0
+man/cat1/rxtelnet.0
+man/cat1/rxterm.0
+man/cat1/telnet.0
+man/cat1/tenletxr.0
+man/cat1/xnlock.0
+man/cat3/acl_check.0
+man/cat3/arg_printusage.0
+man/cat3/des_crypt.0
+man/cat3/editline.0
+man/cat3/getarg.0
+man/cat3/k_afs_cell_of_file.0
+man/cat3/k_hasafs.0
+man/cat3/k_pioctl.0
+man/cat3/k_setpag.0
+man/cat3/k_unlog.0
+man/cat3/kafs.0
+man/cat3/kerberos.0
+man/cat3/krb_afslog.0
+man/cat3/krb_afslog_uid.0 
+man/cat3/krb_realmofhost.0
+man/cat3/krb_sendauth.0
+man/cat5/ftpusers.0
+man/cat5/login.access.0
+man/cat8/ext_srvtab.0
+man/cat8/ftpd.0
+man/cat8/kauthd.0
+man/cat8/kdb_destroy.0
+man/cat8/kdb_edit.0
+man/cat8/kdb_init.0
+man/cat8/kdb_util.0
+man/cat8/kerberos.0
+man/cat8/kprop.0
+man/cat8/kpropd.0
+man/cat8/kstash.0
+man/cat8/kxd.0
+man/cat8/movemail.0
+man/cat8/popper.0
+man/cat8/push.0
+man/cat8/rlogind.0
+man/cat8/telnetd.0
 man/man1/afslog.1
-man/man1/des.1
 man/man1/ftp.1
 man/man1/kauth.1
 man/man1/kdestroy.1
 man/man1/kerberos.1
 man/man1/kinit.1
 man/man1/klist.1
-man/man1/kpasswd.1
+man/man1/krb4-config.1  
 man/man1/ksrvtgt.1
 man/man1/kx.1
 man/man1/login.1
-man/man1/movemail.1
 man/man1/otp.1
 man/man1/otpprint.1
 man/man1/pagsh.1
+man/man1/pfrom.1
 man/man1/rcp.1
 man/man1/rlogin.1
 man/man1/rsh.1
@@ -119,16 +228,26 @@ man/man1/rxterm.1
 man/man1/su.1
 man/man1/telnet.1
 man/man1/tenletxr.1
+man/man1/xnlock.1
 man/man3/acl_check.3
+man/man3/arg_printusage.3
 man/man3/des_crypt.3
+man/man3/editline.3
+man/man3/getarg.3
+man/man3/k_afs_cell_of_file.3
+man/man3/k_hasafs.3
+man/man3/k_pioctl.3
+man/man3/k_setpag.3
+man/man3/k_unlog.3
 man/man3/kafs.3
 man/man3/kerberos.3
+man/man3/krb_afslog.3
+man/man3/krb_afslog_uid.3
 man/man3/krb_realmofhost.3
 man/man3/krb_sendauth.3
 man/man3/krb_set_tkt_string.3
 man/man3/kuserok.3
 man/man3/tf_util.3
-man/man3/editline.3
 man/man5/ftpusers.5
 man/man5/krb.conf.5
 man/man5/krb.extra.5
@@ -136,8 +255,6 @@ man/man5/krb.realms.5
 man/man5/login.access.5
 man/man8/ext_srvtab.8
 man/man8/ftpd.8
-man/man8/kadmin.8
-man/man8/kadmind.8
 man/man8/kauthd.8
 man/man8/kdb_destroy.8
 man/man8/kdb_edit.8
@@ -146,73 +263,24 @@ man/man8/kdb_util.8
 man/man8/kerberos.8
 man/man8/kprop.8
 man/man8/kpropd.8
-man/man8/ksrvutil.8
 man/man8/kstash.8
 man/man8/kxd.8
+man/man8/movemail.8
 man/man8/popper.8
+man/man8/push.8
 man/man8/rlogind.8
 man/man8/rshd.8
 man/man8/telnetd.8
-man/man8/push.8
-man/cat1/afslog.0
-man/cat1/des.0
-man/cat1/ftp.0
-man/cat1/kauth.0
-man/cat1/kdestroy.0
-man/cat1/kerberos.0
-man/cat1/kinit.0
-man/cat1/klist.0
-man/cat1/kpasswd.0
-man/cat1/ksrvtgt.0
-man/cat1/kx.0
-man/cat1/login.0
-man/cat1/movemail.0
-man/cat1/otp.0
-man/cat1/otpprint.0
-man/cat1/pagsh.0
-man/cat1/rcp.0
-man/cat1/rlogin.0
-man/cat1/rsh.0
-man/cat1/rxtelnet.0
-man/cat1/rxterm.0
-man/cat1/su.0
-man/cat1/telnet.0
-man/cat1/tenletxr.0
-man/cat3/acl_check.0
-man/cat3/des_crypt.0
-man/cat3/kafs.0
-man/cat3/kerberos.0
-man/cat3/krb_realmofhost.0
-man/cat3/krb_sendauth.0
-man/cat3/krb_set_tkt_string.0
-man/cat3/kuserok.0
-man/cat3/tf_util.0
-man/cat3/editline.0
-man/cat5/ftpusers.0
-man/cat5/krb.conf.0
-man/cat5/krb.equiv.0
-man/cat5/krb.realms.0
-man/cat5/login.access.0
-man/cat8/ext_srvtab.0
-man/cat8/ftpd.0
-man/cat8/kadmin.0
-man/cat8/kadmind.0
-man/cat8/kauthd.0
-man/cat8/kdb_destroy.0
-man/cat8/kdb_edit.0
-man/cat8/kdb_init.0
-man/cat8/kdb_util.0
-man/cat8/kerberos.0
-man/cat8/kprop.0
-man/cat8/kpropd.0
-man/cat8/ksrvutil.0
-man/cat8/kstash.0
-man/cat8/kxd.0
-man/cat8/popper.0
-man/cat8/rlogind.0
-man/cat8/rshd.0
-man/cat8/telnetd.0
-man/cat8/push.0
-@unexec ${INSTALL_INFO} --delete %D/info/kth-krb.info %D/info/dir
-info/kth-krb.info
-@exec ${INSTALL_INFO} %D/info/kth-krb.info %D/info/dir
+sbin/ext_srvtab
+sbin/kdb_destroy
+sbin/kdb_edit
+sbin/kdb_init
+sbin/kdb_util
+sbin/ksrvutil
+sbin/kstash
+share/examples/kth-krb4/inetd.conf.changes
+share/examples/kth-krb4/krb.conf
+share/examples/kth-krb4/krb.realms
+share/examples/kth-krb4/services-1.4.2.diff
+share/examples/kth-krb4/services-1.5.diff
+@dirrm share/examples/kth-krb4
diff --git a/security/kth-krb4/buildlink.mk b/security/kth-krb4/buildlink.mk
new file mode 100644
index 00000000000..5ca3b5a3b26
--- /dev/null
+++ b/security/kth-krb4/buildlink.mk
@@ -0,0 +1,40 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/04/05 11:32:20 wennmach Exp $
+#
+# This Makefile fragment is included by packages that use kth-krb4.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Include this Makefile fragment in the package Makefile,
+# (2) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (3) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path. 
+
+.if !defined(KTHKRB4_BUILDLINK_MK)
+KTHKRB4_BUILDLINK_MK=   # defined 
+
+.include "../../mk/bsd.buildlink.mk" 
+
+BUILDLINK_DEPENDS.kth-krb4?=	kth-krb4>=1.1.1
+DEPENDS+=			${BUILDLINK_DEPENDS.kth-krb4}:../../security/kth-krb4
+EVAL_PREFIX+=			BUILDLINK_PREFIX.kth-krb4=kth-krb4
+
+BUILDLINK_FILES.kth-krb4=	include/kerberosIV/*
+BUILDLINK_FILES.kth-krb4+=	lib/libacl.*
+BUILDLINK_FILES.kth-krb4+=	lib/libcom_err.*
+BUILDLINK_FILES.kth-krb4+=	lib/libdes.*
+BUILDLINK_FILES.kth-krb4+=	lib/libkadm.*
+BUILDLINK_FILES.kth-krb4+=	lib/libkafs.*
+BUILDLINK_FILES.kth-krb4+=	lib/lib/libkdb.*
+BUILDLINK_FILES.kth-krb4+=	lib/libkrb.*
+BUILDLINK_FILES.kth-krb4+=	lib/libotp.*
+BUILDLINK_FILES.kth-krb4+=	lib/libroken.*
+BUILDLINK_FILES.kth-krb4+=	lib/libsl.*
+BUILDLINK_FILES.kth-krb4+=	lib/libss.*
+
+BUILDLINK_TARGETS+=             kth-krb4-buildlink
+
+pre-configure: kth-krb4-buildlink
+kth-krb4-buildlink: _BUILDLINK_USE  
+
+.endif	# KTHKRB4_BUILDLINK_MK
diff --git a/security/kth-krb4/distinfo b/security/kth-krb4/distinfo
index 329baf1e035..fbc928a2be9 100644
--- a/security/kth-krb4/distinfo
+++ b/security/kth-krb4/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/10/07 09:51:46 veego Exp $
+$NetBSD: distinfo,v 1.5 2002/04/05 11:32:20 wennmach Exp $
 
-SHA1 (krb4-1.0.9.tar.gz) = 23e1e93e025f5b33c26592b6355c982458c9544a
-Size (krb4-1.0.9.tar.gz) = 1402551 bytes
-SHA1 (patch-aa) = c5e312bc29c5c947c7838ebb221bb6307727c81f
-SHA1 (patch-ad) = 01b2a8957ac22cc4cc28c7da44d1a956fc8f3c1b
-SHA1 (patch-ae) = 421445ebd2d3afccfdf6514b68847beb13f1cffa
+SHA1 (krb4-1.1.1.tar.gz) = db192908ec8510a22161c7607f83c8779dc7294a
+Size (krb4-1.1.1.tar.gz) = 1817919 bytes
 SHA1 (patch-ag) = e39c3159fe89cedbb34dd5dadcb95826cd8d4576
-SHA1 (patch-ah) = 95cbf045bf327ebcff920b9416a9f0eba04cb5ca
-SHA1 (patch-ai) = 5082b47d658a94f27cbfefd79391a48cb11c2ec1
+SHA1 (patch-ah) = f60b4c67dc6fbd08a337f75585f9597e508c4c4c
+SHA1 (patch-ai) = 716ae2b9675d1d83e5e27edfa90c792d72b37ea5
diff --git a/security/kth-krb4/patches/patch-aa b/security/kth-krb4/patches/patch-aa
deleted file mode 100644
index f0a0e7a5d73..00000000000
--- a/security/kth-krb4/patches/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/08/02 12:46:49 wennmach Exp $
-
-Do also install roken.h, roken-common.h, and libroken.a
-Use "cp" instead of "install" during the build process, since the latter
-may require root privileges.
-
---- lib/roken/Makefile.in.orig	Thu Jun 21 17:21:10 2001
-+++ lib/roken/Makefile.in	Wed Aug  1 14:25:16 2001
-@@ -3,6 +3,7 @@
- #
- 
- SHELL = /bin/sh
-+CP = /bin/cp
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -27,6 +28,13 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
-+
-+includedir = @includedir@
-+
-+incdir = $(includedir)
-+inc_DATA = roken.h roken-common.h
-+idir = $(top_builddir)/include 
-+
- EXECSUFFIX = @EXECSUFFIX@
- PICFLAGS = # @PICFLAGS@
-  
-@@ -169,8 +177,19 @@
- 	$(CC) -c $(DEFS) -I. -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
- 
- install: all
-+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+	$(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB)
-+	@install_symlink_command@
-+	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-+	@for i in $(inc_DATA); do \
-+	echo "  $(INSTALL_DATA) $$i $(DESTDIR)$(incdir)/$$i";\
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(incdir)/$$i; done
- 
- uninstall:
-+	rm -f $(DESTDIR)$(libdir)/$(LIB)
-+	@for i in $(inc_DATA); do \
-+	echo "  rm -f $(DESTDIR)$(incdir)/$$i";\
-+	rm -f $(DESTDIR)$(incdir)/$$i; done
- 
- TAGS: $(SOURCES) $(EXTRA_SOURCES)
- 	etags $(SOURCES) $(EXTRA_SOURCES)
-@@ -220,8 +239,8 @@
- install-roken-h: roken.h
- 	@if [ -f ../../include/roken.h ] && cmp -s ../../include/roken.h roken.h ; \
- 	then :; else \
--	echo "  $(INSTALL) roken.h ../../include/roken.h"; \
--	$(INSTALL) roken.h ../../include/roken.h; fi
-+	echo "  $(CP) roken.h ../../include/roken.h"; \
-+	$(CP) roken.h ../../include/roken.h; fi
- 
- $(OBJECTS): ../../include/config.h roken.h
- 
diff --git a/security/kth-krb4/patches/patch-ad b/security/kth-krb4/patches/patch-ad
deleted file mode 100644
index 5f29e33d827..00000000000
--- a/security/kth-krb4/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/08/02 12:46:49 wennmach Exp $
-
-Use INSTALL_SCRIPT on zrefresh, to avoid striping it.
-
---- appl/kauth/Makefile.in	2001/06/21 15:15:15	1.40.16.2
-+++ appl/kauth/Makefile.in	2001/08/01 14:58:35	1.40.16.3
-@@ -67,7 +67,7 @@
- 	if test -f $(DESTDIR)$(bindir)/zrefresh -o -r  $(DESTDIR)$(bindir)/zrefresh; then \
- 	  true; \
- 	else \
--	  $(INSTALL_PROGRAM) $(srcdir)/zrefresh $(DESTDIR)$(bindir)/`echo zrefresh | sed '$(transform)'`; \
-+	  $(INSTALL_SCRIPT) $(srcdir)/zrefresh $(DESTDIR)$(bindir)/`echo zrefresh | sed '$(transform)'`; \
- 	fi
- 	for x in $(PROG_LIBEXEC); do \
- 	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/`echo $$x| sed '$(transform)'`; \
diff --git a/security/kth-krb4/patches/patch-ae b/security/kth-krb4/patches/patch-ae
deleted file mode 100644
index 6a4c8df3619..00000000000
--- a/security/kth-krb4/patches/patch-ae
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2001/08/02 12:46:49 wennmach Exp $
-
-Use INSTALL_SCRIPT on pfrom, to avoid striping it.
-
---- appl/push/Makefile.in	2001/06/21 15:21:02	1.10.16.1
-+++ appl/push/Makefile.in	2001/08/01 16:09:26	1.10.16.3
-@@ -17,6 +17,7 @@
- LD_FLAGS = @LD_FLAGS@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- LIBS = @LIB_hesiod@ @LIBS@
- LIB_DBM = @LIB_DBM@
- MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-@@ -29,12 +30,14 @@
- transform=@program_transform_name@
- EXECSUFFIX=@EXECSUFFIX@
- 
--bin_PROGRAMS		= pfrom
-+bin_SCRIPTS		= pfrom
- 
- libexec_PROGRAMS	= push$(EXECSUFFIX)
- 
--PROGRAMS		= $(libexec_PROGRAMS) $(bin_PROGRAMS)
-+PROGRAMS		= $(libexec_PROGRAMS)
- 
-+SCRIPTS			= $(bin_SCRIPTS)
-+
- push_SOURCES		= push.c
- 
- push_OBJECTS		= push.o
-@@ -43,7 +46,7 @@
- 
- OBJECTS			= $(push_OBJECTS)
- 
--all: $(PROGRAMS)
-+all: $(PROGRAMS) $(SCRIPTS)
- 
- .c.o:
- 	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
-@@ -53,6 +56,9 @@
- 	for x in $(bin_PROGRAMS); do \
- 	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
- 	done
-+	for x in $(bin_SCRIPTS); do \
-+	  $(INSTALL_SCRIPT) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
-+	done
- 	$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
- 	for x in $(libexec_PROGRAMS); do \
- 	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
-@@ -62,6 +68,9 @@
- 	for x in $(bin_PROGRAMS); do \
- 	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
- 	done
-+	for x in $(bin_SCRIPTS); do \
-+	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
-+	done
- 	for x in $(libexec_PROGRAMS); do \
- 	  rm -f $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
- 	done
-@@ -72,7 +81,7 @@
- check:
- 
- clean:
--	rm -f *.a *.o $(PROGRAMS)
-+	rm -f *.a *.o $(PROGRAMS) $(SCRIPTS)
- 
- mostlyclean: clean
- 
diff --git a/security/kth-krb4/patches/patch-ah b/security/kth-krb4/patches/patch-ah
index cdcc011dee9..a2e035c9fc0 100644
--- a/security/kth-krb4/patches/patch-ah
+++ b/security/kth-krb4/patches/patch-ah
@@ -1,16 +1,55 @@
-$NetBSD: patch-ah,v 1.1 2000/10/11 16:28:54 wennmach Exp $
+$NetBSD: patch-ah,v 1.2 2002/04/05 11:32:22 wennmach Exp $
 
-Do not install the des executable. This avoids a conflict with the
-openssl package, which installs an executable with the same name
-(and functionality) into the same place.
+Do not install the des executable, nor the des.1 man page. This avoids
+a conflict with the openssl package, which installs an executable with
+the same name (and functionality) into the same place.
 
---- lib/des/Makefile.in.orig	Wed Oct 11 18:07:08 2000
-+++ lib/des/Makefile.in	Wed Oct 11 18:08:09 2000
-@@ -42,7 +42,6 @@
- 	des$(EXECSUFFIX) \
- 	rpw$(EXECSUFFIX) \
- 	speed$(EXECSUFFIX)
--PROGS2INSTALL = des$(EXECSUFFIX)
- LIBNAME = $(LIBPREFIX)des
- LIBEXT = @LIBEXT@
- LIBPREFIX = @LIBPREFIX@
+--- lib/des/Makefile.am.orig	Mon Apr  1 11:48:01 2002
++++ lib/des/Makefile.am	Mon Apr  1 11:49:39 2002
+@@ -13,7 +13,7 @@
+ 
+ TESTS = destest mdtest md5crypt_test
+ CHECK_LOCAL = 
+-bin_PROGRAMS = des #rpw speed
++bin_PROGRAMS =
+ 
+ des_SOURCES = des.c des_ver.h
+ 
+@@ -59,7 +59,7 @@
+ EXTRA_libdes_la_SOURCES = dllmain.c passwd_dialog.aps passwd_dialog.clw \
+ 	passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h
+ 
+-man_MANS = des.1 des_crypt.3
++man_MANS = des_crypt.3
+ 
+ ## this is an awful lot of junk, but it's just as well to include everything
+ EXTRA_DIST =		\
+--- lib/des/Makefile.in.orig	Thu Apr  4 16:10:37 2002
++++ lib/des/Makefile.in	Thu Apr  4 16:11:27 2002
+@@ -212,7 +212,7 @@
+ check_PROGRAMS = destest mdtest md5crypt_test
+ 
+ TESTS = destest mdtest md5crypt_test
+-bin_PROGRAMS = des #rpw speed
++bin_PROGRAMS =
+ 
+ des_SOURCES = des.c des_ver.h
+ 
+@@ -260,7 +260,7 @@
+ 	passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h
+ 
+ 
+-man_MANS = des.1 des_crypt.3
++man_MANS = des_crypt.3
+ 
+ EXTRA_DIST = \
+ 	COPYRIGHT	\
+@@ -329,7 +329,7 @@
+ rc4_enc.lo read_pwd.lo rnd_keys.lo set_key.lo sha.lo str2key.lo \
+ xcbc_enc.lo
+ libdes_la_OBJECTS =  $(am_libdes_la_OBJECTS)
+-bin_PROGRAMS =  des$(EXEEXT)
++bin_PROGRAMS =
+ check_PROGRAMS =  destest$(EXEEXT) mdtest$(EXEEXT) \
+ md5crypt_test$(EXEEXT)
+ PROGRAMS =  $(bin_PROGRAMS)
diff --git a/security/kth-krb4/patches/patch-ai b/security/kth-krb4/patches/patch-ai
index b00c0d14c72..9a6eab51e81 100644
--- a/security/kth-krb4/patches/patch-ai
+++ b/security/kth-krb4/patches/patch-ai
@@ -1,16 +1,27 @@
-$NetBSD: patch-ai,v 1.1 2001/04/12 14:53:40 wennmach Exp $
+$NetBSD: patch-ai,v 1.2 2002/04/05 11:32:22 wennmach Exp $
 
 Do not install man/man5/krb.equiv.5 to avoid a conflict with the
 cyrus-imapd package.
 
---- man/Makefile.in.orig	Thu Apr 12 16:23:12 2001
-+++ man/Makefile.in	Thu Apr 12 16:23:51 2001
-@@ -55,7 +55,7 @@
+--- lib/krb/Makefile.am.orig	Mon Apr  1 11:53:16 2002
++++ lib/krb/Makefile.am	Mon Apr  1 11:53:42 2002
+@@ -18,7 +18,7 @@
+ noinst_PROGRAMS = sizetest
  
- # getusershell.cat3 
+ man_MANS = kerberos.1 kerberos.3 krb_realmofhost.3 krb_sendauth.3	\
+-	krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 krb.equiv.5	\
++	krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 		\
+ 	krb.extra.5 krb.realms.5
+ 
+ 
+--- lib/krb/Makefile.in.orig	Thu Apr  4 16:37:53 2002
++++ lib/krb/Makefile.in	Thu Apr  4 16:38:11 2002
+@@ -216,7 +216,7 @@
+ noinst_PROGRAMS = sizetest
+ 
+ man_MANS = kerberos.1 kerberos.3 krb_realmofhost.3 krb_sendauth.3	\
+-	krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 krb.equiv.5	\
++	krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 \
+ 	krb.extra.5 krb.realms.5
  
--MAN5 = ftpusers.5 krb.conf.5 krb.equiv.5 krb.extra.5 \
-+MAN5 = ftpusers.5 krb.conf.5 krb.extra.5 \
-        krb.realms.5 login.access.5
  
- CAT5 = ftpusers.cat5 krb.conf.cat5 krb.equiv.cat5 \