go back to 8.11.3. it was my mistake that i have committed 8.12.0Beta into

mail/sendmail.

10 files changed, 53 insertions, 72 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 3373ce29865..d68f14b39be 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.35 2001/04/13 05:07:50 itojun Exp $
+# $NetBSD: Makefile,v 1.36 2001/04/15 01:18:06 itojun Exp $
 
-DISTNAME=	sendmail.8.12.0.Beta7
-PKGNAME=	sendmail-8.11.99.7
+DISTNAME=	sendmail.8.11.3
+PKGNAME=	sendmail-8.11.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/
 
-#PATCH_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/
-#PATCHFILES=	sendmail8.11.3+3.4W.patch.gz
-#PATCH_DIST_ARGS=-d ${WRKSRC}/sendmail -E ${PATCH_DIST_STRIP}
-#.if !(defined(PATCH_DEBUG) || defined(PKG_VERBOSE))
-#PATCH_DIST_ARGS+=--forward --quiet
-#.endif
-#PATCH_DIST_STRIP=	-p1
+PATCH_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/
+PATCHFILES=	sendmail8.11.3+3.4W.patch.gz
+PATCH_DIST_ARGS=-d ${WRKSRC}/sendmail -E ${PATCH_DIST_STRIP}
+.if !(defined(PATCH_DEBUG) || defined(PKG_VERBOSE))
+PATCH_DIST_ARGS+=--forward --quiet
+.endif
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.sendmail.org/
@@ -25,7 +25,7 @@ NO_CONFIGURE=	yes
 MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
 		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}"
 
-WRKSRC=		${WRKDIR}/sendmail-8.12.0.Beta7
+WRKSRC=		${WRKDIR}/${PKGNAME}
 SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
 
 BUILD_DEFS+=    USE_INET6
@@ -58,7 +58,7 @@ post-patch:
 	${CP} ${PKGDIR}/DESCR ${DESCR_SRC}
 	${ECHO} '---' >> ${DESCR_SRC}
 	${ECHO} -n 'compiled features:' >> ${DESCR_SRC}
-#	${ECHO} -n ' WIDE' >> ${DESCR_SRC}
+	${ECHO} -n ' WIDE' >> ${DESCR_SRC}
 .if defined(USE_INET6) && ${USE_INET6} == YES
 	${CAT} ${FILESDIR}/site.config.m4-v6 >> ${SITECONFIG}
 	${ECHO} -n ' INET6' >> ${DESCR_SRC}
diff --git a/mail/sendmail/files/md5 b/mail/sendmail/files/md5
index bef45758985..247e6ab03a5 100644
--- a/mail/sendmail/files/md5
+++ b/mail/sendmail/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.12 2001/04/13 05:07:51 itojun Exp $
+$NetBSD: md5,v 1.13 2001/04/15 01:18:07 itojun Exp $
 
-SHA1 (sendmail.8.12.0.Beta7.tar.gz) = ed61340eecd73006892ff6e65f576969c024eaab
+SHA1 (sendmail.8.11.3.tar.gz) = 6b7a7c4027f1c40b20f8c018b181ccbbe25a0ebb
+SHA1 (sendmail8.11.3+3.4W.patch.gz) = 8352c54937c32b5afbfa7ff15f45d41c8d11a0cc
diff --git a/mail/sendmail/files/patch-sum b/mail/sendmail/files/patch-sum
index 316bf77b2e4..4a5d567a063 100644
--- a/mail/sendmail/files/patch-sum
+++ b/mail/sendmail/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.18 2001/04/13 05:07:51 itojun Exp $
+$NetBSD: patch-sum,v 1.19 2001/04/15 01:18:07 itojun Exp $
 
-SHA1 (patch-aa) = 746a7f53d8f9064650b0488957e433a98296039e
-SHA1 (patch-ab) = a71c822ddb8791cf5b548144f41f12e78134e1de
-SHA1 (patch-ac) = 1c0757df6977f85d4e21998de6a870a8dc9a4f03
-SHA1 (patch-ad) = 2dc1bb8f3511c80f724e76de093a9445a4e9f2d1
-SHA1 (patch-ae) = 620cd3cee9a0dde54353e2f18dc06a1144a9b2e6
-SHA1 (patch-af) = a4e36341b1b7fe00887d528c9fce0b41da07092c
+SHA1 (patch-aa) = 9458931dc99f8775574b26ed8ca5f530600d7506
+SHA1 (patch-ab) = 40d3643d4f82c9761cc4e5abfee90ccd9c65536b
+SHA1 (patch-ac) = bfb83dbd4209879f58b95f0328d68bb8e56ac119
+SHA1 (patch-ad) = 93408922c222d5fe6a14cdd8a00060230a9195b9
+SHA1 (patch-ae) = 5e3efecc7ac7ffed40278b3c29dd1152990f3b33
+SHA1 (patch-af) = db9e5d94b1b1f4cd7e5c9f25b36772e90e2987fe
diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa
index 268d852e8e8..8c08fd76006 100644
--- a/mail/sendmail/patches/patch-aa
+++ b/mail/sendmail/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.13 2001/04/13 05:07:51 itojun Exp $
+$NetBSD: patch-aa,v 1.14 2001/04/15 01:18:07 itojun Exp $
 
---- devtools/OS/NetBSD.orig	Fri Jan 26 04:03:44 2001
-+++ devtools/OS/NetBSD	Fri Mar 16 09:22:18 2001
-@@ -2,13 +2,15 @@
- define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
+--- 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')
 -define(`confUBINGRP', `wheel')
diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab
index 5ab9093fbcc..53fe81aa26c 100644
--- a/mail/sendmail/patches/patch-ab
+++ b/mail/sendmail/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.10 2001/04/13 05:07:51 itojun Exp $
+$NetBSD: patch-ab,v 1.11 2001/04/15 01:18:07 itojun Exp $
 
---- devtools/OS/SunOS.5.6.orig	Mon Dec 18 01:17:51 2000
-+++ devtools/OS/SunOS.5.6	Fri Mar 16 09:22:38 2001
-@@ -7,6 +7,7 @@
+--- 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(`confSM_OS_HEADER', `sm_os_sunos')
  define(`confLIBS', `-lsocket -lnsl -lkstat')
 +define(`confLDOPTS', `${LDFLAGS}')
  define(`confMTLDOPTS', `-lpthread')
diff --git a/mail/sendmail/patches/patch-ac b/mail/sendmail/patches/patch-ac
index b398d0b4c47..bf773d799db 100644
--- a/mail/sendmail/patches/patch-ac
+++ b/mail/sendmail/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2001/04/13 05:07:51 itojun Exp $
+$NetBSD: patch-ac,v 1.5 2001/04/15 01:18:07 itojun Exp $
 
---- devtools/OS/SunOS.5.7.orig	Mon Dec 18 01:17:51 2000
-+++ devtools/OS/SunOS.5.7	Fri Mar 16 09:22:42 2001
-@@ -7,6 +7,7 @@
+--- 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(`confSM_OS_HEADER', `sm_os_sunos')
  define(`confLIBS', `-lsocket -lnsl')
 +define(`confLDOPTS', `${LDFLAGS}')
  define(`confMTLDOPTS', `-lpthread')
diff --git a/mail/sendmail/patches/patch-ad b/mail/sendmail/patches/patch-ad
index 8eb9b3b81af..1622af7a7d4 100644
--- a/mail/sendmail/patches/patch-ad
+++ b/mail/sendmail/patches/patch-ad
@@ -1,18 +1,12 @@
-$NetBSD: patch-ad,v 1.5 2001/04/13 05:07:52 itojun Exp $
+$NetBSD: patch-ad,v 1.6 2001/04/15 01:18:07 itojun Exp $
 
---- devtools/OS/SunOS.5.8.orig	Mon Dec 18 01:17:51 2000
-+++ devtools/OS/SunOS.5.8	Fri Mar 16 09:23:29 2001
-@@ -2,10 +2,11 @@
- define(`confCC', `gcc')
- define(`confLDOPTS_SO', `-G')
- define(`confBEFORE', `sysexits.h')
--define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
+--- devtools/OS/SunOS.5.8.orig	Tue Oct 10 19:21:59 2000
++++ devtools/OS/SunOS.5.8	Tue Oct 10 19:23:59 2000
+@@ -4,4 +4,6 @@
+ define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
 +define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
  define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6')
- define(`confSM_OS_HEADER', `sm_os_sunos')
 -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
index 0a740195d29..19cd52da724 100644
--- a/mail/sendmail/patches/patch-ae
+++ b/mail/sendmail/patches/patch-ae
@@ -1,18 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2001/04/13 05:07:52 itojun Exp $
+$NetBSD: patch-ae,v 1.4 2001/04/15 01:18:07 itojun Exp $
 
---- devtools/OS/SunOS.5.9.orig	Mon Dec 18 01:17:51 2000
-+++ devtools/OS/SunOS.5.9	Fri Mar 16 09:23:59 2001
-@@ -2,10 +2,11 @@
- define(`confCC', `gcc')
- define(`confLDOPTS_SO', `-G')
+--- devtools/OS/SunOS.5.9.orig	Tue Oct 10 19:25:30 2000
++++ devtools/OS/SunOS.5.9	Tue Oct 10 19:26:27 2000
+@@ -3,5 +3,6 @@
  define(`confBEFORE', `sysexits.h')
 -define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
 +define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
  define(`confENVDEF', `-DSOLARIS=20900 -DNETINET6')
- define(`confSM_OS_HEADER', `sm_os_sunos')
 -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-af b/mail/sendmail/patches/patch-af
index fb521f19322..27202a7dd79 100644
--- a/mail/sendmail/patches/patch-af
+++ b/mail/sendmail/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2001/04/13 05:07:52 itojun Exp $
+$NetBSD: patch-af,v 1.9 2001/04/15 01:18:07 itojun Exp $
 
---- sendmail/conf.c.orig	Thu Mar  8 09:07:50 2001
-+++ sendmail/conf.c	Fri Mar 16 09:24:10 2001
-@@ -4237,7 +4237,8 @@
+--- sendmail/conf.c.orig	Wed Feb 28 05:48:21 2001
++++ sendmail/conf.c	Wed Feb 28 12:48:30 2001
+@@ -4546,7 +4546,8 @@
  
  #if NETINET6
  	if (type == AF_INET6 &&
diff --git a/mail/sendmail/pkg/PLIST.common b/mail/sendmail/pkg/PLIST.common
index a2903efe4ec..a6b0a8b633f 100644
--- a/mail/sendmail/pkg/PLIST.common
+++ b/mail/sendmail/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2001/04/13 05:07:52 itojun Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2001/04/15 01:18:07 itojun Exp $
 bin/newaliases
 bin/mailq
 bin/hoststat
@@ -62,38 +62,30 @@ share/sendmail/feature/accept_unresolvable_domains.m4
 share/sendmail/feature/access_db.m4
 share/sendmail/feature/allmasquerade.m4
 share/sendmail/feature/always_add_domain.m4
-share/sendmail/feature/authinfo.m4
 share/sendmail/feature/bestmx_is_local.m4
 share/sendmail/feature/bitdomain.m4
 share/sendmail/feature/blacklist_recipients.m4
-share/sendmail/feature/compat_check.m4
 share/sendmail/feature/delay_checks.m4
 share/sendmail/feature/dnsbl.m4
 share/sendmail/feature/domaintable.m4
-share/sendmail/feature/enhdnsbl.m4
 share/sendmail/feature/generics_entire_domain.m4
 share/sendmail/feature/genericstable.m4
 share/sendmail/feature/ldap_routing.m4
 share/sendmail/feature/limited_masquerade.m4
 share/sendmail/feature/local_lmtp.m4
-share/sendmail/feature/local_no_masquerade.m4
 share/sendmail/feature/local_procmail.m4
-share/sendmail/feature/lookupdotdomain.m4
 share/sendmail/feature/loose_relay_check.m4
 share/sendmail/feature/mailertable.m4
 share/sendmail/feature/masquerade_entire_domain.m4
 share/sendmail/feature/masquerade_envelope.m4
-share/sendmail/feature/msp.m4 
 share/sendmail/feature/no_default_msa.m4
 share/sendmail/feature/nocanonify.m4
 share/sendmail/feature/nodns.m4
 share/sendmail/feature/notsticky.m4
 share/sendmail/feature/nouucp.m4
 share/sendmail/feature/nullclient.m4
-share/sendmail/feature/preserve_local_plus_detail.m4 
-share/sendmail/feature/preserve_luser_host.m4 
 share/sendmail/feature/promiscuous_relay.m4
-share/sendmail/feature/queuegroup.m4 
+share/sendmail/feature/rbl.m4
 share/sendmail/feature/redirect.m4
 share/sendmail/feature/relay_based_on_MX.m4
 share/sendmail/feature/relay_entire_domain.m4
@@ -123,6 +115,7 @@ share/sendmail/mailer/qpage.m4
 share/sendmail/mailer/smtp.m4
 share/sendmail/mailer/usenet.m4
 share/sendmail/mailer/uucp.m4
+share/sendmail/ostype/aix2.m4
 share/sendmail/ostype/aix3.m4
 share/sendmail/ostype/aix4.m4
 share/sendmail/ostype/aix5.m4
@@ -138,7 +131,6 @@ share/sendmail/ostype/darwin.m4
 share/sendmail/ostype/dgux.m4
 share/sendmail/ostype/domainos.m4
 share/sendmail/ostype/dynix3.2.m4
-share/sendmail/ostype/freebsd4.m4
 share/sendmail/ostype/gnu.m4
 share/sendmail/ostype/hpux10.m4
 share/sendmail/ostype/hpux11.m4
@@ -171,7 +163,6 @@ share/sendmail/ostype/ultrix4.m4
 share/sendmail/ostype/unixware7.m4
 share/sendmail/ostype/unknown.m4
 share/sendmail/ostype/uxpds.m4
-share/sendmail/sendmail.schema
 share/sendmail/sh/makeinfo.sh
 share/sendmail/siteconfig/uucp.cogsci.m4
 share/sendmail/siteconfig/uucp.old.arpa.m4