Added descriptions of what exactly each patch does.

Inserted placeholders into MESSAGE which get replaced during pre-install.
Enhanced MESSAGE text.

9 files changed, 55 insertions, 16 deletions

diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 663c31eac2f..6c3a215dcc8 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/05/25 17:57:27 wennmach Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/08 13:53:24 wennmach Exp $
 #
 
 DISTNAME=		krb4-1.0.1
@@ -9,10 +9,26 @@ MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/krb/src/
 MAINTAINER=		wennmach@netbsd.org
 HOMEPAGE=		http://www.pdc.kth.se/kth-krb/
 
+CONFLICTS+=		openssl-*
+
 RESTRICTED=		"Crypto; export-controlled"
 MIRROR_DISTFILE=	no
 
 GNU_CONFIGURE=		yes
+#USE_GTEXINFO=		yes #not currently needed
+
+MESSAGE_FILE=		${WRKDIR}/MESSAGE
+
+post-patch:
+	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
+		<${WRKSRC}/lib/kafs/kafs.h                                    \
+		>${WRKSRC}/lib/kafs/kafs.h.sed
+	@${MV} ${WRKSRC}/lib/kafs/kafs.h.sed ${WRKSRC}/lib/kafs/kafs.h
+
+pre-install:
+	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
+		<${PKGDIR}/MESSAGE                                            \
+		>${MESSAGE_FILE}    
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/kth-krb4
diff --git a/security/kth-krb4/files/patch-sum b/security/kth-krb4/files/patch-sum
index 481b7bf75b2..0fefad88789 100644
--- a/security/kth-krb4/files/patch-sum
+++ b/security/kth-krb4/files/patch-sum
@@ -1,8 +1,9 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+$NetBSD: patch-sum,v 1.2 2000/06/08 13:53:25 wennmach Exp $
 
-MD5 (patch-aa) = 313156e9a3f2cfd21a4853bd9e19470c
-MD5 (patch-ab) = 145e9aeacfefaca1006b0fe0edd14059
-MD5 (patch-ac) = 82c853e679cf90c13633753288cc0a5f
-MD5 (patch-ad) = 1ed13671af32c0bd7950edddab302177
-MD5 (patch-ae) = 3a0d3f6bd91f18c37152dc3c4f9e8187
-MD5 (patch-af) = 09ddef69f63038c12a53ad51b09e51b8
+MD5 (patch-aa) = 232e0714e57e6905c6c51d913e0a3e94
+MD5 (patch-ab) = 6e48d45341db72c377b87e13963abe66
+MD5 (patch-ac) = d8b8f27ae12ae6d33271900b16b3fa38
+MD5 (patch-ad) = ec4cfc4ab1647a7e86c18b70f9a43eef
+MD5 (patch-ae) = c021b58d8a564b70c86b1ba78d19c3ff
+MD5 (patch-af) = 4ce752c342c54ad48243660a191776d1
+MD5 (patch-ag) = a443eab80ad7fd6d8172a0eaf3f1b18b
diff --git a/security/kth-krb4/patches/patch-aa b/security/kth-krb4/patches/patch-aa
index 8641f3d2b60..df3220b3828 100644
--- a/security/kth-krb4/patches/patch-aa
+++ b/security/kth-krb4/patches/patch-aa
@@ -1,4 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+$NetBSD: patch-aa,v 1.2 2000/06/08 13:53:25 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	Tue Nov 30 20:22:59 1999
 +++ lib/roken/Makefile.in	Thu May 25 16:25:38 2000
diff --git a/security/kth-krb4/patches/patch-ab b/security/kth-krb4/patches/patch-ab
index e456575fded..fdf63699ab0 100644
--- a/security/kth-krb4/patches/patch-ab
+++ b/security/kth-krb4/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+$NetBSD: patch-ab,v 1.2 2000/06/08 13:53:25 wennmach Exp $
+
+Use "cp" instead of "install" during the build process, since the latter
+may require root privileges. 
 
 --- lib/krb/Makefile.in.orig	Thu Nov 25 06:26:26 1999
 +++ lib/krb/Makefile.in	Thu May 25 18:32:21 2000
diff --git a/security/kth-krb4/patches/patch-ac b/security/kth-krb4/patches/patch-ac
index 71f25f7987e..26bdaf6677f 100644
--- a/security/kth-krb4/patches/patch-ac
+++ b/security/kth-krb4/patches/patch-ac
@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+$NetBSD: patch-ac,v 1.2 2000/06/08 13:53:25 wennmach Exp $
+
+Use "cp" instead of "install" during the build process, since the latter
+may require root privileges. 
 
 --- lib/kadm/Makefile.in.orig	Thu May 25 13:31:47 2000
 +++ lib/kadm/Makefile.in	Thu May 25 13:32:23 2000
diff --git a/security/kth-krb4/patches/patch-ad b/security/kth-krb4/patches/patch-ad
index 979c8cbdc9b..77fe416d566 100644
--- a/security/kth-krb4/patches/patch-ad
+++ b/security/kth-krb4/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+$NetBSD: patch-ad,v 1.2 2000/06/08 13:53:26 wennmach Exp $
+
+Do not try to strip scripts.
 
 --- appl/kauth/Makefile.in.orig	Thu May 25 13:53:23 2000
 +++ appl/kauth/Makefile.in	Thu May 25 14:17:49 2000
diff --git a/security/kth-krb4/patches/patch-ae b/security/kth-krb4/patches/patch-ae
index 8d137620675..a55dc5c16e0 100644
--- a/security/kth-krb4/patches/patch-ae
+++ b/security/kth-krb4/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+$NetBSD: patch-ae,v 1.2 2000/06/08 13:53:26 wennmach Exp $
+
+Do not try to strip scripts.
 
 --- appl/push/Makefile.in.orig	Thu May 25 14:36:00 2000
 +++ appl/push/Makefile.in	Thu May 25 14:37:58 2000
diff --git a/security/kth-krb4/patches/patch-af b/security/kth-krb4/patches/patch-af
index 72b5252894e..41c10a2af75 100644
--- a/security/kth-krb4/patches/patch-af
+++ b/security/kth-krb4/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/05/25 17:57:28 wennmach Exp $
+$NetBSD: patch-af,v 1.2 2000/06/08 13:53:26 wennmach Exp $
+
+Do not try to strip scripts.
 
 --- appl/kx/Makefile.in.orig	Thu May 25 14:47:35 2000
 +++ appl/kx/Makefile.in	Thu May 25 14:56:51 2000
diff --git a/security/kth-krb4/pkg/MESSAGE b/security/kth-krb4/pkg/MESSAGE
index 6f21db56493..ee8e173e9c4 100644
--- a/security/kth-krb4/pkg/MESSAGE
+++ b/security/kth-krb4/pkg/MESSAGE
@@ -2,6 +2,12 @@
 Kth-krb4 now has been installed on your system.
 
 To complete the installation you'll have to configure Kerberos.
-More information on how to configure Kerberos is available as info file.
-Sample files are installed in $prefix/share/examples/kth-krb4.
+More information on how to configure Kerberos is available via the "info"
+command. Sample configuration files are installed in
+@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.diff to
+/etc/services.
 ===============================================================================