Don't patch the same file twice in different patch files.

Put the old patch-ab into patch-aa and use patch-ab for Solaris patches.

3 files changed, 67 insertions, 15 deletions

diff --git a/mail/sendmail/files/patch-sum b/mail/sendmail/files/patch-sum
index a5ffccce3b5..c4cfa52e30f 100644
--- a/mail/sendmail/files/patch-sum
+++ b/mail/sendmail/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.7 2000/07/26 09:31:17 itojun Exp $
+$NetBSD: patch-sum,v 1.8 2000/07/26 15:09:24 veego Exp $
 
-MD5 (patch-aa) = 85d59753f5d593e8c1c3eab01302967e
-MD5 (patch-ab) = 3301ced548a17d8e013f593cec847a20
+MD5 (patch-aa) = 8b9fcec3b4f82a30c7a167c32a00841f
+MD5 (patch-ab) = 97c215aaa9d6b7594f107b68d31443e0
diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa
index 4e0c247ff9b..6be635e50b9 100644
--- a/mail/sendmail/patches/patch-aa
+++ b/mail/sendmail/patches/patch-aa
@@ -1,7 +1,10 @@
-$NetBSD: patch-aa,v 1.11 2000/07/24 04:22:34 itojun Exp $
---- devtools/OS/NetBSD-	Mon Jul 24 12:38:53 2000
-+++ devtools/OS/NetBSD	Mon Jul 24 12:40:56 2000
-@@ -5,7 +5,8 @@
+$NetBSD: patch-aa,v 1.12 2000/07/26 15:09:25 veego Exp $
+
+--- devtools/OS/NetBSD-orig	Fri Apr 28 07:46:10 2000
++++ devtools/OS/NetBSD	Wed Jul 26 13:05:56 2000
+@@ -3,13 +3,15 @@
+ define(`confENVDEF', ` -DNETISO')
+ define(`confDEPEND_TYPE', `CC-M')
  define(`confSTDIO_TYPE', `torek')
 -define(`confSBINGRP', `wheel')
 -define(`confUBINOWN', `root')
@@ -15,3 +18,8 @@ $NetBSD: patch-aa,v 1.11 2000/07/24 04:22:34 itojun Exp $
 +define(`confMANOWN', `${BSD_MANOWN}')
 +define(`confMANGRP', `${BSD_MANGRP}')
  define(`confMAN1EXT', `0')
+ define(`confMAN3EXT', `0')
+ define(`confMAN4EXT', `0')
+ define(`confMAN5EXT', `0')
+ define(`confMAN8EXT', `0')
++define(`confLDOPTS', `${LDFLAGS}')
diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab
index c2bd08cc2eb..b8a22a294c0 100644
--- a/mail/sendmail/patches/patch-ab
+++ b/mail/sendmail/patches/patch-ab
@@ -1,8 +1,52 @@
-$NetBSD: patch-ab,v 1.7 2000/07/26 09:31:19 itojun Exp $
-*** devtools/OS/NetBSD-	Wed Jul 26 18:20:07 2000
---- devtools/OS/NetBSD	Wed Jul 26 18:19:29 2000
-***************
-*** 16 ****
---- 16,17 ----
-  define(`confMAN8EXT', `0')
-+ define(`confLDOPTS', `${LDFLAGS}')
+$NetBSD: patch-ab,v 1.8 2000/07/26 15:09:25 veego 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
+@@ -6,6 +6,7 @@
+ define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+ define(`confENVDEF', `-DSOLARIS=20600')
+ define(`confLIBS', `-lsocket -lnsl -lkstat')
++define(`confLDOPTS', `${LDFLAGS}')
+ 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')