- Split multi file patch.

- Fix CVS lossage.

5 files changed, 50 insertions, 43 deletions

diff --git a/mail/sendmail/files/patch-sum b/mail/sendmail/files/patch-sum
index c4cfa52e30f..135ac20b451 100644
--- a/mail/sendmail/files/patch-sum
+++ b/mail/sendmail/files/patch-sum
@@ -1,4 +1,7 @@
-$NetBSD: patch-sum,v 1.8 2000/07/26 15:09:24 veego Exp $
+$NetBSD: patch-sum,v 1.9 2000/07/31 18:11:07 tron Exp $
 
 MD5 (patch-aa) = 8b9fcec3b4f82a30c7a167c32a00841f
-MD5 (patch-ab) = 97c215aaa9d6b7594f107b68d31443e0
+MD5 (patch-ab) = df740f28896a0851159e3e7a7fcfdb5a
+MD5 (patch-ac) = 6afb53121cfd919c8cb8a37bea3b90f9
+MD5 (patch-ad) = 309d090ecd1b4588f87153e9f240d9bd
+MD5 (patch-ae) = 9cb440411904551b9ceff30cc53b96d8
diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab
index b8a22a294c0..e8d306ad9b1 100644
--- a/mail/sendmail/patches/patch-ab
+++ b/mail/sendmail/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2000/07/26 15:09:25 veego Exp $
+$NetBSD: patch-ab,v 1.9 2000/07/31 18:11:09 tron Exp $
 
 --- devtools/OS/SunOS.5.6	Tue Jun  6 02:03:29 2000
 +++ devtools/OS/SunOS.5.6	Wed Jul 26 13:07:21 2000
@@ -10,43 +10,3 @@ $NetBSD: patch-ab,v 1.8 2000/07/26 15:09:25 veego Exp $
  define(`confMTLDOPTS', `-lpthread')
  define(`confMBINDIR', `/usr/lib')
  define(`confEBINDIR', `/usr/lib')
---- devtools/OS/SunOS.5.7	Tue Jun  6 02:03:29 2000
-+++ devtools/OS/SunOS.5.7	Wed Jul 26 13:07:08 2000
-@@ -6,6 +6,7 @@
- define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
- define(`confENVDEF', `-DSOLARIS=20700')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
---- devtools/OS/SunOS.5.8	Wed Oct 27 05:02:03 1999
-+++ devtools/OS/SunOS.5.8	Wed Jul 26 13:06:34 2000
-@@ -1,9 +1,10 @@
- #	$Id: patch-ab,v 1.8 2000/07/26 15:09:25 veego Exp $
- define(`confCC', `gcc')
- define(`confBEFORE', `sysexits.h')
--define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
-+define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
- define(`confENVDEF', `-DSOLARIS=20800')
--define(`confLIBS', `-lsocket -lnsl -lldap')
-+define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
---- devtools/OS/SunOS.5.9	Fri Jul 14 06:27:07 2000
-+++ devtools/OS/SunOS.5.9	Wed Jul 26 13:06:46 2000
-@@ -1,9 +1,10 @@
- #	$Id: patch-ab,v 1.8 2000/07/26 15:09:25 veego Exp $
- define(`confCC', `gcc')
- define(`confBEFORE', `sysexits.h')
--define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
-+define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
- define(`confENVDEF', `-DSOLARIS=20900')
--define(`confLIBS', `-lsocket -lnsl -lldap')
-+define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ac b/mail/sendmail/patches/patch-ac
new file mode 100644
index 00000000000..9a855014c7c
--- /dev/null
+++ b/mail/sendmail/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2000/07/31 18:11:09 tron Exp $
+
+--- devtools/OS/SunOS.5.7	Tue Jun  6 02:03:29 2000
++++ devtools/OS/SunOS.5.7	Wed Jul 26 13:07:08 2000
+@@ -6,6 +6,7 @@
+ define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+ define(`confENVDEF', `-DSOLARIS=20700')
+ define(`confLIBS', `-lsocket -lnsl')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
+ define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ad b/mail/sendmail/patches/patch-ad
new file mode 100644
index 00000000000..0405e3d9809
--- /dev/null
+++ b/mail/sendmail/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.3 2000/07/31 18:11:09 tron Exp $
+
+--- devtools/OS/SunOS.5.8	Wed Oct 27 05:02:03 1999
++++ devtools/OS/SunOS.5.8	Wed Jul 26 13:06:34 2000
+@@ -2,8 +2,9 @@
+ define(`confCC', `gcc')
+ define(`confBEFORE', `sysexits.h')
+-define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
++define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+ define(`confENVDEF', `-DSOLARIS=20800')
+-define(`confLIBS', `-lsocket -lnsl -lldap')
++define(`confLIBS', `-lsocket -lnsl')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
+ define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ae b/mail/sendmail/patches/patch-ae
new file mode 100644
index 00000000000..1ae928ab4ef
--- /dev/null
+++ b/mail/sendmail/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2000/07/31 18:11:09 tron Exp $
+
+--- devtools/OS/SunOS.5.9	Fri Jul 14 06:27:07 2000
++++ devtools/OS/SunOS.5.9	Wed Jul 26 13:06:46 2000
+@@ -2,8 +2,9 @@
+ define(`confCC', `gcc')
+ define(`confBEFORE', `sysexits.h')
+-define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
++define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+ define(`confENVDEF', `-DSOLARIS=20900')
+-define(`confLIBS', `-lsocket -lnsl -lldap')
++define(`confLIBS', `-lsocket -lnsl')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
+ define(`confEBINDIR', `/usr/lib')