From 63ee423be3f70dfaaabd27512d6223fab5a46b9a Mon Sep 17 00:00:00 2001
From: wennmach <wennmach@pkgsrc.org>
Date: Wed, 11 Oct 2000 16:28:53 +0000
Subject: Do not install bin/des in order to avoid a conflict with the openssl
 package (close to nobody is using this program anyways).

---
 security/kth-krb4/Makefile         |  4 +---
 security/kth-krb4/files/patch-sum  |  3 ++-
 security/kth-krb4/patches/patch-ah | 16 ++++++++++++++++
 security/kth-krb4/pkg/PLIST        |  3 +--
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 security/kth-krb4/patches/patch-ah

(limited to 'security/kth-krb4')

diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index e6e23dc3112..8c4becb2844 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/09/09 19:40:21 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2000/10/11 16:28:53 wennmach Exp $
 #
 
 DISTNAME=		krb4-1.0.1
@@ -9,8 +9,6 @@ MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/krb/src/
 MAINTAINER=		wennmach@netbsd.org
 HOMEPAGE=		http://www.pdc.kth.se/kth-krb/
 
-CONFLICTS+=		openssl-*
-
 CRYPTO=			yes
 GNU_CONFIGURE=		yes
 #USE_GTEXINFO=		yes #not currently needed
diff --git a/security/kth-krb4/files/patch-sum b/security/kth-krb4/files/patch-sum
index 0fefad88789..74f03d84745 100644
--- a/security/kth-krb4/files/patch-sum
+++ b/security/kth-krb4/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/06/08 13:53:25 wennmach Exp $
+$NetBSD: patch-sum,v 1.3 2000/10/11 16:28:54 wennmach Exp $
 
 MD5 (patch-aa) = 232e0714e57e6905c6c51d913e0a3e94
 MD5 (patch-ab) = 6e48d45341db72c377b87e13963abe66
@@ -7,3 +7,4 @@ MD5 (patch-ad) = ec4cfc4ab1647a7e86c18b70f9a43eef
 MD5 (patch-ae) = c021b58d8a564b70c86b1ba78d19c3ff
 MD5 (patch-af) = 4ce752c342c54ad48243660a191776d1
 MD5 (patch-ag) = a443eab80ad7fd6d8172a0eaf3f1b18b
+MD5 (patch-ah) = 6f8135d46c9b756bdc7205f168668b1c
diff --git a/security/kth-krb4/patches/patch-ah b/security/kth-krb4/patches/patch-ah
new file mode 100644
index 00000000000..cdcc011dee9
--- /dev/null
+++ b/security/kth-krb4/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2000/10/11 16:28:54 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.
+
+--- 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@
diff --git a/security/kth-krb4/pkg/PLIST b/security/kth-krb4/pkg/PLIST
index 9cf58b65590..8b4bcfb9237 100644
--- a/security/kth-krb4/pkg/PLIST
+++ b/security/kth-krb4/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/05/25 17:57:29 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/10/11 16:28:54 wennmach Exp $
 share/examples/kth-krb4/inetd.conf.changes
 share/examples/kth-krb4/krb.conf
 share/examples/kth-krb4/krb.realms
@@ -38,7 +38,6 @@ lib/libss.a
 lib/libotp.a
 lib/libroken.a
 bin/compile_et
-bin/des
 bin/mk_cmds
 bin/kinit
 bin/kdestroy
-- 
cgit v1.2.3