Merge from pkgsrc-current to buildlink2 branch.

author: jlam <jlam@pkgsrc.org> 2002-06-23 18:47:13 +0000
committer: jlam <jlam@pkgsrc.org> 2002-06-23 18:47:13 +0000
commit: 759f695a1894bbbad984096b1fc5a2b518204b48 (patch)
tree: d083c952704be7ad44edb76d627f92c7fd938f5e /mail
parent: e43bd7cdef06b9274e767e76147d46a933f396af (diff)
download: pkgsrc-759f695a1894bbbad984096b1fc5a2b518204b48.tar.gz
159 files changed, 1848 insertions, 2334 deletions
diff --git a/mail/Makefile b/mail/Makefile
index 64a18dd01ec..6e81049d3e2 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2002/05/04 01:16:11 jtb Exp $
+# $NetBSD: Makefile,v 1.125.2.1 2002/06/23 18:50:54 jlam Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -17,6 +17,7 @@ SUBDIR+=	cucipop
 SUBDIR+=	cue
 SUBDIR+=	cyrus-imapd
 SUBDIR+=	deliver
+SUBDIR+=	demime
 SUBDIR+=	distribute
 SUBDIR+=	dot-forward
 SUBDIR+=	drac
@@ -39,10 +40,12 @@ SUBDIR+=	imap-uw
 SUBDIR+=	imap-uw-utils
 SUBDIR+=	imapfilter
 SUBDIR+=	imp
+SUBDIR+=	ja-mh
 SUBDIR+=	mailagent
 SUBDIR+=	mailcrypt
 SUBDIR+=	maildrop
 SUBDIR+=	mailserv
+SUBDIR+=	mailsync
 SUBDIR+=	mailwrapper
 SUBDIR+=	majordomo
 SUBDIR+=	mdfrm
@@ -52,7 +55,6 @@ SUBDIR+=	mew-xemacs
 SUBDIR+=	mhonarc
 SUBDIR+=	mush
 SUBDIR+=	mutt
-SUBDIR+=	mutt-devel
 SUBDIR+=	newmail
 SUBDIR+=	nmh
 SUBDIR+=	nullmailer
@@ -67,6 +69,7 @@ SUBDIR+=	p5-Mail-ListDetector
 SUBDIR+=	p5-Mail-Sendmail
 SUBDIR+=	p5-Mail-SpamAssassin
 SUBDIR+=	p5-MailTools
+SUBDIR+=	p5-Sendmail-AccessDB
 SUBDIR+=	p5-razor-agents
 SUBDIR+=	php4-imap
 SUBDIR+=	pine
@@ -88,13 +91,14 @@ SUBDIR+=	queue_repair
 SUBDIR+=	rblcheck
 SUBDIR+=	ruby-tmail
 SUBDIR+=	sendmail
-SUBDIR+=	sendmail-current
 SUBDIR+=	sendmail88
 SUBDIR+=	smtpfeed
+SUBDIR+=	solid-pop3d
 SUBDIR+=	spruce
 SUBDIR+=	squirrelmail
 SUBDIR+=	sqwebmail
 SUBDIR+=	sylpheed
+SUBDIR+=	sylpheed-claws
 SUBDIR+=	teapop
 SUBDIR+=	tmda
 SUBDIR+=	tnef
diff --git a/mail/courier-auth/files/authdaemond.sh b/mail/courier-auth/files/authdaemond.sh
index f5e0798b431..fdf2696182c 100644
--- a/mail/courier-auth/files/authdaemond.sh
+++ b/mail/courier-auth/files/authdaemond.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: authdaemond.sh,v 1.3 2002/02/05 06:04:37 jlam Exp $
+# $NetBSD: authdaemond.sh,v 1.3.2.1 2002/06/23 18:50:56 jlam Exp $
 #
 # Courier user authentication daemon
 #
@@ -48,7 +48,7 @@ courier_doit()
         stop)   echo "Stopping ${name}." ;;
         esac
 
-        @SETENV@ - ${daemon} ${action}
+        @SETENV@ -i ${daemon} ${action}
 }
 
 if [ -f /etc/rc.subr ]
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index ff0ec2c53c7..d8482197a00 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/02/03 13:38:38 jlam Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2002/06/23 18:50:56 jlam Exp $
 
 DISTNAME=	courier-imap-1.4.2
 PKGREVISION=	1
@@ -16,7 +16,7 @@ REPLACE_PERL=		sysconftool
 
 CONFIGURE_ENV+=		OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
 
-.if defined(STRIPFLAG) && !empty(STRIPFLAG:M-s)
+.if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
 INSTALL_TARGET=         install-strip
 .endif
 
diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
index 250ff0d431e..8c50ea20f0b 100644
--- a/mail/courier-imap/patches/patch-ae
+++ b/mail/courier-imap/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2002/01/22 22:08:54 jlam Exp $
+$NetBSD: patch-ae,v 1.2.2.1 2002/06/23 18:50:57 jlam Exp $
 
---- imapd-ssl.rc.in.orig	Thu Mar 15 22:36:47 2001
-+++ imapd-ssl.rc.in
-@@ -21,11 +21,6 @@
+--- imapd-ssl.rc.in.orig	Fri Mar 16 04:36:47 2001
++++ imapd-ssl.rc.in	Sat Jun 22 16:58:09 2002
+@@ -21,13 +21,8 @@
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -12,8 +12,11 @@ $NetBSD: patch-ae,v 1.2 2002/01/22 22:08:54 jlam Exp $
 -	fi
 -
  	ulimit -d $IMAP_ULIMITD
- 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
+-	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
++	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/imapd ; \
  		. @sysconfdir@/imapd-ssl ; \
+ 		IMAP_TLS=1; export IMAP_TLS; \
+ 		`sed -n '/^#/d;/=/p' <@sysconfdir@/imapd | \
 @@ -45,10 +40,6 @@
  	;;
  stop)
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
index cef07ec990f..d9267a51a5c 100644
--- a/mail/courier-imap/patches/patch-af
+++ b/mail/courier-imap/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2002/01/22 22:08:54 jlam Exp $
+$NetBSD: patch-af,v 1.2.2.1 2002/06/23 18:50:57 jlam Exp $
 
---- imapd.rc.in.orig	Sun Jul 29 20:02:32 2001
-+++ imapd.rc.in
-@@ -21,11 +21,6 @@
+--- imapd.rc.in.orig	Mon Jul 30 02:02:32 2001
++++ imapd.rc.in	Sat Jun 22 16:58:20 2002
+@@ -21,13 +21,8 @@
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -12,8 +12,11 @@ $NetBSD: patch-af,v 1.2 2002/01/22 22:08:54 jlam Exp $
 -	fi
 -
  	ulimit -d $IMAP_ULIMITD
- 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
+-	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
++	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/imapd ; \
  				. @sysconfdir@/imapd-ssl ; \
+ 		IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \
+ 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
 @@ -45,10 +40,6 @@
  	;;
  stop)
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
index f51c4e66cf7..6511a42e8f4 100644
--- a/mail/courier-imap/patches/patch-ag
+++ b/mail/courier-imap/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2002/01/22 22:08:55 jlam Exp $
+$NetBSD: patch-ag,v 1.2.2.1 2002/06/23 18:50:58 jlam Exp $
 
---- pop3d-ssl.rc.in.orig	Sun Jan 28 13:52:49 2001
-+++ pop3d-ssl.rc.in
-@@ -21,11 +21,6 @@
+--- pop3d-ssl.rc.in.orig	Sun Jan 28 19:52:49 2001
++++ pop3d-ssl.rc.in	Sat Jun 22 16:58:46 2002
+@@ -21,12 +21,7 @@
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -11,9 +11,11 @@ $NetBSD: patch-ag,v 1.2 2002/01/22 22:08:55 jlam Exp $
 -		@SETENV@ - ${libexecdir}/authlib/authdaemond start
 -	fi
 -
- 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
+-	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
++	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/pop3d ; \
  		. @sysconfdir@/pop3d-ssl ; \
  		POP3_TLS=1; export POP3_TLS; \
+ 		`sed -n '/^#/d;/=/p' <@sysconfdir@/pop3d | \
 @@ -44,10 +39,6 @@
  	;;
  stop)
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
index 5f4b342c810..132b3e54c74 100644
--- a/mail/courier-imap/patches/patch-ah
+++ b/mail/courier-imap/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2002/01/22 22:08:55 jlam Exp $
+$NetBSD: patch-ah,v 1.1.2.1 2002/06/23 18:50:58 jlam Exp $
 
---- pop3d.rc.in.orig	Sun Jul 29 20:02:32 2001
-+++ pop3d.rc.in
-@@ -21,11 +21,6 @@
+--- pop3d.rc.in.orig	Mon Jul 30 02:02:32 2001
++++ pop3d.rc.in	Sat Jun 22 16:58:36 2002
+@@ -21,12 +21,7 @@
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -11,9 +11,11 @@ $NetBSD: patch-ah,v 1.1 2002/01/22 22:08:55 jlam Exp $
 -		@SETENV@ - ${libexecdir}/authlib/authdaemond start
 -	fi
 -
- 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
+-	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
++	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/pop3d ; \
  				. @sysconfdir@/pop3d-ssl ; \
  		POP3_STARTTLS=$POP3DSTARTTLS ; export POP3_STARTTLS ; \
+ 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
 @@ -44,10 +39,6 @@
  	;;
  stop)
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index f33976932cc..514bbe7eb78 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/02/03 13:38:39 jlam Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:51:00 jlam Exp $
 
 PKGNAME=	courier-maildirmake-${BASE_VERS}
 PKGREVISION?=	1
@@ -21,7 +21,7 @@ WRKSRC_SUBDIRS+=	maildir
 EXTRACT_ELEMENTS=	${WRKSRC_FILES:S/^/${DISTNAME}\//}
 EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
 
-.if defined(STRIPFLAG) && !empty(STRIPFLAG:M-s)
+.if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
 INSTALL_TARGET=		install-strip
 .endif
 
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index 91774b1f8f1..cdfdd662350 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/05 23:44:40 wiz Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:51:01 jlam Exp $
 
 DISTNAME=	cue-snap-20010917
 PKGNAME=	cue-20010917
@@ -9,24 +9,21 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/cue/snap/
 MAINTAINER=	packages@netbsd.org
 COMMENT=	mh-e like mail user agent
 
+GNU_CONFIGURE=	yes
+
 .include "../../mk/bsd.prefs.mk"
+
 BUILD_DEFS+=	USE_INET6
 
-GNU_CONFIGURE=	yes
-USE_SSL=	yes
-.if exists(/usr/include/openssl/rsa.h)
-CONFIGURE_ARGS+=--with-openssl=/usr
-.else
-CONFIGURE_ARGS+=--with-openssl=${LOCALBASE}
-.endif
 .if ${USE_INET6} == "YES"
-CONFIGURE_ARGS+=--enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+=--disable-ipv6
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
+
 # require Canna, for now, cue assumes Japanese encoding anyways
-DEPENDS+=	Canna-lib>=3.5.2:../../japanese/canna-lib
-CONFIGURE_ARGS+=--with-canna=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-canna=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cue ${PREFIX}/bin
@@ -36,4 +33,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cue.hlp  ${PREFIX}/share/doc/cue
 	${INSTALL_DATA} ${WRKSRC}/cue.html ${PREFIX}/share/doc/cue
 
+.include "../../inputmethod/canna-lib/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index b4446aaf505..43a1f5a1423 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/12/06 09:50:13 martti Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2002/06/23 18:51:02 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 PKGREVISION=		1
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+=	--with-com_err=yes
 .endif
 
 .if defined(KERBEROS) && ${KERBEROS} == 4
-USE_KERBEROS=		# defined
+PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=	--with-auth=krb
 .else
 CONFIGURE_ARGS+=	--with-auth=unix
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
new file mode 100644
index 00000000000..c59a256fa0e
--- /dev/null
+++ b/mail/cyrus/Makefile
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.14.2.1 2002/06/23 18:51:02 jlam Exp $
+
+DISTNAME=		cyrus-imapd-v1.5.14
+PKGNAME=		cyrus-1.5.14
+CATEGORIES=		mail
+MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+
+MAINTAINER=		kim@tac.nyc.ny.us
+HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
+
+DEPENDS+=		tcl-8.0.5:../../lang/tcl80
+
+GNU_CONFIGURE=		yes
+
+BROKEN=			Unfinished package.
+
+# XXX This package is not ready for general use!
+# XXX I've imported it because my work on it has
+# XXX been stalled for a while, and someone might
+# XXX benefit from what is here already.
+# XXX
+# XXX Eventually I will clean this up.
+# XXX
+# XXX + Kim
+
+CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
+CONFIGURE_ARGS+=	--with-statedir=/var/run
+CONFIGURE_ARGS+=	--includedir=${LOCALBASE}/include/tcl8.0
+CONFIGURE_ARGS+=	--enable-netscapehack
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(KERBEROS)
+USE_KERBEROS=		yes
+CONFIGURE_ARGS+=	--with-login=krb
+.endif
+
+# Deliver must be executable by all on machines with local
+# users sending to cyrus mailboxes.
+
+post-install:
+	@${CHMOD} a+rx ${PREFIX}/cyrus/bin/deliver
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/demime/DESCR b/mail/demime/DESCR
new file mode 100644
index 00000000000..af99c962bb7
--- /dev/null
+++ b/mail/demime/DESCR
@@ -0,0 +1,9 @@
+A perl script to flatten some mime types to make mailing lists and
+archives more readable. This tool is designed to run with the
+Majordomo list manager, but can most likely be adapted to different
+list software.
+
+WWW: http://scifi.squawk.com/demime.html
+
+- Pete
+petef@databits.net
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
new file mode 100644
index 00000000000..0d7cf1c457f
--- /dev/null
+++ b/mail/demime/Makefile
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:51:04 jlam Exp $
+# FreeBSD Id: ports/mail/demime/Makefile,v 1.4 2002/03/26 08:18:20 petef Exp
+
+DISTNAME=	demime-0.99c.7
+PKGNAME=	demime-0.99.3.7
+CATEGORIES=	mail textproc
+MASTER_SITES=	http://scifi.squawk.com/
+DISTFILES=	demime.stable demime_junkmail.cf
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://scifi.squawk.com/demime.html
+COMMENT=	Tool to scrub mime from mailing lists
+
+DEPENDS+=       p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
+DEPENDS+=       p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=       p5-HTML-Format-[0-9]*:../../www/p5-HTML-Format
+DEPENDS+=       p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
+
+DIST_SUBDIR=	${PKGNAME}
+NO_BUILD=	YES
+USE_BUILDLINK_ONLY=     YES
+USE_PERL5=	YES
+
+POD2MAN?=	${PREFIX}/bin/pod2man
+
+do-extract:
+	@${MKDIR} ${WRKSRC}
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/demime.stable ${WRKSRC}/demime.stable
+
+post-patch:
+	${SED} -e 's|/usr/lib/majordomo/demime_junkmail.cf|${PREFIX}/etc/demime_junkmail.cf|g' \
+	       -e 's|/usr/bin/perl|${PREFIX}/bin/perl|g' \
+	       ${WRKSRC}/demime.stable >${WRKSRC}/demime
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/demime ${PREFIX}/bin/demime
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/demime_junkmail.cf \
+	  ${PREFIX}/etc
+	${POD2MAN} ${WRKSRC}/demime > ${WRKSRC}/demime.1
+	${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/man/man1/demime.1
+
+.include "../../lang/perl5/buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/demime/PLIST b/mail/demime/PLIST
new file mode 100644
index 00000000000..dcd1d0c44dd
--- /dev/null
+++ b/mail/demime/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:51:04 jlam Exp $
+bin/demime
+etc/demime_junkmail.cf
+man/man1/demime.1
diff --git a/mail/demime/distinfo b/mail/demime/distinfo
new file mode 100644
index 00000000000..be621ff320d
--- /dev/null
+++ b/mail/demime/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:51:05 jlam Exp $
+
+SHA1 (demime-0.99.3.7/demime.stable) = dab8de056c90a6796dfbf043fcb32a9a364b74e1
+Size (demime-0.99.3.7/demime.stable) = 85271 bytes
+SHA1 (demime-0.99.3.7/demime_junkmail.cf) = 640b9d6f8605a50a807da56c38a3b2f470dd07c5
+Size (demime-0.99.3.7/demime_junkmail.cf) = 6899 bytes
+SHA1 (patch-aa) = fd399750d676983f6c843e92dfec654443cb33d3
diff --git a/mail/demime/patches/patch-aa b/mail/demime/patches/patch-aa
new file mode 100644
index 00000000000..afda33eb49f
--- /dev/null
+++ b/mail/demime/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1.50.2 2002/06/23 18:51:06 jlam Exp $
+
+--- demime.stable.orig	Wed Apr 17 17:08:40 2002
++++ demime.stable
+@@ -21,7 +21,7 @@
+ 
+ # Following controls whether only 7 bit output
+ # from message body sections should be done.
+-$::SEVEN_BIT_ONLY = 1;
++$::SEVEN_BIT_ONLY = 0;
+ 
+ # Following configuration variable controls whether a message/rfc822
+ # in a multipart/mixed main segment is rendered or elided.
diff --git a/mail/drac/buildlink.mk b/mail/drac/buildlink.mk
new file mode 100644
index 00000000000..9906083f84c
--- /dev/null
+++ b/mail/drac/buildlink.mk
@@ -0,0 +1,37 @@
+# $NetBSD: buildlink.mk,v 1.1.2.2 2002/06/23 18:51:07 jlam Exp $
+#
+# This Makefile fragment is included by packages that use drac.
+#
+# This file was created automatically using createbuildlink 1.5.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.drac to the dependency pattern
+#     for the version of drac desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(DRAC_BUILDLINK_MK)
+DRAC_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.drac?=		drac>=1.10
+DEPENDS+=	${BUILDLINK_DEPENDS.drac}:../../mail/drac
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.drac=drac
+BUILDLINK_PREFIX.drac_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.drac+=	include/drac.h
+BUILDLINK_FILES.drac+=	lib/libdrac.*
+
+
+BUILDLINK_TARGETS.drac=	drac-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.drac}
+
+pre-configure: ${BUILDLINK_TARGETS}
+drac-buildlink: _BUILDLINK_USE
+
+.endif	# DRAC_BUILDLINK_MK
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 37d0ba47840..82ef6b8e120 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/09/27 23:18:20 jlam Exp $
+# $NetBSD: Makefile,v 1.20.2.1 2002/06/23 18:51:07 jlam Exp $
 
 DISTNAME=		elm2.5.5
 PKGNAME=		elm-2.5.5
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.instinct.org/elm/
 COMMENT=		ELM Mail User Agent (without ME extensions)
 
-CONFLICTS+=		mm-[0-9]*
+CONFLICTS+=		mm-[0-9]* metamail-[0-9]*
 CONFLICTS+=		elm-me-[0-9]*
 
 HAS_CONFIGURE=		YES
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 815ace7164f..9f49c8765fe 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/11 13:21:07 ad Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:51:13 jlam Exp $
 
-DISTNAME=	exim-html-3.20
+DISTNAME=	exim-html-4.00
 CATEGORIES=	mail net
-MASTER_SITES=	ftp://ftp.exim.org/pub/exim/ \
-		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
-		ftp://ftp.esat.net/pub/networking/mail/mta/exim/
+MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
+		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
+		ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
+EXTRACT_SUFX=  	.tar.bz2
 
 MAINTAINER=	ad@netbsd.org
 HOMEPAGE=	http://www.exim.org/
@@ -12,7 +13,6 @@ COMMENT=	HTML documentation for the Exim mail transfer agent
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/exim
-	${RM} ${WRKDIR}/exim-html-3.20/doc/html/spec
-	${CP} -R ${WRKDIR}/exim-html-3.20/doc/html/* ${PREFIX}/share/doc/html/exim
+	${CP} -R ${WRKDIR}/${DISTNAME}/doc/html/* ${PREFIX}/share/doc/html/exim
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
index 409d52dc263..f491e9262d6 100644
--- a/mail/exim-html/PLIST
+++ b/mail/exim-html/PLIST
@@ -1,5 +1,65 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:58 zuntum Exp $
-share/doc/html/exim/drivers.gif
+@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:51:14 jlam Exp $
+share/doc/html/exim/C002.txt
+share/doc/html/exim/C006.txt
+share/doc/html/exim/C022.txt
+share/doc/html/exim/C037.txt
+share/doc/html/exim/F001.txt
+share/doc/html/exim/F002.txt
+share/doc/html/exim/F003.txt
+share/doc/html/exim/F004.txt
+share/doc/html/exim/FAQ-KWIC_A.html
+share/doc/html/exim/FAQ-KWIC_B.html
+share/doc/html/exim/FAQ-KWIC_C.html
+share/doc/html/exim/FAQ-KWIC_D.html
+share/doc/html/exim/FAQ-KWIC_E.html
+share/doc/html/exim/FAQ-KWIC_F.html
+share/doc/html/exim/FAQ-KWIC_G.html
+share/doc/html/exim/FAQ-KWIC_H.html
+share/doc/html/exim/FAQ-KWIC_I.html
+share/doc/html/exim/FAQ-KWIC_K.html
+share/doc/html/exim/FAQ-KWIC_L.html
+share/doc/html/exim/FAQ-KWIC_M.html
+share/doc/html/exim/FAQ-KWIC_N.html
+share/doc/html/exim/FAQ-KWIC_O.html
+share/doc/html/exim/FAQ-KWIC_P.html
+share/doc/html/exim/FAQ-KWIC_Q.html
+share/doc/html/exim/FAQ-KWIC_R.html
+share/doc/html/exim/FAQ-KWIC_S.html
+share/doc/html/exim/FAQ-KWIC_T.html
+share/doc/html/exim/FAQ-KWIC_U.html
+share/doc/html/exim/FAQ-KWIC_V.html
+share/doc/html/exim/FAQ-KWIC_W.html
+share/doc/html/exim/FAQ-KWIC_X.html
+share/doc/html/exim/FAQ-KWIC_Y.html
+share/doc/html/exim/FAQ-KWIC_Z.html
+share/doc/html/exim/FAQ.html
+share/doc/html/exim/FAQ_0.html
+share/doc/html/exim/FAQ_1.html
+share/doc/html/exim/FAQ_10.html
+share/doc/html/exim/FAQ_11.html
+share/doc/html/exim/FAQ_12.html
+share/doc/html/exim/FAQ_13.html
+share/doc/html/exim/FAQ_14.html
+share/doc/html/exim/FAQ_15.html
+share/doc/html/exim/FAQ_16.html
+share/doc/html/exim/FAQ_17.html
+share/doc/html/exim/FAQ_18.html
+share/doc/html/exim/FAQ_19.html
+share/doc/html/exim/FAQ_2.html
+share/doc/html/exim/FAQ_20.html
+share/doc/html/exim/FAQ_21.html
+share/doc/html/exim/FAQ_22.html
+share/doc/html/exim/FAQ_23.html
+share/doc/html/exim/FAQ_24.html
+share/doc/html/exim/FAQ_25.html
+share/doc/html/exim/FAQ_26.html
+share/doc/html/exim/FAQ_3.html
+share/doc/html/exim/FAQ_4.html
+share/doc/html/exim/FAQ_5.html
+share/doc/html/exim/FAQ_6.html
+share/doc/html/exim/FAQ_7.html
+share/doc/html/exim/FAQ_8.html
+share/doc/html/exim/FAQ_9.html
 share/doc/html/exim/filter.html
 share/doc/html/exim/filter_1.html
 share/doc/html/exim/filter_10.html
@@ -27,8 +87,6 @@ share/doc/html/exim/filter_3.html
 share/doc/html/exim/filter_30.html
 share/doc/html/exim/filter_31.html
 share/doc/html/exim/filter_32.html
-share/doc/html/exim/filter_33.html
-share/doc/html/exim/filter_34.html
 share/doc/html/exim/filter_4.html
 share/doc/html/exim/filter_5.html
 share/doc/html/exim/filter_6.html
@@ -36,8 +94,9 @@ share/doc/html/exim/filter_7.html
 share/doc/html/exim/filter_8.html
 share/doc/html/exim/filter_9.html
 share/doc/html/exim/filter_toc.html
-share/doc/html/exim/oview.html
+share/doc/html/exim/index.html
 share/doc/html/exim/relaying.gif
+share/doc/html/exim/routing.gif
 share/doc/html/exim/spec.html
 share/doc/html/exim/spec_1.html
 share/doc/html/exim/spec_10.html
@@ -84,22 +143,12 @@ share/doc/html/exim/spec_47.html
 share/doc/html/exim/spec_48.html
 share/doc/html/exim/spec_49.html
 share/doc/html/exim/spec_5.html
-share/doc/html/exim/spec_50.html
-share/doc/html/exim/spec_51.html
-share/doc/html/exim/spec_52.html
-share/doc/html/exim/spec_53.html
-share/doc/html/exim/spec_54.html
-share/doc/html/exim/spec_55.html
-share/doc/html/exim/spec_56.html
-share/doc/html/exim/spec_57.html
-share/doc/html/exim/spec_58.html
-share/doc/html/exim/spec_59.html
 share/doc/html/exim/spec_6.html
 share/doc/html/exim/spec_7.html
 share/doc/html/exim/spec_8.html
 share/doc/html/exim/spec_9.html
 share/doc/html/exim/spec_cindex.html
-share/doc/html/exim/spec_findex.html
+share/doc/html/exim/spec_oindex.html
 share/doc/html/exim/spec_toc.html
 share/doc/html/exim/spectop.html
 @dirrm share/doc/html/exim
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
index c062a4faa5e..620c75ac0dc 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/07/11 13:23:08 ad Exp $
+$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:51:14 jlam Exp $
 
-SHA1 (exim-html-3.20.tar.gz) = f830eaa2b9bd8cc183b66fa1627ce14b15f51ccf
-Size (exim-html-3.20.tar.gz) = 699383 bytes
+SHA1 (exim-html-4.00.tar.bz2) = cce4966a9f00cce65aeae48f501f3b9921396f77
+Size (exim-html-4.00.tar.bz2) = 361768 bytes
 SHA1 (patch-aa) = 24370521bf1c1b8c2d7e7ade6490b0f61a58fa52
diff --git a/mail/exim/DESCR b/mail/exim/DESCR
index b6ed0bd5a70..daed08a81e5 100644
--- a/mail/exim/DESCR
+++ b/mail/exim/DESCR
@@ -5,3 +5,14 @@ Smail 3, but its facilities are more extensive, and in particular it has
 options for verifying incoming sender and recipient addresses, for refusing
 mail from specified hosts, networks, or senders, and for controlling mail
 relaying.
+
+This build of exim has the following non-default features enabled:
+
+TRANSPORT_LMTP          SUPPORT_MAILDIR         SUPPORT_MAILSTORE
+SUPPORT_MBX             AUTH_CRAM_MD5           AUTH_PLAINTEXT
+AUTH_SPA                SUPPORT_TLS             USE_TCP_WRAPPERS
+HAVE_IPV6
+
+The following default feature is disabled:
+
+EXIM_MONITOR
diff --git a/mail/exim/MESSAGE b/mail/exim/MESSAGE
index 42135417293..4a5208edc05 100644
--- a/mail/exim/MESSAGE
+++ b/mail/exim/MESSAGE
@@ -1,15 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 00:59:57 zuntum Exp $
+$NetBSD: MESSAGE,v 1.1.2.1 2002/06/23 18:51:08 jlam Exp $
 
 To use exim, you will need to perform the following steps manually; it is
 inappropriate for this package to make the changes for you.
 
-1. Add a `mail' user: mail:*:8:6::0:0:Mail subsystem:/var/mail:/sbin/nologin
-2. Set the correct ownership and permissions on the exim log directory:
+1. Set the correct ownership and permissions on the exim log directory:
    chown mail:mail /var/log/exim && chmod 750 /var/log/exim
-3. Read the documentation. Edit ${PREFIX}/etc/exim/configure to taste. Note
-   that depending on the version of NetBSD, the `aliases' file may be in
-   /etc/mail and not /etc, as it was previously.
+3. Read the documentation. Edit ${PREFIX}/etc/exim/configure to taste.
 4. Back-up /etc/mailer.conf to /etc/mailer.conf.sendmail.
    Copy ${PREFIX}/etc/exim/mailer.conf.exim to /etc/mailer.conf.
 5. Set 'sendmail=NO', 'exim=YES' and exim_flags to some sane value in
@@ -18,4 +15,10 @@ inappropriate for this package to make the changes for you.
 6. Configuring log rotation is dependant on personal taste and the version of
    NetBSD in use. See weekly.conf(5), newsyslog(8), exicyclog and eximstats.
 
+Also note:
+
+1. Try `pkg_info exim` to see which features are enabled in this build.
+2. Consider enabling SSL (STARTTLS) for receiving mail in your config.
+   This build automatically uses SSL when sending mail.
+
 ===========================================================================
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 10be2891818..0a19e575a0c 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.27 2001/12/19 17:11:02 ad Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2002/06/23 18:51:09 jlam Exp $
 
-DISTNAME=	exim-3.34
+DISTNAME=	exim-4.05
 CATEGORIES=	mail net
-MASTER_SITES=	ftp://ftp.exim.org/pub/exim/ \
-		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
-		ftp://ftp.esat.net/pub/networking/mail/mta/exim/
+MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
+		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
+		ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ad@netbsd.org
 HOMEPAGE=	http://www.exim.org/
 COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
+USE_SSL=	yes
 USE_PERL5=	yes
+IS_INTERACTIVE=	yes
 
 pre-patch:
 	${MKDIR} ${WRKSRC}/Local
@@ -21,16 +24,26 @@ pre-configure:
 	    < ${WRKSRC}/Local/Makefile.netbsd \
 	    > ${WRKSRC}/Local/Makefile
 
+pre-build:
+	@(if ! id mail 2>/dev/null >/dev/null; then\
+		echo "!! ";\
+		echo "!! Use vipw to add the following to master.passwd:";\
+		echo "!! ";\
+		echo "!!  mail:*:8:6::0:0:Electronic Mail:/var/mail:/sbin/nologin";\
+		echo "!! ";\
+		false;\
+	fi)
+
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/exim
 	${INSTALL_DATA_DIR} /var/log/exim
 	${CHMOD} 750 /var/log/exim
-	strip ${WRKSRC}/build*/exim
-	strip ${WRKSRC}/build*/exim_dbmbuild
-	strip ${WRKSRC}/build*/exim_tidydb
-	strip ${WRKSRC}/build*/exim_fixdb
-	strip ${WRKSRC}/build*/exim_dumpdb
-	strip ${WRKSRC}/build*/exim_lock
+	strip ${WRKSRC}/build-*/exim
+	strip ${WRKSRC}/build-*/exim_dbmbuild
+	strip ${WRKSRC}/build-*/exim_tidydb
+	strip ${WRKSRC}/build-*/exim_fixdb
+	strip ${WRKSRC}/build-*/exim_dumpdb
+	strip ${WRKSRC}/build-*/exim_lock
 
 post-install:
 	${SED} -e 's:@PREFIX@:${PREFIX}:' \
@@ -43,6 +56,5 @@ post-install:
 	${SED} -e 's:@PREFIX@:${PREFIX}:' \
 	    ${FILESDIR}/mailer.conf.exim \
 	    > ${PREFIX}/etc/exim/mailer.conf.exim
-	${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/PLIST b/mail/exim/PLIST
index b52a2dbc275..ab6183245d5 100644
--- a/mail/exim/PLIST
+++ b/mail/exim/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:47 skrll Exp $
-etc/exim/configure
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:51:09 jlam Exp $
+etc/exim/configure.example
 etc/exim/mailer.conf.exim
 etc/rc.d/exim
 sbin/exicyclog
 sbin/exigrep
 sbin/exim
+sbin/exim-4.05-1
+sbin/exim_checkaccess
 sbin/exim_dbmbuild
 sbin/exim_dumpdb
 sbin/exim_fixdb
@@ -15,6 +17,5 @@ sbin/eximstats
 sbin/exinext
 sbin/exiqsumm
 sbin/exiwhat
-man/man8/exim.8
 @unexec ${RMDIR} /var/log/exim 2>/dev/null || true
 @dirrm etc/exim
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index c82aa0b98cc..c27684ca33e 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2001/12/19 17:11:03 ad Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:51:10 jlam Exp $
 
-SHA1 (exim-3.34.tar.gz) = e545dd11e49d57a25ca6b2cd112c2f899bb7c497
-Size (exim-3.34.tar.gz) = 1270469 bytes
-SHA1 (patch-ab) = 963c500ad8078264d0d0daeb4edc75756225c9b8
-SHA1 (patch-ac) = 39122ca045ca7bb61500acae2abf5683c8ec4530
-SHA1 (patch-ae) = 24009dd4807f0215e79cc0a86582297bf310c913
+SHA1 (exim-4.05.tar.bz2) = 118c89ab4a79151f66c788581bdd9ab877624a42
+Size (exim-4.05.tar.bz2) = 1048495 bytes
+SHA1 (patch-aa) = c892a73a1850a9ce53828e88ca9d646407aa0ff2
+SHA1 (patch-ab) = f97ce4bf5a5eeed664118f5bec4b86c67ac57596
+SHA1 (patch-ac) = 6bb782eb07c724da82be3aefcdf9a4bf90906687
+SHA1 (patch-ae) = 6fe1508019093e409dd936d934913bc9f23c3125
diff --git a/mail/exim/files/exim.8 b/mail/exim/files/exim.8
deleted file mode 100644
index a115cd7f754..00000000000
--- a/mail/exim/files/exim.8
+++ /dev/null
@@ -1,909 +0,0 @@
-.TH EXIM 8
-.SH exim
-exim \- Mail Transfer Agent
-.SH SYNOPSIS
-.B exim
-.I "[options] arguments ..."
-.br
-.B mailq
-.I "[options] arguments ..."
-.br
-.B rmail
-.I "[options] arguments ..."
-.br
-.B rsmtp
-.I "[options] arguments ..."
-.br
-.B runq
-.I "[options] arguments ..."
-.br
-.B sendmail
-.I "[options] arguments ..."
-.SH "DESCRIPTION"
-.B Exim
-is a mail transport agent (MTA) developed at the University of
-Cambridge for use on Unix systems connected to the Internet. It is
-freely available under the terms of the GNU General Public Licence. In
-style it is similar to Smail 3, but its facilities are more extensive,
-and in particular it has some defences against mail bombs and
-unsolicited junk mail, in the form of options for refusing messages
-from particular hosts, networks, or senders.
-.PP
-Exim's command line takes the standard Unix form of a sequence of
-options, each starting with a hyphen character, followed by a number
-of arguments.  The options are compatible with the main options of
-Sendmail, and there are also some additional options, some of which
-are compatible with Smail 3.  Certain combinations of options do not
-make sense, and provoke an error if used. The form of the arguments
-depends on which options are set.
-.PP
-If Exim is called under the name mailq, it behaves as if the option
--bp were present before any other options. This is for compatibility
-with some systems that contain a command of that name in one of the
-standard libraries, symbolically linked to /usr/lib/sendmail.
-.PP
-If Exim is called under the name rsmtp it behaves as if the option -bS
-were present before any other options, for compatibility with
-smail. The -bS option is used for reading in a number of messages in
-batched SMTP format.
-.PP
-If Exim is called under the name rmail it behaves as if the option -i
-were present before any other options, for compatibility with
-smail. The -i option is used for reading a message that should not be
-terminated by a dot on a line by itself. The name rmail is used as an
-interface by some UUCP systems.
-.PP
-If Exim is called under the name runq it behaves as if the option -q
-were present before any other options, for compatibility with
-smail. The -q option causes a single queue-runner process to be
-started.
-.SH LIMITATIONS
-For the benefit of those reading this overview to see whether Exim is
-of interest to them, its limitations are listed first.
-.TP
-.B ANSI-C
-Exim is written in ANSI C. This should not be much of a limitation
-these days. However, to help with systems that lack a true ANSI C
-library, Exim avoids making any use of the value returned by the
-sprintf() function, which is one of the main incompatibilities. It has
-its own version of strerror() for use with SunOS4 and any other system
-that lacks this function, and a macro can be defined to turn memmove()
-into bcopy() if necessary.
-.TP
-.B Filenames
-Exim uses file names that are longer than 14 characters.
-.TP
-.B Bangpaths
-Exim is intended for use as an Internet mailer, and therefore handles
-addresses in RFC 822 domain format only. It cannot handle 'bang
-paths', though simple two-component bang paths can be converted by a
-straightforward rewriting configuration.
-.TP
-.B Domains required
-Exim insists that every address it handles has a domain attached. For
-incoming local messages, domainless addresses are automatically
-qualified with a configured domain value. Configuration options
-specify from which remote systems unqualified addresses are
-acceptable.
-.TP
-.B Transports
-The only external transport currently implemented is an SMTP transport
-over a TCP/IP network (using sockets), suitable for machines on the
-Internet. However, a pipe transport is available, and there are
-facilities for writing messages to files in 'batched SMTP' format;
-this can be used to send messages to some other transport
-mechanism. Batched SMTP input is also catered for.
-.SH FEATURES
-Exim follows the same general approach of decentralized control that
-Smail 3 does. There is no central process doing overall management of
-mail delivery.  However, unlike Smail, the independent delivery
-processes share data in the form of 'hints', which makes delivery more
-efficient in some cases. The hints are kept in a number of DBM
-files. If any of these files are lost, the only effect is to change
-the pattern of delivery attempts and retries.
-.PP
-Many configuration options can be given as expansion strings, and as
-these can include file lookups, much of Exim's operation can be made
-table-driven if desired. For example, it is possible to do local
-delivery on a machine on which the users do not have accounts.
-.PP
-Regular expressions are available in a number of configuration
-parameters.
-.PP
-Domain lists can include file lookups, making it possible to support a
-large number of local domains.
-.PP
-Exim has flexible retry algorithms, applicable to mail routing as well as
-to delivery.
-.PP
-Exim contains header and envelope rewriting facilities.
-.PP
-Unqualified addresses are accepted only from specified hosts or networks.
-.PP
-Exim can perform multiple deliveries down the same SMTP channel after
-deliveries to a host have been delayed.
-.PP
-Exim can be configured to do local deliveries immediately but to leave
-remote deliveries until the message is picked up by a queue-runner
-process. This increases the likelihood of multiple messages being sent
-down a single SMTP connection.
-.PP
-When copies of a message have to be delivered to more than one remote
-host, up to a configured maximum number of remote deliveries can be
-done in parallel.
-.PP
-Exim supports optional checking of incoming return path (sender) and
-receiver addresses as they are received by SMTP.
-.PP
-SMTP calls from specific machines, optionally from specific idents,
-can be locked out, and incoming SMTP messages from specific senders
-can also be locked out.
-.PP
-It is possible to control which hosts may use the Exim host as a relay
-for onward transmission of mail; the control can be made to depend on
-the address domain.
-.PP
-Messages on the queue can be 'frozen' and 'thawed' by the
-administrator.
-.PP
-The maximum size of message can be specified.  Exim can handle a
-number of independent local domains on the same machine; each domain
-can have its own alias files, etc. These are commonly called "virtual
-domains".
-.PP
-Exim stats a user's home directory before looking for a .forward file,
-in order to detect the case of a missing NFS mount.
-.PP
-Exim contains an optional built-in mail filtering facility. This
-enables users to set up their own mail filtering in a straightfoward
-manner without the need to run an external program. There can also be
-a system filter file that applies to all messages.
-.PP
-There is support for multiple user mailboxes controlled by prefixes or
-suffixes on the user name, either via the filter mechanism or through
-multiple .forward files.
-.PP
-Periodic warnings are automatically sent to messages' senders when
-delivery is delayed - the time between warnings is configurable.
-.PP
-A queue run can be manually started to deliver just a particular
-portion of the queue, or those messages with a recipient whose address
-contains a given string.
-.PP
-Exim can be configured to run as root all the time, except when
-performing local deliveries, which it always does in a separate
-process under an appropriate uid and gid. Alternatively, it can be
-configured to run as root only when needed; in particular, it need not
-run as root when receiving incoming messages or when sending out
-messages over SMTP.
-.PP
-I have tried to make the wording of delivery failure messages clearer
-and simpler, for the benefit of those less-experienced people who are
-now using email.
-.PP
-The Exim Monitor is an optional extra; it displays information about
-Exim's processing in an X window, and an administrator can perform a
-number of control actions from the window interface.
-.SH METHOD OF OPERATION
-When Exim receives a message, it writes two files in its spool
-directory.  The first contains the envelope information, the current
-status of the message, and the headers, while the second contains the
-body of the message. The status of the message includes a complete
-list of recipients and a list of those that have already received the
-message. The header file gets updated during the course of delivery if
-necessary.
-.PP
-A message remains in the spool directory until it is completely
-delivered to its recipients or to an error address, or until it is
-deleted by an administrator or by the user who originally created
-it. In cases when delivery cannot proceed - for example, when a
-message can neither be delivered to its recipients nor returned to its
-sender, the message is marked 'frozen' on the spool, and no more
-deliveries are attempted. The administrator can thaw such messages
-when the problem has been corrected, and can also freeze individual
-messages by hand if necessary.
-.PP
-As delivery proceeds, Exim writes timestamped information about each
-address to a per-message log file; this includes any delivery error
-messages. This log is solely for the benefit of the administrator. All
-the information Exim itself needs for delivery is kept in the header
-spool file. The message log file is deleted with the spool files. If a
-message is delayed for more than a configured time, a warning message
-is sent to the sender. This is repeated whenever the same time elapses
-again without delivery being complete.
-.PP
-The main delivery processing elements of Exim are called directors,
-routers, and transports. Code for a number of these is provided, and
-compile-time options specify which ones are actually included in the
-binary. Directors handle addresses that include one of the local
-domains, routers handle remote addresses, and transports do actual
-deliveries.
-.SH TRUSTED AND ADMIN USERS
-Some Exim options are available only to "trusted users" and others are
-available only to "admin users".
-.PP
-A trusted user is root or the Exim user (if defined) or any user
-listed in the trusted_users configuration option, or any user, if the
-currently set group is one of those listed in the trusted_groups
-configuration option. Trusted users are permitted to use the -f option
-to specify the senders of messages that are passed to Exim through the
-local interface, and also to specify host names, host addresses,
-protocol names, and ident values. Thus they are able to insert
-messages into Exim's queue locally that have the characteristics of
-messages received from a remote host.
-.PP
-An admin user is root or the Exim user (if defined) or any user that
-is a member of the Exim group (if defined). The current group does not
-have to be the Exim group. Admin users are permitted to operate on
-messages in the queue, for example, to force delivery failures. It is
-also necessary to be an admin user in order to see the full
-information provided by the Exim monitor.
-.SH OPTIONS
-Exim's command options are as follows:
-.TP
-.B -bd
-Run Exim as a daemon, awaiting incoming SMTP connections. This option
-can be used only by an admin user. If either of the -d or -dm options
-are set, the daemon does not disconnect from the controlling
-terminal. By default, Exim listens for incoming connections on all the
-host's interfaces, but it can be restricted to specific interfaces by
-setting the local_interfaces option in the configuration file. The
-standard SMTP port is used, but this can be varied by means of the -oX
-option. Most commonly, the -bd option is combined with the -q<time>
-option, to cause periodic queue runs to happen as well.
-
-The process id of a daemon that is both listening and starting queue
-runners is written to a file called exim-daemon.pid in Exim's spool
-directory, unless the -oX option is used, in which case the file
-name is exim-daemon.<port-number>.pid. If a daemon is run with only
-one of -bd and -q<time>, then that option is added on to the end of
-the file name, allowing sites that run two separate daemons to
-distinguish them.
-
-It is possible to change the directory in which these pid files are
-written by changing the setting of PID_FILE_PATH in Local/Makefile.
-Further details are given in the comments in src/EDITME.
-
-The SIGHUP signal can be used to cause the daemon to re-exec itself.
-This should be done whenever Exim's configuration file is changed,
-or a new version of Exim is installed. It is not necessary to do
-this when other files (e.g. alias files) are changed.
-.TP
-.B -bf <filename>
-Run Exim in filter testing mode; the file is the filter file to be
-tested, and a test message must be supplied on the standard input.
-If there are no message-dependent tests in the filter, an empty file
-can be supplied. If the test file does not begin with the special
-line
-
- # Exim filter
-
-then it is taken to be a normal .forward file, and is tested for
-validity under that interpretation. The result of this command,
-provided no errors are detected, is a list of the actions that Exim
-would try to take if presented with the message for real. More
-details of filter testing are given in the separate document
-entitled "Exim's User interface to mail filtering".
-
-When testing a filter file, various parameters that would normally
-be taken from the envelope recipient address of a message can be set
-by means of additional command line options. These are:
-
- -bfd  <domain>    default is the qualify domain
- -bfl  <local_part>default is the logged in user
- -bfp  <local_part_prefix> default is null
- -bfs  <local_part_suffix> default is null
-
-The local part should always be set to the incoming address with any
-prefix or suffix stripped, because that is how it appears when a
-message is actually being delivered.
-.TP
-.B -bi
-Sendmail interprets the -bi option as a request to rebuild its alias
-file. Exim does not have the concept of a single alias file, and so
-it cannot mimic this behaviour. However, calls to /usr/lib/sendmail
--bi tend to appear in various scripts such as NIS make files, so the
-option must be recognized.
-
-If -bi is encountered, the command specified by the bi_command
-configuration option is run, under the uid and gid of the caller of
-Exim. If the -oA option is used, its value is passed to the command
-as an argument. The command set by bi_command may not contain
-arguments. The command can use the exim_dbmbuild utility, or some
-other means, to rebuild alias files if this is required. If the
-bi_command option is not set, then calling Exim with -bi is a no-op.
-.TP
-.B -bm
-Accept an incoming, locally-generated message on the current input,
-and deliver it to the addresses given as the command arguments
-(except when -t is also given - see below). Each argument can be a
-comma-separated list of RFC 822 addresses. This is the default
-option, and is assumed if no other conflicting option is present.
-The message may or may not be delivered immediately, depending on
-the setting of the -od option and the queue_only and queue_smtp
-configuration options.
-
-The format of the message must be as defined in RFC 822, except
-that, for compatibility with sendmail and smail, a line of the form
-
- From sender Fri Jan  5 12:55 GMT 1996
-
-is permitted to appear at the start of the message. The Solaris 2
-version of the "mail" command inserts such a line, though there is
-no mention of it in the sendmail man page. The sender specified in
-this line is treated as if it were given as the argument to the -f
-option.
-.TP
-.B -bp
-List the contents of the mail queue on the current output. Each
-message on the queue is displayed as in the following example:
-
- 25m  2.9K 0t5C6f-0000c8-00 <alice@wonderland.fict.book>
-   red.king@looking-glass.fict.book
-   <other addresses>
-
-The first line contains the amount of time the message has been on
-the queue (in this case 25 minutes), the size of the message (2.9K),
-the unique identifier for the message, and the message sender, as
-contained in the envelope. If the message is a delivery error
-message, the sender address is empty, and appears as <>. If the
-message is frozen (attempts to deliver it are suspended) then the
-text '*** frozen ***' is displayed at the end of this line.
-
-The recipients of the message (taken from the envelope, not the
-headers) are displayed on subsequent lines. Those addresses to which
-the message has already been delivered are marked with the letter D.
-If an original address gets expanded into several addresses via an
-alias or forward file, the original is displayed with a 'D' when
-deliveries for all of its child addresses are completed.
-.TP
-.B -bP
-If this option is given with no arguments, it causes the values of
-all Exim's main configuration options to be written to the standard
-output. The values of one or more specific options can be requested
-by giving their names as arguments, for example:
-
- exim -bP qualify_domain local_domains
-
-If configure_file is given, the name of the runtime configuration
-file is output. If log_file_path or pid_file_path are given, the
-names of the directories where log files and daemon pid files are
-written are output, respectively. If these values are unset, log
-files are written in a subdirectory of the spool directory called
-log, and pid files are written directly into the spool directory.
-
-If one of the words director, router, or transport is given,
-followed by the name of an appropriate driver instance, the option
-settings for that driver are output. For example:
-
- exim -bP transport local_delivery
-
-The generic driver options are output first, followed by the
-driver's private options. A list of the names of drivers of a
-particular type can be obtained by using one of the words
-director_list, router_list, or transport_list, and a complete list
-of all drivers with their option settings can be obtained by using
-directors, routers, or drivers.
-.TP
-.B -brt
-This option is for testing retry rules, and it must be followed by
-up to three arguments. It causes Exim to look for a retry rule that
-matches the values and to output it on the standard output. For
-example:
-
- exim -brt bach.comp.mus
- Retry rule: *.comp.mus  F,2h,15m; FG,4d,30m;
-
-See chapter 30 for a description of Exim's retry rules. The first
-argument, which is required, can be a complete address in the form
-local_part@domain, or it can be just a domain name. The second
-argument is an optional second domain name; if no retry rule is
-found for the first argument, the second is tried. This ties in with
-Exim's behaviour when looking for retry rules for remote hosts - if
-no rule is found that matches the host, one that matches the mail
-domain is sought. The final argument is the name of a specific
-delivery error, as used in setting up retry rules, for example
-'quota_3d'.
-.TP
-.B -brw
-This option is for testing address rewriting rules, and it must be
-followed by a single argument, consisting of either a local part
-without a domain, or a complete address with a fully-qualified
-domain. Exim outputs how this address would be rewritten for each
-possible place it might appear.
-.TP
-.B -bS
-This option is used for batched SMTP input, where messages have been
-received from some external source by an alternative transport
-mechanism. It causes Exim to accept one or more messages by reading
-SMTP on the standard input, but to generate no responses. All errors
-are reported by sending mail. If the caller is trusted, then the
-senders in the MAIL FROM commands are believed; otherwise the sender
-is always the caller of Exim. Unqualified senders and receivers are
-not rejected (there seems little point) but instead just get
-qualified. Receiver verification and administrative rejection is not
-done, even if configured. HELO and EHLO act as RSET; VRFY, EXPN, ETRN,
-HELP, and DEBUG act as NOOP; QUIT quits.
-.TP
-.B -bs
-This option causes Exim to accept one or more messages by reading SMTP
-commands on the standard input, and producing SMTP replies on the
-standard output. Some user agents use this interface as a way of
-passing locally-generated messages to the MTA. The option can also be
-used to run Exim from inetd, as an alternative to using a listening
-daemon, in which case the standard input is the connected socket. Exim
-distinguishes between the two cases by attempting to read the IP
-address of the peer connected to the standard input. If it is not a
-socket, the call to getpeername() fails, and Exim assumes it is
-dealing with a local message.
-
-If the caller of Exim is trusted, then the senders of messages are
-taken from the SMTP MAIL FROM commands. Otherwise the content of these
-commands is ignored and the sender is set up as the calling user.
-.TP
-.B -bt
-Run in address testing mode, in which each argument is taken as an
-address to be tested. The results are written to the standard
-output. If no arguments are given, Exim runs in an interactive manner,
-prompting with > for addresses to be tested. Each address is handled
-as if it were the recipient address on a message and passed to the
-appropriate directors or routers.
-.TP
-.B -bV
-Write the current version number, compilation number, and compi-
-lation date of the exim binary to the standard output.
-.TP
-.B -bv
-Verify the addresses that are given as the arguments to the command,
-and write the results to the standard output. Verification differs
-from address testing (the -bt option) in that directors and routers
-that have no_verify set are skipped, and if the address is accepted by
-a director or router that has fail_verify set, verification
-fails. This is the same logic that is used when verifying addresses on
-incoming messages (see the sender_verify and receiver_verify options).
-
-If the -v (or -d) option is not set, the output consists of a single
-line for each address, stating whether it was verified or not, and
-giving a reason in the latter case. Otherwise, more details are given
-of how the address has been handled, and in the case of aliases or
-forwarding, the generated addresses are also considered.
-.TP
-.B -C <filename>
-Read the runtime configuration from the given file instead of from
-the default file specified by the CONFIGURE_FILE compile-time set-
-ting. When this option is used by an unprivileged caller, Exim gives
-up its root privilege immediately, and runs with the real and
-effective uid and gid set to those of the caller, to avoid any
-security exposure. It does not do this if the caller is root or the
-exim user. The facility is useful for ensuring that configuration
-files are syntactically correct, but cannot be used for test
-deliveries, unless the caller is privileged, or unless it's an
-exotic configuration that does not require privilege. No check is
-made on the owner or group of the file specified by this option.
-.TP
-.B -d<number>
-Sets a debug level, causing debugging information to be written to the
-standard error file. Whitespace between -d and the number is
-optional. If no number is given, 1 is assumed, and the higher the
-number, the more output is produced. A value of zero turns debugging
-output off. A value of 9 gives the maximum amount of general
-information, 10 gives in addition details of the interpretation of
-filter files, and 11 or higher also turns on the debugging option for
-DNS lookups.
-.TP
-.B -df
-If this option is set and STDERR_FILE was defined when Exim was built,
-debugging information is written to the file defined by that variable
-instead of to the standard error file. This option provides a way of
-obtaining debugging information when Exim is run from inetd.
-.TP
-.B -dm
-This option causes information about memory allocation and freeing
-operations to be written to the standard error file.
-.TP
-.B -E
-This option specifies that an incoming message is a locally-generated
-delivery failure message. It is used internally by Exim when handling
-delivery failures and is not intended for external use. Its only
-effect is to stop Exim generating certain messages to the mailmaster,
-as otherwise message cascades could occur in some situations. As part
-of the same option, a message id may follow the characters -E. If it
-does, the log entry for the receipt of the new message contains the
-id, following 'R=', as a cross reference.
-.TP
-.B -ex
-There are a number of sendmail options starting with -oe which seem to
-be called by various programs without the leading o in the option. For
-example, the vacation program uses -eq. Exim treats all options of the
-form -ex as synonymous with the corresponding -oex options.
-.TP
-.B -F <string>
-Set the sender's full name for use when a locally-generated message
-is being accepted. In the absence of this option, the user's "gecos"
-entry from the password file is used. As users are generally
-permitted to alter their "gecos" entries, no security considerations
-are involved. White space between -F and the <string> is optional.
-.TP
-.B -f <address>
-Set the address of the sender of a locally-generated message. This
-option can normally be used only by root or the Exim user or by one
-of the configured trusted users. In other cases, the sender of a
-local message is always set up as the user who ran the exim command,
-and -f is ignored, with one exception. If the special setting -f <>
-is used by an untrusted user, it does not affect the sender for the
-purposes of managing the Sender: and From: headers, but it does have
-the effect of causing any SMTP transmissions to be sent out with
-
- MAIL FROM: <>
-
-and local deliveries to contain
-
- Return-path: <>
-
-when configured to contain Return-path: headers. The filtering code
-treats such a message as an error message, and won't generate
-messages as a result of reading it.
-
-White space between -f and the <string> is optional. The sender of a
-locally-generated message can also be set by an initial 'From' line
-in the message - see the description of -bm above.
-.TP
-.B -h <number>
-This option is accepted for compatibility with sendmail, but at
-present has no effect. (In sendmail it overrides the 'hop count'
-obtained by counting Received headers.)
-.TP
-.B -i
-This option, which has the same effect as -oi, specifies that a dot
-on a line by itself should not terminate an incoming, non-SMTP
-message. I can find no documentation for this option in Solaris 2.4
-sendmail, but the mailx command in Solaris 2.4 uses it.
-.TP
-.B -M
-The arguments are interpreted as a list of message ids, and Exim runs
-a delivery attempt on each message in turn. Retry hints for any of the
-addresses are overridden - this option forces Exim to try to deliver
-even if the normal retry time has not yet been reached. If any of the
-messages is frozen, it is automatically thawed before the delivery
-attempt, provided that the caller is an admin user.
-.TP
-.B -Mar <message-id> <address> <address> ...
-The first argument must be a message id, and the remaining ones must
-be email addresses. Exim adds the addresses to the list of recipi-
-ents of the message. However, if the message is active (in the middle
-of a delivery attempt), its status is not altered. This option can be
-used only by an admin user.
-.TP
-.B -Meb <message-id>
-This runs, under /bin/sh, the command defined in the shell variable
-VISUAL or, if that is not defined, EDITOR or, if that is not defined,
-the command vi, on a copy of the spool file containing the body of
-message (eb = Edit Body). If the editor exits normally, then the
-result of editing replaces the spool file. The message is locked
-during this process, so no delivery attempts can occur. Note that the
-first line of the spool file is its own name; care should be taken not
-to disturb this. The thinking behind providing this feature is that an
-administrator who has had to mess around with the addresses to get a
-message delivered might want to add some (grumbly) comment at the
-start of the message text. This option can be used only by an admin
-user.
-.TP
-.B -Mes <message-id> <address>
-There must be exactly two arguments. The first argument must be a
-message id, and the second one an email address. Exim changes the
-sender address in the message to the given address, which must be a
-fully qualified address, or '<>'. However, if the message is active
-(in the middle of a delivery attempt), its status is not altered.
-This option can be used only by an admin user.
-.TP
-.B -Mmad <message-id>
-Exim marks the all recipient addresses in the message as already
-delivered. However, if the message is active (in the middle of a
-delivery attempt), its status is not altered. This option can be used
-only by an admin user.
-.TP
-.B -Mmd <message-id> <address> <address> ...
-The first argument must be a message id, and the remaining ones must
-be email addresses. Exim marks the given addresses as already
-delivered. However, if the message is active (in the middle of a
-delivery attempt), its status is not altered. This option can be used
-only by an admin user.
-.TP
-.B -MC <transport> <hostname> <sequence number> <message id>
-This option is not intended for use by outside callers. It is used
-internally by Exim to invoke another instance of itself to deliver a
-waiting message using an existing SMTP channel, which is passed as the
-standard input and output. Details are given in chapter 43. This must
-be the final option, and the caller must be root or the Exim user in
-order to use it.
-.TP
-.B -Mc
-The arguments are interpreted as a list of message ids, and Exim runs
-a delivery attempt on each message in turn, but unlike the -M option,
-it does check for retry hints, and respects any that are found. This
-option is not very useful to external callers (except for testing). It
-is provided for internal use by Exim when it needs to re-invoke itself
-in order to regain root privilege for a delivery (see chapter 44).
-.TP
-.B -Mf
-The arguments are interpreted as a list of message ids, and each
-message is marked 'frozen'. This prevents any delivery attempts taking
-place until the message is 'thawed', either manually or as a result of
-the auto_thaw configuration option. However, if any of the messages is
-active (in the middle of a delivery attempt), its status is not
-altered. This option can be used only by an admin user.
-.TP
-.B -Mg
-The arguments are interpreted as a list of message ids, and Exim gives
-up trying to deliver those messages. A delivery error message is sent,
-containing the text 'cancelled by administrator'. However, if any of
-the messages is active, its status is not altered. This option can be
-used only by an admin user.
-.TP
-.B -Mt
-The arguments are interpreted as a list of message ids, and each
-message that was 'frozen' is now 'thawed', so that delivery attempts
-can resume. However, if any of the messages is active, its status is
-not altered. This option can be used only by an admin user.
-.TP
-.B -Mrm
-The arguments are interpreted as a list of message ids, and each
-message is completely removed from Exim's queue, and forgotten.
-However, if any of the messages is active, its status is not
-altered. This option can be used only by an admin user or by the user
-who originally caused the message to be placed on the queue.
-.TP
-.B -m
-This is apparently a synonym for -om that is accepted by sendmail, so
-Exim treats it that way too.
-.TP
-.B -N
-This is a debugging option that inhibits delivery of a message at the
-transport level. It implies at least -d1. Exim goes through many of
-the motions of delivery - it just doesn't actually transport the
-message, but instead behaves as if it had successfully done so. The
-log, for example, will contain entries as if the message had been
-delivered. Only root or the exim user are allowed to use -N with -bd,
--q, or -M. In other words, an ordinary user can use it only when
-supplying an incoming message.
-.TP
-.B -oA <file name>
-This option is used by Sendmail in conjunction with -bi to specify an
-alternative alias file name. Exim handles -bi differently; see the
-description above.
-.TP
-.B -oB <n>
-This is a debugging option which limits the maximum number of SMTP
-deliveries down one channel to <n>, overriding the value set in the
-smtp transport. If <n> is omitted, the limit is set to 1 (no
-batching).
-.TP
-.B -odb
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It requests 'background'
-delivery of such messages, which means that the accepting process
-automatically starts another delivery process for each message
-received. Exim does not wait for such processes to complete (it can
-take some time to perform SMTP deliveries). This is the default action
-if none of the -od options are present.
-.TP
-.B -odf
-This option (compatible with smail) requests 'foreground' (syn-
-chronous) delivery when Exim has accepted a locally-generated mess-
-age. For the daemon it is exactly the same as -odb. For a single
-message received on the standard input, if the protection regime
-permits it (see chapter 44), Exim converts the reception process into
-a delivery process. In other cases, it creates a new delivery process,
-and then waits for it to complete before proceeding.
-.TP
-.B -odi
-This option is synonymous with -odf. It is provided for compati-
-bility with sendmail.
-.TP
-.B -odq
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It specifies that the
-accepting process should not automatically start a delivery attempt
-for each message received. Messages are placed on the queue, and
-remain there until a subsequent queue-running process encounters
-them. The queue_only configuration option has the same effect.
-.TP
-.B -odqr
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It causes Exim to process
-local addresses when a message is received, but not even to try
-routing remote addresses. Contrast with -odqs below, which does the
-routing, but not the delivery. The remote addresses will be picked up
-by the next queue runner. The queue_remote configuration option has
-the same effect.
-.TP
-.B -odqs
-This option is a hybrid between -odb and -odq. A delivery process is
-started for each incoming message, the addresses are all processed,
-and local deliveries are done in the normal way. However, if any SMTP
-deliveries are required, they are not done at this time. Such messages
-remain on the queue until a subsequent queue-running process
-encounters them. Because routing was done, Exim knows which messages
-are waiting for which hosts, and so a number of messages for the same
-host will get sent in a single SMTP connection. The queue_smtp
-configuration option has the same effect.
-.TP
-.B -oem
-If an error is detected while a non-SMTP message is being received
-(e.g. a malformed address), the error is reported to the sender in a
-mail message. This is the default option. After a message has been
-successfully received, any subsequent delivery errors are always
-reported in this way.
-.TP
-.B -oep
-If an error is detected while a non-SMTP message is being received,
-the error is reported by writing a message to the standard error file
-(stderr).
-.TP
-.B -oeq
-This option is supported for compatibility with sendmail, but has the
-same effect as -oep.
-.TP
-.B -oew
-This option is supported for compatibility with sendmail, but has the
-same effect as -oem.
-.TP
-.B -oi
-This option, which has the same effect as -i, specifies that a dot on
-a line by itself should not terminate an incoming, non-SMTP message.
-.TP
-.B -oMa <host address>
-This option sets the sender host address value, and can be used only
-by a trusted caller. The value is used in log entries and can appear
-in Received headers. The option is intended for use when handing to
-Exim messages received by other means.
-.TP
-.B -oMr <protocol name>
-This option sets the received protocol value, and can be used only by
-a trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -oMs <host name>
-This option sets the sender host name value, and can be used only by a
-trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -oMt <ident string>
-This option sets the sender ident value, and can be used only by a
-trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -om
-In sendmail, this option means 'me too', indicating that the sender of
-a message should receive a copy of the message if the sender appears
-in an alias expansion. Exim always does this, so the option does
-nothing.
-.TP
-.B -or <time>
-This option sets a timeout value for incoming non-SMTP messages. If it
-is not set, Exim will wait forever for the standard input. The value
-can also be set using the accept_timeout configuration vari- able. The
-format used for specifying times is described in section 7.6.
-.TP -ov
-This option has exactly the same effect as -v.
-.TP
-.B -oX <number>
-This option is relevant only when the -bd option is also given. It
-specifies an alternative TCP/IP port number for the listening daemon,
-and is useful for testing. When used, the process number of the daemon
-is written to a file whose name is exim- daemon.<number>.pid in Exim's
-spool directory.
-.TP
-.B -q
-If the -q option is not followed by a time value, it requests a single
-queue run operation. This option can be used only by an admin
-user. Exim starts up a delivery process for each (inactive) message on
-the queue in turn, and waits for it to finish before starting the next
-one. When all the queued messages have been considered, the original
-process terminates. In other words, a single pass is made over the
-waiting mail. Use -q with a time (see below) if you want this to be
-repeated periodically.
-
-Exim processes the waiting messages in an unpredictable order. It
-isn't very random, but it is likely to be different each time, which
-is all that matters. If one particular message screws up a remote MTA,
-other messages to the same MTA have a chance of getting through if
-they get tried first.
-
-However, it is possible to cause the messages to be processed in
-lexical id order, which is essentially the order in which they
-arrived, and to start this operation at a particular point by
-following the -q option with a starting message id. For example:
-
- exim -q 0t5C6f-0000c8-00
-
-This causes Exim to skip any messages whose ids are lexically less
-than the given id. A second id can also be given to stop the queue run
-before the end. See also the -R option.
-.TP
-.B -q <time>
-This version of the -q option (which again can be run only by an admin
-user) causes Exim to run as a daemon, starting a queue-running process
-at intervals specified by the given time value (whose format is
-described in section 7.6). This form of the -q option is commonly
-combined with the -bd option, in which case a single daemon process
-handles both functions. A common way of starting up a combined daemon
-at system boot time is to use a command such as
-
- /opt/exim/bin/exim -bd -q30m
-
-Such a daemon listens for incoming SMTP calls, and also fires up a
-queue-runner process every 30 minutes. The process id of such a daemon
-is written to a file called exim-daemon.pid in Exim's spool directory,
-unless the -oX option has been used, in which case the file is called
-exim-daemon.<port-number>.pid. The location of the pid file can be
-changed by defining PID_FILE_PATH in Local/Makefile.  If a daemon is
-started without -bd then the -q option used to start it is added to
-the pid file name.
-.TP
-.B -qf
-This option operates like -q, and may appear with or without a
-following time. The difference is that a delivery attempt is forced
-for each message, whereas with -q only those addresses that have
-passed their retry times are tried.
-.TP
-.B -qfl
-This option operates like -ql, and may appear with or without a
-following time. The difference is that a delivery attempt is forced
-for each message, whereas with -ql only those local addresses that
-have passed their retry times are tried.
-.TP
-.B -ql
-This option operates like -q, and may appear with or without a
-following time. The difference is that only local addresses are
-considered for delivery. Note that -ql cannot detect apparently remote
-addresses that actually turn out to be local when their domains get
-fully qualified.
-.TP -R <string>
-This option is similar to -q with no time value, except that, when
-scanning the messages on the queue, Exim processes only those that
-have at least one undelivered address containing the given string,
-which is checked in a case-independent way. However, once a message is
-selected, all its addresses are processed. For the first message
-containing a matching address, Exim overrides any retry information
-and forces a delivery attempt. This makes it straightforward to
-initiate delivery for all messages to a given domain after a host has
-been down for some time. When the SMTP command ETRN is permitted (see
-the smtp_etrn options), its effect is to run Exim with the -R option.
-.TP
-.B -r
-This is a documented (for sendmail) obsolete alternative name for -f.
-.TP
-.B -t
-When Exim is receiving a locally-generated, non-SMTP message on the
-current input, the -t option causes the recipients of the message to
-be obtained from the To, Cc, and Bcc headers in the message instead of
-from the command arguments. If there are any arguments, they specify
-addresses to which the message is not to be delivered. That is, the
-argument addresses are removed from the recipients list obtained from
-the headers. If a Bcc header is present, it is removed from the
-message unless there is no To or Cc header, in which case a Bcc header
-with no data is created, in accordance with RFC 822.
-.TP
-.B -v
-This option has exactly the same effect as -d1; it causes Exim to be
-'verbose' and produce some output describing what it is doing on the
-standard error file. In particular, if an SMTP connection is made, the
-SMTP dialogue is shown.
-.TP
-.B -x
-AIX uses -x for a private purpose ('mail from a local mail program has
-National Language Support extended characters in the body of the mail
-item'). It sets -x when calling the MTA from its mail command.  Exim
-ignores this option.
-.SH "SEE ALSO"
-sendmail(8), mailwrapper(8), mailer.conf(5).
-.SH AUTHOR
-This manual page was stitched together by Christoph Lameter,
-<clameter@debian.org>, from the original documentation coming with the
-sourcepackage for the Debian GNU/Linux system, and cleaned up a little
-by Tim Cutts <tjrc1@scalopus.bio.cam.ac.uk>. Modifications for NetBSD
-made by Andy Doran <ad@NetBSD.org>.
diff --git a/mail/exim/files/exim_newaliases b/mail/exim/files/exim_newaliases
index 591d31ab877..cbd17621fb9 100644
--- a/mail/exim/files/exim_newaliases
+++ b/mail/exim/files/exim_newaliases
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: exim_newaliases,v 1.2 2000/08/30 11:17:05 ad Exp $
+#	$NetBSD: exim_newaliases,v 1.2.2.1 2002/06/23 18:51:10 jlam Exp $
 #
 if [ -f /etc/mail/aliases ]; then
 	ALIASDIR=/etc/mail
@@ -10,4 +10,4 @@ fi
 
 cd $ALIASDIR
 echo -n "$ALIASDIR/aliases: "
-@PREFIX@/sbin/exim_dbmbuild aliases aliases.db
+@PREFIX@/sbin/exim_dbmbuild aliases aliases
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
new file mode 100644
index 00000000000..45d54ba963b
--- /dev/null
+++ b/mail/exim/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3.2.2 2002/06/23 18:51:11 jlam Exp $
+
+--- scripts/exim_install.orig	Thu Jun 13 12:06:12 2002
++++ scripts/exim_install	Thu Jun 13 12:07:28 2002
+@@ -42,6 +42,8 @@
+ NO_SYMLINK=`sed -n         -e '/^ *NO_SYMLINK *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
+ EXE=`sed -n                       -e '/^ *EXE *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
+ 
++INST_CONFIGURE_FILE=$CONFIGURE_FILE.example
++
+ # Allow INST_xx to over-ride xx
+ case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
+ case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
index 8c247e58fd5..179adfa4ac5 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,96 +1,140 @@
-$NetBSD: patch-ab,v 1.4 2001/06/11 12:15:46 ad Exp $
+$NetBSD: patch-ab,v 1.4.2.1 2002/06/23 18:51:12 jlam Exp $
 
---- Local/Makefile.netbsd.orig	Mon Jun 11 13:11:04 2001
-+++ Local/Makefile.netbsd	Mon Jun 11 13:11:40 2001
-@@ -78,7 +78,7 @@
- # CHGRP_COMMAND=/usr/bin/chgrp
- # MV_COMMAND=/bin/mv
- # RM_COMMAND=/bin/rm
--# PERL_COMMAND=/usr/bin/perl
-+PERL_COMMAND=@PREFIX@/bin/perl
+--- Local/Makefile.netbsd.orig	Thu Jun 13 12:43:22 2002
++++ Local/Makefile.netbsd	Thu Jun 13 12:43:52 2002
+@@ -98,7 +98,9 @@
+ # /usr/local/sbin. The installation script will try to create this directory,
+ # and any superior directories, if they do not exist.
  
+-BIN_DIRECTORY=/usr/exim/bin
++HAVE_IPV6=YES
++
++BIN_DIRECTORY=@PREFIX@/sbin
  
- # The following macro can be used to change the command for building a library
-@@ -92,8 +92,8 @@
- # appropriate code is included in the binary. You then need to set up the
- # runtime configuration to make use of the mechanism(s) selected.
  
--# AUTH_CRAM_MD5=yes
--# AUTH_PLAINTEXT=yes
-+AUTH_CRAM_MD5=yes
-+AUTH_PLAINTEXT=yes
+ #------------------------------------------------------------------------------
+@@ -113,7 +115,7 @@
+ # directories if they don't exist. It will also install a default run time
+ # configuration if this file does not exist.
  
+-CONFIGURE_FILE=/usr/exim/configure
++CONFIGURE_FILE=@PREFIX@/etc/exim/configure
  
- # The binary directory: This variable defines where the exim binary will be
-@@ -103,7 +103,7 @@
- # installed in this directory. There is no default for this variable built into
- # the source files; it must be set in one of the local configuration files.
  
--BIN_DIRECTORY=/usr/exim/bin
-+BIN_DIRECTORY=@PREFIX@/sbin
+ #------------------------------------------------------------------------------
+@@ -126,7 +128,7 @@
+ # owner of a local mailbox.) Specifying these values as root is very strongly
+ # discouraged. These values are compiled into the binary.
  
+-EXIM_USER=
++EXIM_USER=mail
  
- # The default distribution of Exim contains only the plain text form of the
-@@ -121,7 +121,7 @@
- # files. Both the name of the command and the suffix that it adds to files
- # need to be defined here. See also the EXICYCLOG_MAX configuration.
+ # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
+ # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
+@@ -207,7 +209,7 @@
+ # This one is special-purpose, and commonly not required, so it is not
+ # included by default.
  
--COMPRESS_COMMAND=/opt/gnu/bin/gzip
-+COMPRESS_COMMAND=/usr/bin/gzip
- COMPRESS_SUFFIX=gz
+-# TRANSPORT_LMTP=yes
++TRANSPORT_LMTP=yes
  
  
-@@ -137,7 +137,7 @@
- # location of all other runtime files and directories can be changed in the
- # runtime configuration file.
+ #------------------------------------------------------------------------------
+@@ -216,9 +218,9 @@
+ # MBX, is included only when requested. If you do not know what this is about,
+ # leave these settings commented out.
  
--CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=@PREFIX@/etc/exim/configure
+-# SUPPORT_MAILDIR=yes
+-# SUPPORT_MAILSTORE=yes
+-# SUPPORT_MBX=yes
++SUPPORT_MAILDIR=yes
++SUPPORT_MAILSTORE=yes
++SUPPORT_MBX=yes
  
  
- # In some installations there may be multiple machines sharing file systems,
-@@ -241,7 +241,7 @@
- # are defaulted in the OS/Makefile-Default file, and can be overridden
- # in local OS-specific make files.
+ #------------------------------------------------------------------------------
+@@ -281,7 +283,7 @@
+ # files are defaulted in the OS/Makefile-Default file, but can be overridden in
+ # local OS-specific make files.
  
 -EXIM_MONITOR=eximon.bin
 +# EXIM_MONITOR=eximon.bin
  
  
- # Compiling in support for embedded Perl: If you want to be able to
-@@ -284,7 +284,7 @@
- # "panic", or "reject" to form the final file name. For example, some
- # installations may want something like this:
+ 
+@@ -302,9 +304,9 @@
+ # included in the Exim binary. You will then need to set up the run time
+ # configuration to make use of the mechanism(s) selected.
+ 
+-# AUTH_CRAM_MD5=yes
+-# AUTH_PLAINTEXT=yes
+-# AUTH_SPA=yes
++AUTH_CRAM_MD5=yes
++AUTH_PLAINTEXT=yes
++AUTH_SPA=yes
+ 
+ 
+ #------------------------------------------------------------------------------
+@@ -315,8 +317,8 @@
+ # with TLS support. If you don't know what this is all about, leave these
+ # settings commented out.
+ 
+-# SUPPORT_TLS=yes
+-# TLS_LIBS=-lssl -lcrypto
++SUPPORT_TLS=yes
++TLS_LIBS=-lssl -lcrypto
+ 
+ # If you are running Exim as a server, note that just building it with TLS
+ # support is not all you need to do. You also need to set up a suitable
+@@ -371,7 +373,7 @@
+ # %s. This will be replaced by one of the strings "main", "panic", or "reject"
+ # to form the final file names. Some installations may want something like this:
  
 -# LOG_FILE_PATH=/var/log/exim_%slog
 +LOG_FILE_PATH=/var/log/exim/%slog
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -409,7 +409,7 @@
- # the file name, allowing sites that run two separate daemons to distinguish
- # them. Some installations may want something like this
- 
--# PID_FILE_PATH=/var/lock/exim%s.pid
-+PID_FILE_PATH=/var/run/exim%s.pid
- 
- # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
-@@ -458,7 +458,7 @@
- # uid and gid.
- 
- # Many installations will want something like this:
--# SPOOL_DIRECTORY=/var/spool/exim
-+SPOOL_DIRECTORY=/var/spool/exim
+@@ -467,14 +469,14 @@
+ # this setting. See the manual section entitled "Use of tcpwrappers" in the
+ # chapter on building and installing Exim.
+ 
+-# USE_TCP_WRAPPERS=yes
++USE_TCP_WRAPPERS=yes
+ 
+ # You may well also have to specify a local "include" file and an additional
+ # library for TCP wrappers, so you probably need something like this:
+ 
+ #  USE_TCP_WRAPPERS=yes
+ #  CFLAGS=-O -I/usr/local/include
+-#  EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
++EXTRALIBS_EXIM=-lwrap
+ 
+ # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
+ # as well.
+@@ -511,11 +513,11 @@
+ # haven't got Perl, Exim will still build and run; you just won't be able to
+ # use those utilities.
+ 
+-# CHOWN_COMMAND=/usr/bin/chown
+-# CHGRP_COMMAND=/usr/bin/chgrp
+-# MV_COMMAND=/bin/mv
+-# RM_COMMAND=/bin/rm
+-# PERL_COMMAND=/usr/bin/perl
++CHOWN_COMMAND=/usr/sbin/chown
++CHGRP_COMMAND=/usr/bin/chgrp
++MV_COMMAND=/bin/mv
++RM_COMMAND=/bin/rm
++PERL_COMMAND=@PREFIX@/bin/perl
  
- # Others may prefer to keep all Exim things under one directory:
- # SPOOL_DIRECTORY=/usr/exim/spool
-@@ -565,7 +565,7 @@
- # This one is special-purpose, and commonly not required, so do not include
- # it by default.
  
--# TRANSPORT_LMTP=yes
-+TRANSPORT_LMTP=yes
+ #------------------------------------------------------------------------------
+@@ -695,7 +697,7 @@
+ # (process id) to a file so that it can easily be identified. The path of the
+ # file can be specified here. Some installations may want something like this:
  
+-# PID_FILE_PATH=/var/lock/exim.pid
++PID_FILE_PATH=/var/run/exim.pid
  
- # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
+ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
+ # using the name "exim-daemon.pid".
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
index d889be4f94f..cbfe6fa5361 100644
--- a/mail/exim/patches/patch-ac
+++ b/mail/exim/patches/patch-ac
@@ -1,44 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2001/07/14 18:17:23 ad Exp $
+$NetBSD: patch-ac,v 1.3.2.1 2002/06/23 18:51:12 jlam Exp $
 
---- OS/Makefile-NetBSD.orig	Sat Jul 14 19:09:00 2001
-+++ OS/Makefile-NetBSD	Sat Jul 14 19:14:34 2001
-@@ -3,15 +3,31 @@
+--- OS/Makefile-NetBSD-a.out.orig	Thu Apr 18 08:08:28 2002
++++ OS/Makefile-NetBSD-a.out	Thu Jun 13 12:37:38 2002
+@@ -1,9 +1,10 @@
+ # Exim: OS-specific make file for NetBSD (a.out binary format)
  
- # Include Makfile.NetBSD-a.out
+ CHOWN_COMMAND=/usr/sbin/chown
+-CFLAGS=-O
++CFLAGS=-O2 -pipe
  
--.if exists(OS/Makefile-NetBSD-a.out)
--.include "OS/Makefile-NetBSD-a.out"
--.elif exists(../OS/Makefile-NetBSD-a.out)
--.include "../OS/Makefile-NetBSD-a.out"
--.else
--.include "Makefile.NetBSD-a.out, submit a bug report."
--.endif
-+# Exim: OS-specific make file for NetBSD (a.out binary format)
-+
-+CHOWN_COMMAND=/usr/sbin/chown
-+CFLAGS=-O
-+
-+HAVE_SA_LEN=YES
-+LIBS=-lcrypt
-+
-+X11=/usr/X11R6
-+XINCLUDE=-I$(X11)/include
-+XLFLAGS=-L$(X11)/lib
-+X11_LD_LIB=$(X11)/lib
-+
-+EXIWHAT_PS_ARG=-ax
-+EXIWHAT_EGREP_ARG='/exim( |$$)'
-+EXIWHAT_KILL_ARG=-USR1
-+
-+# NetBSD always ships with Berkeley DB
-+
-+USE_DB=yes
-+
-+# End
-+
+ HAVE_SA_LEN=YES
++HAVE_IPV6=YES
+ LIBS=-lcrypt
  
- # NetBSD ELF linker needs a -R flag.
--XLFLAGS+=-Wl,-R$(X11)/lib/
-+#XLFLAGS+=-Wl,-R$(X11)/lib/
- 
- # End
+ X11=/usr/X11R6
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae
index 0f84c39f09e..a15fd6c98f6 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,15 +1,13 @@
-$NetBSD: patch-ae,v 1.1 1999/09/18 20:23:10 ad Exp $
+$NetBSD: patch-ae,v 1.1.2.1 2002/06/23 18:51:13 jlam Exp $
 
---- src/configure.default.orig	Fri Sep 17 21:19:39 1999
-+++ src/configure.default	Fri Sep 17 21:19:55 1999
-@@ -252,8 +252,8 @@
- 
- system_aliases:
-   driver = aliasfile
--  file = /etc/aliases
--  search_type = lsearch
-+  file = /etc/aliases.db
-+  search_type = dbm
+--- src/configure.default.orig	Thu Jun 13 11:37:52 2002
++++ src/configure.default	Thu Jun 13 11:38:06 2002
+@@ -367,7 +367,7 @@
+   driver = redirect
+   allow_fail
+   allow_defer
+-  data = ${lookup{$local_part}lsearch{/etc/aliases}}
++  data = ${lookup{$local_part}dbm{/etc/mail/aliases}}
  # user = exim
    file_transport = address_file
    pipe_transport = address_pipe
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index e79c87cc489..7c373921c53 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/10/26 11:46:54 agc Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2002/06/23 18:51:14 jlam Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/02/15 05:36:54 peter Exp
 #
 
@@ -12,7 +12,7 @@ COMMENT=	X11/TK based mail reader front end to MH
 
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 DEPENDS+=	nmh>=1.0:../../mail/nmh
-DEPENDS+=	mm>=2.7:../../mail/metamail
+DEPENDS+=	metamail>=2.7:../../mail/metamail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 4f04a66d538..30c38b5865d 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2002/04/06 16:53:01 frueauf Exp $
+# $NetBSD: Makefile,v 1.113.2.1 2002/06/23 18:51:15 jlam Exp $
 
 DISTNAME=	fetchmail-5.9.11
 CATEGORIES=	mail
@@ -26,7 +26,6 @@ FETCHMAIL_USE_SSL?=	YES
 
 .if defined(FETCHMAIL_USE_SSL) && ${FETCHMAIL_USE_SSL} == YES
 .include "../../security/openssl/buildlink.mk"
-#USE_SSL=		yes
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
 .else
 CONFIGURE_ARGS+=	--without-ssl
@@ -36,7 +35,7 @@ CONFIGURE_ARGS+=	--without-ssl
 BUILD_DEFS+=		FETCHMAIL_USE_SSL
 
 .if defined(KERBEROS)
-USE_KERBEROS=		yes
+PKG_USE_KERBEROS=	yes
 CONFIGURE_ARGS+=	--with-kerberos=yes
 .if ${MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386} == ""
 REPLACE_KERBEROS_LIBS=	# defined
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index c2556b1e539..f8167c0741d 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/03/18 17:30:23 fredb Exp $
+# $NetBSD: Makefile,v 1.40.2.1 2002/06/23 18:51:16 jlam Exp $
 
 DISTNAME=       imap-2001a
 PKGNAME=        imap-uw-2001.1
@@ -23,6 +23,8 @@ DOC_DIR=	${PREFIX}/share/doc/imap-uw
 
 .if ${OPSYS} == "SunOS"
 ALL_TARGET=	gso
+.elif ${OPSYS} == "Linux"
+ALL_TARGET=     lrh
 .else
 ALL_TARGET=	neb
 .endif
diff --git a/mail/ja-mh/DESCR b/mail/ja-mh/DESCR
new file mode 100644
index 00000000000..93fd4d0f3fa
--- /dev/null
+++ b/mail/ja-mh/DESCR
@@ -0,0 +1,3 @@
+This is the MH mail user agent (reader/sender) with Japanese patches,
+a command line based mail reader that is powerful and extensible.  MH
+is an excellent choice for people who receive and process a LOT of mail.
diff --git a/mail/ja-mh/Makefile b/mail/ja-mh/Makefile
new file mode 100644
index 00000000000..061b6bb287c
--- /dev/null
+++ b/mail/ja-mh/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:51:18 jlam Exp $
+# FreeBSD Id: Makefile,v 1.13 1999/02/10 18:13:21 motoyuki Exp $
+
+DISTNAME=	mh-6.8.4-JP-3.03
+PKGNAME=	ja-mh6-3.03
+CATEGORIES=	japanese mail
+MASTER_SITES=	ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \
+		ftp://komadori.planet.sci.kobe-u.ac.jp/pub/MH/ \
+		ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/
+
+MAINTAINER=	tech-pkg-ja@jp.netbsd.org
+COMMENT=	Rand MH mail handling system + Japanese patches
+
+DEPENDS=	ja-less>=332:../../misc/ja-less
+
+CONFLICTS=	nmh-[0-9]* ja-mh-*_JP_*
+
+.include "../../mk/bsd.prefs.mk"
+
+MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	OBJECT_FMT=${OBJECT_FMT}
+CONFIGURE_ARGS= --enable-batchmode \
+		--libexecdir=${PREFIX}/libexec/mh \
+		--enable-jmandir=${PREFIX}/man/ja_JP.EUC \
+		--enable-apop=${PREFIX}/etc/pop.auth --enable-rpop
+
+post-install:
+	${LN} -sf libmh.so.3.2 ${PREFIX}/lib/libmh.so.3
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ja-mh/PLIST b/mail/ja-mh/PLIST
new file mode 100644
index 00000000000..5d48b6ce44b
--- /dev/null
+++ b/mail/ja-mh/PLIST
@@ -0,0 +1,176 @@
+@comment $NetBSD: PLIST,v 1.1.1.1.10.2 2002/06/23 18:51:18 jlam Exp $
+bin/ali
+bin/anno
+bin/bbc
+bin/burst
+bin/comp
+bin/dist
+bin/folder
+bin/folders
+bin/forw
+bin/inc
+bin/mark
+bin/mhmail
+bin/mhn
+bin/mhparam
+bin/mhpath
+bin/msgchk
+bin/msh
+bin/next
+bin/packf
+bin/pgped
+bin/pgpshow
+bin/pick
+bin/prev
+bin/prompter
+bin/refile
+bin/repl
+bin/rmf
+bin/rmm
+bin/scan
+bin/send
+bin/show
+bin/sortm
+bin/whatnow
+bin/whom
+lib/libmh.so
+lib/libmh.so.3
+lib/libmh.so.3.2
+libexec/mh/MailAliases
+libexec/mh/ap
+libexec/mh/components
+libexec/mh/conflict
+libexec/mh/digestcomps
+libexec/mh/distcomps
+libexec/mh/dp
+libexec/mh/fmtdump
+libexec/mh/forwcomps
+libexec/mh/install-mh
+libexec/mh/mhl
+libexec/mh/mhl.body
+libexec/mh/mhl.digest
+libexec/mh/mhl.format
+libexec/mh/mhl.forward
+libexec/mh/mhl.headers
+libexec/mh/mhn_defaults
+libexec/mh/mtstailor
+libexec/mh/packmbox
+libexec/mh/post
+libexec/mh/rcvdist
+libexec/mh/rcvdistcomps
+libexec/mh/rcvpack
+libexec/mh/rcvstore
+libexec/mh/rcvtty
+libexec/mh/replcomps
+libexec/mh/scan.default
+libexec/mh/scan.mailx
+libexec/mh/scan.size
+libexec/mh/scan.time
+libexec/mh/scan.timely
+libexec/mh/slocal
+libexec/mh/spost
+libexec/mh/tmac.h
+libexec/mh/viamail
+man/ja_JP.EUC/man1/ali.1
+man/ja_JP.EUC/man1/anno.1
+man/ja_JP.EUC/man1/bbc.1
+man/ja_JP.EUC/man1/burst.1
+man/ja_JP.EUC/man1/comp.1
+man/ja_JP.EUC/man1/dist.1
+man/ja_JP.EUC/man1/folder.1
+man/ja_JP.EUC/man1/forw.1
+man/ja_JP.EUC/man1/inc.1
+man/ja_JP.EUC/man1/mark.1
+man/ja_JP.EUC/man1/mh-chart.1
+man/ja_JP.EUC/man1/mh.1
+man/ja_JP.EUC/man1/mhl.1
+man/ja_JP.EUC/man1/mhmail.1
+man/ja_JP.EUC/man1/mhn.1
+man/ja_JP.EUC/man1/mhook.1
+man/ja_JP.EUC/man1/mhparam.1
+man/ja_JP.EUC/man1/mhpath.1
+man/ja_JP.EUC/man1/msgchk.1
+man/ja_JP.EUC/man1/msh.1
+man/ja_JP.EUC/man1/next.1
+man/ja_JP.EUC/man1/packf.1
+man/ja_JP.EUC/man1/pgped.1
+man/ja_JP.EUC/man1/pick.1
+man/ja_JP.EUC/man1/prev.1
+man/ja_JP.EUC/man1/prompter.1
+man/ja_JP.EUC/man1/rcvstore.1
+man/ja_JP.EUC/man1/refile.1
+man/ja_JP.EUC/man1/repl.1
+man/ja_JP.EUC/man1/rmf.1
+man/ja_JP.EUC/man1/rmm.1
+man/ja_JP.EUC/man1/scan.1
+man/ja_JP.EUC/man1/send.1
+man/ja_JP.EUC/man1/show.1
+man/ja_JP.EUC/man1/slocal.1
+man/ja_JP.EUC/man1/sortm.1
+man/ja_JP.EUC/man1/vmh.1
+man/ja_JP.EUC/man1/whatnow.1
+man/ja_JP.EUC/man1/whom.1
+man/ja_JP.EUC/man5/mh-alias.5
+man/ja_JP.EUC/man5/mh-format.5
+man/ja_JP.EUC/man5/mh-mail.5
+man/ja_JP.EUC/man5/mh-profile.5
+man/ja_JP.EUC/man5/mh-sequence.5
+man/ja_JP.EUC/man5/mh-tailor.5
+man/ja_JP.EUC/man8/ap.8
+man/ja_JP.EUC/man8/conflict.8
+man/ja_JP.EUC/man8/dp.8
+man/ja_JP.EUC/man8/fmtdump.8
+man/ja_JP.EUC/man8/install-mh.8
+man/ja_JP.EUC/man8/post.8
+man/man1/ali.1
+man/man1/anno.1
+man/man1/bbc.1
+man/man1/burst.1
+man/man1/comp.1
+man/man1/dist.1
+man/man1/folder.1
+man/man1/forw.1
+man/man1/inc.1
+man/man1/mark.1
+man/man1/mh-chart.1
+man/man1/mh.1
+man/man1/mhl.1
+man/man1/mhmail.1
+man/man1/mhn.1
+man/man1/mhook.1
+man/man1/mhparam.1
+man/man1/mhpath.1
+man/man1/msgchk.1
+man/man1/msh.1
+man/man1/next.1
+man/man1/packf.1
+man/man1/pgped.1
+man/man1/pick.1
+man/man1/prev.1
+man/man1/prompter.1
+man/man1/rcvstore.1
+man/man1/refile.1
+man/man1/repl.1
+man/man1/rmf.1
+man/man1/rmm.1
+man/man1/scan.1
+man/man1/send.1
+man/man1/show.1
+man/man1/slocal.1
+man/man1/sortm.1
+man/man1/vmh.1
+man/man1/whatnow.1
+man/man1/whom.1
+man/man5/mh-alias.5
+man/man5/mh-format.5
+man/man5/mh-mail.5
+man/man5/mh-profile.5
+man/man5/mh-sequence.5
+man/man5/mh-tailor.5
+man/man8/ap.8
+man/man8/conflict.8
+man/man8/dp.8
+man/man8/fmtdump.8
+man/man8/install-mh.8
+man/man8/post.8
+@dirrm libexec/mh
diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo
new file mode 100644
index 00000000000..548718f2922
--- /dev/null
+++ b/mail/ja-mh/distinfo
@@ -0,0 +1,22 @@
+$NetBSD: distinfo,v 1.1.1.1.8.2 2002/06/23 18:51:19 jlam Exp $
+
+SHA1 (mh-6.8.4-JP-3.03.tar.gz) = e533b22c23e79e8cba50ed2fe391f0f3b3ca332a
+Size (mh-6.8.4-JP-3.03.tar.gz) = 1567712 bytes
+SHA1 (patch-aa) = d38c2340f53ddfafb63857a7c6cbf95f8ba91cbf
+SHA1 (patch-ab) = 6ba17b9bb6844bbf5fc3d4edf268b7d671427438
+SHA1 (patch-ac) = aea3d9bdfb5faa42ec55af92c5b1d5cd74f3d42d
+SHA1 (patch-ad) = 5d1e3f54abbb114bf5d3c367de1b186b8dd39317
+SHA1 (patch-ae) = 183afc6c35c04912986bb3826d9d443b0aaacb7f
+SHA1 (patch-af) = 0f9dd68449f56039555253a8e1ba9a2923c5ef4e
+SHA1 (patch-ag) = 5e68e06be4ff523335900b2dd01defbe84cd725c
+SHA1 (patch-ah) = 3cabf8ae640fbce889dda69521453dc0a9e621f5
+SHA1 (patch-ai) = c9da909f7783f6600a21ac6f035b8df732275539
+SHA1 (patch-aj) = 418b6e60541558f2702393b89df76ad9edf1774f
+SHA1 (patch-ak) = 7f8442f265111a4b87393b3a64fd8692c23b379d
+SHA1 (patch-al) = 6f37a26a389689ca3b82900cf15ceea5b0f291ce
+SHA1 (patch-am) = 3cea349883c6e73d95844a44586d32c0046eb94c
+SHA1 (patch-an) = c879444e422531fc2c3d2a6bd4c52c9680239a5f
+SHA1 (patch-ao) = 4ad1798a6d4cdc2c977dd5186e9a111a4585df94
+SHA1 (patch-ap) = bde44e5f75ee1e124b5fff9679823e1ee2c313f0
+SHA1 (patch-aq) = e9399fe4a26005be428960666ac7ac437789aaa5
+SHA1 (patch-ar) = 3f9a0e510c9649ac07f07ef86f4a139bba1a5055
diff --git a/mail/ja-mh/patches/patch-aa b/mail/ja-mh/patches/patch-aa
new file mode 100644
index 00000000000..6dc2d7c1160
--- /dev/null
+++ b/mail/ja-mh/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1.1.1.10.2 2002/06/23 18:51:19 jlam Exp $
+
+--- ./sbr/m_getdefs.c.orig	Wed Dec  2 02:05:00 1998
++++ ./sbr/m_getdefs.c	Mon Nov  1 19:13:29 1999
+@@ -7,4 +7,7 @@
+ #include <stdio.h>
+ #include <errno.h>
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/mail/ja-mh/patches/patch-ab b/mail/ja-mh/patches/patch-ab
new file mode 100644
index 00000000000..cba9f843fcd
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1.10.2 2002/06/23 18:51:20 jlam Exp $
+
+--- ./sbr/refile.c.orig	Wed Dec  1 13:01:26 1993
++++ ./sbr/refile.c	Mon Nov  1 19:13:30 1999
+@@ -6,4 +6,7 @@
+ #include "../h/mh.h"
+ #include <stdio.h>
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ int     refile (arg, file)
diff --git a/mail/ja-mh/patches/patch-ac b/mail/ja-mh/patches/patch-ac
new file mode 100644
index 00000000000..f836f3d1d34
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1.10.2 2002/06/23 18:51:21 jlam Exp $
+
+--- ./sbr/remdir.c.orig	Fri Apr 24 06:02:00 1998
++++ ./sbr/remdir.c	Mon Nov  1 19:13:30 1999
+@@ -6,4 +6,7 @@
+ #include "../h/mh.h"
+ #include <stdio.h>
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ 
diff --git a/mail/ja-mh/patches/patch-ad b/mail/ja-mh/patches/patch-ad
new file mode 100644
index 00000000000..015d0552a43
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1.1.1.10.2 2002/06/23 18:51:21 jlam Exp $
+
+--- ./sbr/showfile.c.orig	Wed Dec  1 13:01:26 1993
++++ ./sbr/showfile.c	Mon Nov  1 19:13:30 1999
+@@ -3,4 +3,7 @@
+ #include "../h/mh.h"
+ #include <stdio.h>
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ 
diff --git a/mail/ja-mh/patches/patch-ae b/mail/ja-mh/patches/patch-ae
new file mode 100644
index 00000000000..9a15cc36599
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1.1.1.10.2 2002/06/23 18:51:22 jlam Exp $
+
+--- ./uip/inc.c.orig	Fri Sep 10 02:10:53 1999
++++ ./uip/inc.c	Mon Nov  1 19:13:30 1999
+@@ -38,4 +38,7 @@
+ #include	<locale.h>
+ #endif
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ /*  */
diff --git a/mail/ja-mh/patches/patch-af b/mail/ja-mh/patches/patch-af
new file mode 100644
index 00000000000..7fedf057c6a
--- /dev/null
+++ b/mail/ja-mh/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1.1.1.10.2 2002/06/23 18:51:22 jlam Exp $
+
+--- ./uip/mhlsbr.c.orig	Tue Feb  9 20:30:00 1999
++++ ./uip/mhlsbr.c	Mon Nov  1 19:13:30 1999
+@@ -21,4 +21,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ 
diff --git a/mail/ja-mh/patches/patch-ag b/mail/ja-mh/patches/patch-ag
new file mode 100644
index 00000000000..07a28e9b1af
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1.1.1.10.2 2002/06/23 18:51:23 jlam Exp $
+
+--- ./uip/mhn.c.orig	Tue Feb  9 20:30:00 1999
++++ ./uip/mhn.c	Mon Nov  1 19:13:30 1999
+@@ -19,4 +19,7 @@
+ #include	<locale.h>
+ #endif
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ /*  */
diff --git a/mail/ja-mh/patches/patch-ah b/mail/ja-mh/patches/patch-ah
new file mode 100644
index 00000000000..3941e035a55
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1.1.1.10.2 2002/06/23 18:51:23 jlam Exp $
+
+--- ./uip/rcvtty.c.orig	Tue Feb  9 20:30:00 1999
++++ ./uip/rcvtty.c	Mon Nov  1 19:13:30 1999
+@@ -30,4 +30,7 @@
+ #include	<locale.h>
+ #endif
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ /*  */
diff --git a/mail/ja-mh/patches/patch-ai b/mail/ja-mh/patches/patch-ai
new file mode 100644
index 00000000000..ba23ad1a968
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1.1.1.10.2 2002/06/23 18:51:24 jlam Exp $
+
+--- ./uip/replsbr.c.orig	Fri Sep 10 13:51:41 1999
++++ ./uip/replsbr.c	Mon Nov  1 19:13:30 1999
+@@ -11,4 +11,7 @@
+ #include <sys/types.h>		/* off_t */
+ #include <sys/file.h>		/* L_SET */
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ 
diff --git a/mail/ja-mh/patches/patch-aj b/mail/ja-mh/patches/patch-aj
new file mode 100644
index 00000000000..0c008448f43
--- /dev/null
+++ b/mail/ja-mh/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1.1.1.10.2 2002/06/23 18:51:24 jlam Exp $
+
+--- ./uip/sendsbr.c.orig	Tue Feb  9 20:30:00 1999
++++ ./uip/sendsbr.c	Mon Nov  1 19:13:30 1999
+@@ -10,4 +10,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ static		alert(), anno(), annoaux();
diff --git a/mail/ja-mh/patches/patch-ak b/mail/ja-mh/patches/patch-ak
new file mode 100644
index 00000000000..cf4ecb27bae
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1.1.1.10.2 2002/06/23 18:51:25 jlam Exp $
+
+--- ./uip/spost.c.orig	Wed Dec  2 02:05:00 1998
++++ ./uip/spost.c	Mon Nov  1 19:13:30 1999
+@@ -23,4 +23,7 @@
+ #include	<locale.h>
+ #endif
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ extern char *getfullname (), *getusr ();
diff --git a/mail/ja-mh/patches/patch-al b/mail/ja-mh/patches/patch-al
new file mode 100644
index 00000000000..1f906218ed2
--- /dev/null
+++ b/mail/ja-mh/patches/patch-al
@@ -0,0 +1,39 @@
+$NetBSD: patch-al,v 1.1.1.1.10.2 2002/06/23 18:51:26 jlam Exp $
+
+--- ./uip/vmh.c.orig	Tue Feb  9 20:30:00 1999
++++ ./uip/vmh.c	Tue Feb 29 23:19:05 2000
+@@ -23,6 +23,9 @@
+ 	If curses ever gets fixed, then XYZ code can be removed
+  */
+ 
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ #ifdef __osf__
+ #define _BSD
+ #endif
+@@ -85,9 +88,15 @@
+ #define	_maxy	maxy
+ #define	_curx	curx		/* curses.h */
+ #define	_cury	cury
++#ifndef __NetBSD__
+ void     __cputchar __P((int));
++#endif
+ #undef	_putchar
++#ifdef	BSD44
++#define	_putchar	__cputchar
++#else
+ #define	_putchar	(int (*)()) __cputchar
++#endif
+ #include <sys/ioctl.h>		/* sgttyb */
+ #endif /* !__NCURSES_H && (BSD44 || linux) */
+ 
+@@ -1509,7 +1518,7 @@
+             tpgrp;
+     TYPESIG     (*tstat) ();
+ 
+-    if ((pgrp = getpgrp (0)) == NOTOK)
++    if ((pgrp = getpgrp (/*0*/)) == NOTOK)
+ 	adios ("process group", "unable to determine");
+     for (;;) {
+ 	if (ioctl (fileno (stdin), TIOCGPGRP, (char *) &tpgrp) == NOTOK)
diff --git a/mail/ja-mh/patches/patch-am b/mail/ja-mh/patches/patch-am
new file mode 100644
index 00000000000..3774d02159f
--- /dev/null
+++ b/mail/ja-mh/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1.1.1.10.2 2002/06/23 18:51:27 jlam Exp $
+
+--- ./uip/vmhtest.c.orig	Fri Apr 24 06:02:00 1998
++++ ./uip/vmhtest.c	Mon Nov  1 19:13:30 1999
+@@ -11,4 +11,7 @@
+ #include	<locale.h>
+ #endif
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ /*  */
diff --git a/mail/ja-mh/patches/patch-an b/mail/ja-mh/patches/patch-an
new file mode 100644
index 00000000000..acd0e8cc9b2
--- /dev/null
+++ b/mail/ja-mh/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1.1.1.10.2 2002/06/23 18:51:27 jlam Exp $
+
+--- ./uip/whatnowsbr.c.orig	Tue Feb  9 20:30:00 1999
++++ ./uip/whatnowsbr.c	Mon Nov  1 19:13:30 1999
+@@ -9,4 +9,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ #ifndef	MIME
diff --git a/mail/ja-mh/patches/patch-ao b/mail/ja-mh/patches/patch-ao
new file mode 100644
index 00000000000..946625a35ec
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ao
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1.1.1.10.2 2002/06/23 18:51:27 jlam Exp $
+
+--- ./uip/wmh.c.orig	Fri Apr 24 06:02:00 1998
++++ ./uip/wmh.c	Mon Nov  1 19:13:30 1999
+@@ -29,4 +29,7 @@
+ #include	<locale.h>
+ #endif
++#ifdef	UNISTD
++#include <unistd.h>
++#endif
+ 
+ 
diff --git a/mail/ja-mh/patches/patch-ap b/mail/ja-mh/patches/patch-ap
new file mode 100644
index 00000000000..637710876e6
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1.1.1.10.2 2002/06/23 18:51:28 jlam Exp $
+
+--- ./configure.in.orig	Fri Oct  1 23:01:15 1999
++++ ./configure.in	Mon Nov  1 19:08:09 1999
+@@ -354,4 +354,8 @@
+ 	fi
+       fi
++      if test "$OBJECT_FMT" = ELF
++      then
++	sharedlib=gnuelf
++      fi
+       slflags="-fpic"
+       slibdir=$libdir
diff --git a/mail/ja-mh/patches/patch-aq b/mail/ja-mh/patches/patch-aq
new file mode 100644
index 00000000000..6251d4816d6
--- /dev/null
+++ b/mail/ja-mh/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1.1.1.10.2 2002/06/23 18:51:28 jlam Exp $
+
+--- ./configure.orig	Fri Oct  1 23:01:45 1999
++++ ./configure	Mon Nov  1 19:08:09 1999
+@@ -1386,4 +1386,8 @@
+ 	fi
+       fi
++      if test "$OBJECT_FMT" = ELF
++      then
++        sharedlib=gnuelf  
++      fi
+       slflags="-fpic"
+       slibdir=$libdir
diff --git a/mail/ja-mh/patches/patch-ar b/mail/ja-mh/patches/patch-ar
new file mode 100644
index 00000000000..97d2dc9677c
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ar
@@ -0,0 +1,14 @@
+$NetBSD: patch-ar,v 1.1.1.1.10.2 2002/06/23 18:51:28 jlam Exp $
+
+--- ./zotnet/mts/client.c.orig	Fri Sep 10 14:47:56 1999
++++ ./zotnet/mts/client.c	Tue Feb 29 22:38:35 2000
+@@ -360,7 +360,8 @@
+ /* taken from ISODE's compat/internet.c */
+ 
+ #if !defined(SOLARIS) && !defined(linux) && !defined(__bsdi__) && \
+-	!defined(OSF1) && !defined(__osf__) && !defined(__FreeBSD__)
++	!defined(OSF1) && !defined(__osf__) && !defined(__FreeBSD__) && \
++	!defined(__NetBSD__)
+ #ifndef	DG
+ #ifndef __alpha
+ u_long	inet_addr ();
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index dad3c7ede8c..d34623170a3 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2002/04/25 15:26:02 yyamano Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:51:29 jlam Exp $
 
-DISTNAME=	maildrop-1.3.7
+DISTNAME=	maildrop-1.3.9
 COMMENT=	Courier mail delivery agent with filtering abilities
 HOMEPAGE=	http://www.flounder.net/~mrsam/maildrop/
 
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 8b39717ea00..cdc92c82f6b 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/01/22 22:09:41 jlam Exp $
+$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:51:30 jlam Exp $
 
-SHA1 (maildrop-1.3.7.tar.gz) = d41280e4c0805e8d08a33e5a04de3cd19b2490ad
-Size (maildrop-1.3.7.tar.gz) = 632478 bytes
+SHA1 (maildrop-1.3.9.tar.gz) = 6d91ae5b93bc0eb93801dd095f8e6e1151936e5c
+Size (maildrop-1.3.9.tar.gz) = 635022 bytes
 SHA1 (patch-aa) = 1c5c62ccbd1b69a4aaf68d81f095171b2c369e7b
diff --git a/mail/mailsync/DESCR b/mail/mailsync/DESCR
new file mode 100644
index 00000000000..9bbfc738242
--- /dev/null
+++ b/mail/mailsync/DESCR
@@ -0,0 +1,5 @@
+Mailsync is a way of synchronizing a collection of mailboxes. The algorithm is
+a 3-way diff. Two mailboxes are simultaneously compared to a record of the
+state of both mailboxes at last sync. New messages and message deletions are
+propagated between the two mailboxes. If you're familiar with CVS, it's the
+same principle, except there's no opportunity for conflicts.
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
new file mode 100644
index 00000000000..43d28f9f05d
--- /dev/null
+++ b/mail/mailsync/Makefile
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.3.2.2 2002/06/23 18:51:31 jlam Exp $
+#
+
+DISTNAME=	mailsync_4.3-2
+PKGNAME=	mailsync-4.3.2
+CATEGORIES=	mail
+MASTER_SITES=	http://unc.dl.sourceforge.net/mailsync/
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://mailsync.sourceforge.net/
+COMMENT=	Mailsync is a way of synchronizing a collection of mailboxes
+
+DEPENDS+=	imap-uw-[0-9]*:../../mail/imap-uw
+
+USE_GMAKE=	yes
+ALL_TARGET=	default
+
+WRKSRC=		${WRKDIR}/mailsync-4.3
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/mailsync ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailsync
+	${INSTALL_DATA} ${WRKSRC}/examples/mailsync				\
+		${PREFIX}/share/examples/mailsync/dot.mailsync
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailsync
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mailsync
+	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/mailsync
+	${INSTALL_MAN} ${WRKSRC}/mailsync.1 ${PREFIX}/man/man1
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailsync/PLIST b/mail/mailsync/PLIST
new file mode 100644
index 00000000000..05014f4d530
--- /dev/null
+++ b/mail/mailsync/PLIST
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.1.1.1.10.2 2002/06/23 18:51:32 jlam Exp $
+bin/mailsync
+man/man1/mailsync.1
+share/doc/mailsync/README
+share/doc/mailsync/WHATSNEW
+share/examples/mailsync/dot.mailsync
+@dirrm share/examples/mailsync
+@dirrm share/doc/mailsync
diff --git a/mail/mailsync/distinfo b/mail/mailsync/distinfo
new file mode 100644
index 00000000000..217f61de349
--- /dev/null
+++ b/mail/mailsync/distinfo
@@ -0,0 +1,5 @@
+
+
+SHA1 (mailsync_4.3-2.tar.gz) = 239f58aeb98718de347c1b53682fb6add156b7e3
+Size (mailsync_4.3-2.tar.gz) = 20257 bytes
+SHA1 (patch-aa) = c408109d2b299703d35a6694c988884c53fbdc3e
diff --git a/mail/mailsync/patches/patch-aa b/mail/mailsync/patches/patch-aa
new file mode 100644
index 00000000000..eedc7bc7413
--- /dev/null
+++ b/mail/mailsync/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:51:34 jlam Exp $
+
+--- Makefile.orig	Mon Apr 15 20:26:35 2002
++++ Makefile
+@@ -1,12 +1,12 @@
+ # compiling with g++-3 worked for me with the commented ## lines - tpo
+ 
+ # path to c-client headers
+-C = /usr/include/c-client
++C = ${PREFIX}/include/c-client
+ ##C = /usr/include/c-client -I/usr/include/g++-v3/
+ 
+ # path to c-client library
+ # linking dynamically
+-CCLIENTLIB = /usr/lib/libc-client.so
++CCLIENTLIB = ${PREFIX}/lib/libc-client.so
+ # linkging statically
+ #CCLIENTLIB = ../imap-2001a/c-client/c-client.a
+ 
+@@ -15,10 +15,10 @@
+ ##CC = g++-3.0
+ 
+ # flags for your compiler
+-CFLAGS = -g  -O2 -Wall -I$(C) 
++CFLAGS += -Wall -I$(C) 
+ 
+ # required libraries
+-LDFLAGS = -lm -lssl
++LDFLAGS = -Wl,-R${PREFIX}/lib -lm -lssl -lcrypto
+ # if your system requires pam to access crypt() you have to link pam in
+ #LDFLAGS = -lm -lssl -lpam
+ 
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index dba89a271f4..7fad5b4f3d8 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:20 jlam Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2002/06/23 18:51:35 jlam Exp $
 
 DISTNAME=	mm2.7
-PKGNAME=	mm-2.7
+PKGNAME=	metamail-2.7
 CATEGORIES=	mail
 MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Implementation of MIME, the Multipurpose Internet Mail Extensions
 
-CONFLICTS+=	elm>=2.5.5
+CONFLICTS+=	elm>=2.5.5 mm-2.7
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK_ONLY=	YES
diff --git a/mail/mush/distinfo b/mail/mush/distinfo
index 397f3289e91..8c697026354 100644
--- a/mail/mush/distinfo
+++ b/mail/mush/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/03/16 12:26:00 wiz Exp $
+$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:51:35 jlam Exp $
 
 SHA1 (mush/mush-7.2.5.tar.Z) = 1b9b54b368b9a748401b1baeb3b3eba5a9ed2c03
 Size (mush/mush-7.2.5.tar.Z) = 496317 bytes
@@ -29,3 +29,4 @@ SHA1 (patch-aj) = fee38b6e855a6494ecef0e41e2602850d1b58746
 SHA1 (patch-ak) = 47a3a7dc405a654db3a7d76f80d71af98e9501cb
 SHA1 (patch-al) = 4d0c9ff2a6a8c3c1d59a81b659ed3599881cc762
 SHA1 (patch-am) = 2af4636ebd0168d06711abff5f05ffbf0e1868a8
+SHA1 (patch-an) = a750c02339df8a161f3c3c8cf33aa6411f1aa2bd
diff --git a/mail/mush/patches/patch-an b/mail/mush/patches/patch-an
new file mode 100644
index 00000000000..d6c838999e2
--- /dev/null
+++ b/mail/mush/patches/patch-an
@@ -0,0 +1,33 @@
+$NetBSD: patch-an,v 1.1.2.2 2002/06/23 18:51:37 jlam Exp $
+
+--- curses.c.orig	Mon Jun  3 14:50:56 2002
++++ curses.c	Mon Jun  3 14:47:48 2002
+@@ -11,11 +11,6 @@
+ {
+     char buf[80];
+     extern char *UP;
+-#ifndef M_UNIX
+-#ifndef BSD44
+-    extern char ttytype[];
+-#endif
+-#endif /* M_UNIX */
+ 
+     if (argv && *++argv && !strcmp(*argv, "-?"))
+ 	return help(0, "curses", cmd_help);
+@@ -57,12 +52,15 @@
+     (void) signal(SIGTSTP, stop_start);
+     (void) signal(SIGCONT, stop_start);
+ #endif /* SIGCONT */
+-#if !defined(SYSV) && !defined(USG) && !defined(__NCURSES_H)
++#if !defined(SYSV) && !defined(USG)
+     if (!UP || !*UP)
+ #else /* ~SYSV && ~USG */
+     if (!stdscr)
+ #endif /* ~SYSV && ~USG */
+ 		 {
++	char *ttytype = getenv("TERM");
++	if (ttytype == NULL)
++	    ttytype = "*unknown*";
+ 	print("Terminal type %s can not use the curses interface.\n", ttytype);
+ 	return -1;
+     }
diff --git a/mail/mutt-devel/DESCR b/mail/mutt-devel/DESCR
deleted file mode 100644
index 60af96672d3..00000000000
--- a/mail/mutt-devel/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The Mutt E-Mail Client by Michael Elkins <me@cs.hmc.edu>
-
-``All mail clients suck.  This one just sucks less.'' -me, circa 1995
-
-Mutt is a small but very powerful text-based MIME mail client.Mutt
-is highly configurable, and is well suited to the mail power user with
-advanced features like key bindings, keyboard macros, mail threading,
-regular expression searches and a powerful pattern matching language
-for selecting groups of messages.
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
deleted file mode 100644
index 796d2edff25..00000000000
--- a/mail/mutt-devel/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2002/05/04 00:37:02 grant Exp $
-
-DISTNAME=		mutt-1.3.99i
-PKGNAME=		${DISTNAME:C/i$//}
-CATEGORIES=		mail
-MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/
-
-MAINTAINER=		tron@netbsd.org
-HOMEPAGE=		http://www.mutt.org/
-COMMENT=		text-based MIME mail client with PGP support
-
-USE_BUILDLINK_ONLY=	YES
-
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
-
-BUILD_USES_MSGFMT=	YES
-
-USE_GMAKE=		YES
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
-			--with-docdir=${PREFIX}/share/doc/mutt \
-			--without-included-gettext \
-			--enable-pop --enable-imap
-
-LDFLAGS+=		${_STRIPFLAG_CC}
-WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(MUTT_USE_SLANG) && ${MUTT_USE_SLANG} != NO
-.include "../../devel/libslang/buildlink.mk"
-CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_DIR}
-.else
-.include "../../devel/ncurses/buildlink.mk"
-CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_DIR}
-.endif
-
-# There seems to be a problem using NetBSD's /bin/sh, so use /bin/ksh instead.
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
-.endif
-
-MUTT_USE_SSL?=		YES
-
-.if defined(MUTT_USE_SSL) && ${MUTT_USE_SSL} == "YES"
-.include "../../security/openssl/buildlink.mk"
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
-.else
-CONFIGURE_ARGS+=	--without-ssl
-.endif
-
-BUILD_DEFS+=		MUTT_USE_SLANG MUTT_USE_SSL
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-
-EGDIR=			${PREFIX}/share/doc/mutt/samples
-CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
-SUPPORT_FILES=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/share/doc/mutt/samples
-	${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/share/doc/mutt/samples
-
-.include "../../converters/libiconv/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../mk/bsd.pkg.install.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
deleted file mode 100644
index 0f70ae0d50c..00000000000
--- a/mail/mutt-devel/PLIST
+++ /dev/null
@@ -1,94 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/02 09:07:45 tron Exp $
-bin/flea
-bin/mutt
-bin/muttbug
-bin/pgpewrap
-bin/pgpring
-man/man1/flea.1
-man/man1/mutt.1
-man/man1/mutt_dotlock.1
-man/man1/muttbug.1
-man/man5/mbox.5
-man/man5/muttrc.5
-share/doc/mutt/COPYRIGHT
-share/doc/mutt/ChangeLog
-share/doc/mutt/GPL
-share/doc/mutt/INSTALL
-share/doc/mutt/NEWS
-share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/README
-share/doc/mutt/README.SECURITY
-share/doc/mutt/README.SSL
-share/doc/mutt/TODO
-share/doc/mutt/applying-patches.txt
-share/doc/mutt/devel-notes.txt
-share/doc/mutt/html/manual-1.html
-share/doc/mutt/html/manual-2.html
-share/doc/mutt/html/manual-3.html
-share/doc/mutt/html/manual-4.html
-share/doc/mutt/html/manual-5.html
-share/doc/mutt/html/manual-6.html
-share/doc/mutt/html/manual-7.html
-share/doc/mutt/html/manual.html
-share/doc/mutt/manual.txt
-share/doc/mutt/patch-notes.txt
-share/doc/mutt/samples/Mush.rc
-share/doc/mutt/samples/Muttrc
-share/doc/mutt/samples/Pine.rc
-share/doc/mutt/samples/Tin.rc
-share/doc/mutt/samples/gpg.rc
-share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
-share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
-share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
-share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
-share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
-share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
-share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
-share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
-share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
-share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
-share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
-share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
-share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
-share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
-share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
-share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
-share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
-share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
-share/doc/mutt/samples/mime.types
-share/doc/mutt/samples/pgp2.rc
-share/doc/mutt/samples/pgp5.rc
-share/doc/mutt/samples/pgp6.rc
-share/doc/mutt/samples/sample.mailcap
-share/doc/mutt/samples/sample.muttrc
-share/doc/mutt/samples/sample.muttrc-tlr
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mutt.mo
-@dirrm share/doc/mutt/samples/iconv
-@dirrm share/doc/mutt/samples
-@dirrm share/doc/mutt/html
-@dirrm share/doc/mutt
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
deleted file mode 100644
index f4d78663873..00000000000
--- a/mail/mutt-devel/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.15 2002/05/04 00:37:02 grant Exp $
-
-SHA1 (mutt-1.3.99i.tar.gz) = 937e4b7de4121e8c6b60b9630a4f7fdf4e1aa905
-Size (mutt-1.3.99i.tar.gz) = 2553143 bytes
-SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c
-SHA1 (patch-ab) = 24984804280b5db991a2a471eba39506369add70
-SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2
-SHA1 (patch-ad) = 919093aa2162d8f7fd52d476d0c6835447f236d5
-SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
diff --git a/mail/mutt-devel/patches/patch-aa b/mail/mutt-devel/patches/patch-aa
deleted file mode 100644
index 8de5aee9a98..00000000000
--- a/mail/mutt-devel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/07/22 15:24:10 tron Exp $
-
---- intl/Makefile.in.orig	Thu Jun  7 22:00:05 2001
-+++ intl/Makefile.in	Sun Jul 22 16:58:54 2001
-@@ -31,7 +31,7 @@
- libdir = @libdir@
- includedir = @includedir@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(datadir)/gettext/intl
- aliaspath = $(localedir)
- subdir = intl
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
deleted file mode 100644
index 5df4b053502..00000000000
--- a/mail/mutt-devel/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/07/22 13:37:13 tron Exp $
-
---- doc/Makefile.in.orig	Mon Jun  4 19:14:32 2001
-+++ doc/Makefile.in	Sun Jul 22 15:09:17 2001
-@@ -29,7 +29,7 @@
- CPPFLAGS = @CPPFLAGS@
- 
- DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
--INCLUDES = -I. -I.. -I$(includedir) -I$(top_srcdir)
-+INCLUDES = -I. -I.. -I$(top_srcdir)
- 
- MAKEDOC_CPP = $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
- 
diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac
deleted file mode 100644
index 9110d76dfc3..00000000000
--- a/mail/mutt-devel/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/01/02 09:07:46 tron Exp $
-
---- po/Makefile.in.in.orig	Tue Jan  1 21:17:15 2002
-+++ po/Makefile.in.in	Wed Jan  2 09:54:40 2002
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/mail/mutt-devel/patches/patch-ad b/mail/mutt-devel/patches/patch-ad
deleted file mode 100644
index 0cd92ebce72..00000000000
--- a/mail/mutt-devel/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2002/01/30 23:03:25 jlam Exp $
-
---- Makefile.in.orig	Wed Jan 30 17:50:34 2002
-+++ Makefile.in	Wed Jan 30 17:56:07 2002
-@@ -144,7 +144,7 @@
- 
- INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
- 
--CPPFLAGS = @CPPFLAGS@ -I$(includedir)
-+CPPFLAGS = @CPPFLAGS@
- 
- non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c 	pgpmicalg.c gnupgparse.c sha1.h 	doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes.txt 	OPS.MIX remailer.c remailer.h pgpewrap.c		contrib/pgp2.rc contrib/pgp5.rc contrib/gpg.rc 	mutt_ssl.c mutt_ssl.h README.SSL mutt_ssl_nss.c 	pgppacket.c pgppacket.h
- 
diff --git a/mail/mutt-devel/patches/patch-ae b/mail/mutt-devel/patches/patch-ae
deleted file mode 100644
index b678a8fb6b9..00000000000
--- a/mail/mutt-devel/patches/patch-ae
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/04/16 08:34:29 tron Exp $
-
---- contrib/gpg.rc.orig	Tue Dec 11 10:33:57 2001
-+++ contrib/gpg.rc	Tue Apr 16 10:28:08 2002
-@@ -31,44 +31,44 @@
- # breaking PGP/MIME.
- 
- # decode application/pgp
--set pgp_decode_command="/usr/bin/gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
-+set pgp_decode_command="gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
- 
- # verify a pgp/mime signature
--set pgp_verify_command="/usr/bin/gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
-+set pgp_verify_command="gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
- 
- # decrypt a pgp/mime attachment
--set pgp_decrypt_command="/usr/bin/gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
-+set pgp_decrypt_command="gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
- 
- # create a pgp/mime signed attachment
--# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
--set pgp_sign_command="/usr/bin/gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-+# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-+set pgp_sign_command="gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
- 
- # create a application/pgp signed (old-style) message
--# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
--set pgp_clearsign_command="/usr/bin/gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-+# set pgp_clearsign_command="gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-+set pgp_clearsign_command="gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
- 
- # create a pgp/mime encrypted attachment
- # set pgp_encrypt_only_command="pgpewrap gpg-2comp  -v --batch  --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
--set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-+set pgp_encrypt_only_command="pgpewrap gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
- 
- # create a pgp/mime encrypted and signed attachment
- # set pgp_encrypt_sign_command="pgpewrap gpg-2comp  --passphrase-fd 0 -v --batch  --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
--set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-+set pgp_encrypt_sign_command="pgpewrap gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
- 
- # import a key into the public key ring
--set pgp_import_command="/usr/bin/gpg  --no-verbose --import -v %f"
-+set pgp_import_command="gpg  --no-verbose --import -v %f"
- 
- # export a key from the public key ring
--set pgp_export_command="/usr/bin/gpg   --no-verbose --export --armor %r"
-+set pgp_export_command="gpg   --no-verbose --export --armor %r"
- 
- # verify a key
--set pgp_verify_key_command="/usr/bin/gpg   --verbose --batch  --fingerprint --check-sigs %r"
-+set pgp_verify_key_command="gpg   --verbose --batch  --fingerprint --check-sigs %r"
- 
- # read in the public key ring
--set pgp_list_pubring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
-+set pgp_list_pubring_command="gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
- 
- # read in the secret key ring
--set pgp_list_secring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
-+set pgp_list_secring_command="gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
- 
- # fetch keys
- # set pgp_getkeys_command="pkspxycwrap %r"
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 43ac4b48fbf..4212074fe9a 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.78 2002/03/23 17:50:18 yyamano Exp $
+# $NetBSD: Makefile,v 1.78.2.1 2002/06/23 18:51:37 jlam Exp $
 
-DISTNAME=		mutt-1.2.5.1
+DISTNAME=		mutt-1.4i
+PKGNAME=		${DISTNAME:C/i$//}
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/ \
-			ftp://ftp.funet.fi/pub/unix/mail/mutt/ \
-			ftp://ftp.uib.no/pub/mutt/ \
-			ftp://uiarchive.cso.uiuc.edu/pub/packages/mail/mutt/
+			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
+			ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
+			ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/
 
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.mutt.org/
@@ -21,39 +22,47 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--with-docdir=${PREFIX}/share/doc/mutt \
 			--without-included-gettext \
 			--enable-pop --enable-imap
-CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_DIR}
 
 LDFLAGS+=		${_STRIPFLAG_CC}
 WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${MUTT_USE_SLANG} == YES
+. include "../../devel/libslang/buildlink.mk"
+CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_DIR}
+.else
+. if ${MUTT_USE_NCURSES} == YES
+USE_NCURSES=		YES
+. endif
+. include "../../devel/ncurses/buildlink.mk"
+CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_DIR}
+.endif
+
 # There seems to be a problem using NetBSD's /bin/sh, so use /bin/ksh instead.
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 .endif
 
-MUTT_USE_SSL?=		YES
-
-.if defined(MUTT_USE_SSL) && ${MUTT_USE_SSL} == "YES"
+.if ${MUTT_USE_SSL} == YES
 .include "../../security/openssl/buildlink.mk"
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
 
-BUILD_DEFS+=		MUTT_USE_SSL
+BUILD_DEFS+=		MUTT_USE_NCURSES MUTT_USE_SLANG MUTT_USE_SSL
+MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 EGDIR=			${PREFIX}/share/doc/mutt/samples
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
 SUPPORT_FILES=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 
 post-install:
-	${TOUCH} ${TOUCH_FLAGS} ${PREFIX}/share/mutt/.directory
 	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/share/doc/mutt/samples
 	${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/share/doc/mutt/samples
 
+.include "../../converters/libiconv/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/ncurses/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index f74b814a680..18dfc1a077b 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:37 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:51:39 jlam Exp $
+bin/flea
 bin/mutt
 bin/muttbug
 bin/pgpewrap
 bin/pgpring
+man/man1/flea.1
 man/man1/mutt.1
 man/man1/mutt_dotlock.1
+man/man1/muttbug.1
+man/man5/mbox.5
 man/man5/muttrc.5
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
@@ -15,7 +19,6 @@ share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/README
 share/doc/mutt/README.SECURITY
 share/doc/mutt/README.SSL
-share/doc/mutt/README.UPGRADE
 share/doc/mutt/TODO
 share/doc/mutt/applying-patches.txt
 share/doc/mutt/devel-notes.txt
@@ -28,11 +31,30 @@ share/doc/mutt/html/manual-6.html
 share/doc/mutt/html/manual-7.html
 share/doc/mutt/html/manual.html
 share/doc/mutt/manual.txt
+share/doc/mutt/patch-notes.txt
 share/doc/mutt/samples/Mush.rc
 share/doc/mutt/samples/Muttrc
 share/doc/mutt/samples/Pine.rc
 share/doc/mutt/samples/Tin.rc
 share/doc/mutt/samples/gpg.rc
+share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
+share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
+share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
+share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
 share/doc/mutt/samples/mime.types
 share/doc/mutt/samples/pgp2.rc
 share/doc/mutt/samples/pgp5.rc
@@ -40,27 +62,33 @@ share/doc/mutt/samples/pgp6.rc
 share/doc/mutt/samples/sample.mailcap
 share/doc/mutt/samples/sample.muttrc
 share/doc/mutt/samples/sample.muttrc-tlr
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
-share/mutt/.directory
-@dirrm share/mutt
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mutt.mo
+@dirrm share/doc/mutt/samples/iconv
 @dirrm share/doc/mutt/samples
 @dirrm share/doc/mutt/html
 @dirrm share/doc/mutt
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 79d83f12c80..b017d8a2824 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,16 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/01/02 08:36:56 tron Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:51:39 jlam Exp $
 
-SHA1 (mutt-1.2.5.1.tar.gz) = f9f3350ef0235b3cd3a9545e0e47b3d093202eb1
-Size (mutt-1.2.5.1.tar.gz) = 1971618 bytes
-SHA1 (patch-aa) = a9bdda21066863ef5e35a6a8091857c5dcd92855
-SHA1 (patch-ab) = 69a920da48038c80ff8d74ee8de8e9bcde331c34
-SHA1 (patch-ac) = c12ec2a2c79271e0abc9369c517af574dc5d104c
-SHA1 (patch-ad) = 7cee44d56f4a06e8f375fc0ba4ca0f67e992291c
-SHA1 (patch-ae) = 4c956d8c0181025e99942ca688b3df7b4a27b1f7
-SHA1 (patch-af) = 7504e8226f3974aa4fcc76f0b13b79e4044073a6
-SHA1 (patch-ag) = 99c2393ff5d2be47e889ee9ab6ed6ec058ebf4cc
-SHA1 (patch-ah) = 36004ff9b20a3cf119c6163467f587c51a1d1e36
-SHA1 (patch-ai) = f1a3c47666dd308e4d8938939a50a5553220f736
-SHA1 (patch-aj) = 36f20c476b695bb88378aa02326bfdef77695111
-SHA1 (patch-ak) = c71e21bdd2e5c194ee2f8f619737d3cc0b4c4d5c
-SHA1 (patch-al) = 6516789c92fcbf11a8cb0da17cc67d4698e5f3ad
+SHA1 (mutt-1.4i.tar.gz) = 6b7fb8440de18f12ceb24a486a1bbe77fce93955
+Size (mutt-1.4i.tar.gz) = 2554158 bytes
+SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c
+SHA1 (patch-ab) = 24984804280b5db991a2a471eba39506369add70
+SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2
+SHA1 (patch-ad) = 919093aa2162d8f7fd52d476d0c6835447f236d5
+SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa
index 50800884823..5152e202780 100644
--- a/mail/mutt/patches/patch-aa
+++ b/mail/mutt/patches/patch-aa
@@ -1,40 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2000/05/20 18:41:38 kim Exp $
+$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:51:40 jlam Exp $
 
---- alias.c	2000/03/04 08:40:52	2.11
-+++ alias.c	2000/05/20 07:30:10
-@@ -20,7 +20,6 @@
- #include "mutt_regex.h"
- #include "mutt_curses.h"
- 
--#include <pwd.h>
- #include <string.h>
- 
- ADDRESS *mutt_lookup_alias (const char *s)
-@@ -86,22 +85,11 @@
- 
- 	if (pw)
- 	{
--           regmatch_t pat_match[1];
--
--           /* Use regular expression to parse Gecos field.  This result of the
--            * parsing will be used as the personal ID string when the alias is
--            * expanded.
--            */
--	  if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
--	  {
--	    /* Malloc enough for the matching pattern + terminating NULL */
--	    a->personal = safe_malloc ((pat_match[0].rm_eo - 
--					pat_match[0].rm_so) + 1);
--	    
--	    strfcpy (a->personal, pw->pw_gecos + pat_match[0].rm_so, 
--		     pat_match[0].rm_eo - pat_match[0].rm_so + 1);
--	  }
--
-+	  char namebuf[STRING];
-+	  
-+	  mutt_gecos_name (namebuf, sizeof (namebuf), pw);
-+	  mutt_str_replace (&a->personal, namebuf);
-+	  
- #ifdef EXACT_ADDRESS
- 	  FREE (&a->val);
- #endif
+--- intl/Makefile.in.orig	Thu Jun  7 22:00:05 2001
++++ intl/Makefile.in	Sun Jul 22 16:58:54 2001
+@@ -31,7 +31,7 @@
+ libdir = @libdir@
+ includedir = @includedir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(datadir)/gettext/intl
+ aliaspath = $(localedir)
+ subdir = intl
diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab
index f1416f0b6b7..dce72555413 100644
--- a/mail/mutt/patches/patch-ab
+++ b/mail/mutt/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2000/05/20 18:41:40 kim Exp $
+$NetBSD: patch-ab,v 1.6.2.1 2002/06/23 18:51:41 jlam Exp $
 
---- browser.c	2000/04/12 16:32:26	2.21
-+++ browser.c	2000/05/20 07:30:40
-@@ -34,8 +34,6 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <sys/stat.h>
--#include <pwd.h>
--#include <grp.h>
+--- doc/Makefile.in.orig	Mon Jun  4 19:14:32 2001
++++ doc/Makefile.in	Sun Jul 22 15:09:17 2001
+@@ -29,7 +29,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ 
+ DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
+-INCLUDES = -I. -I.. -I$(includedir) -I$(top_srcdir)
++INCLUDES = -I. -I.. -I$(top_srcdir)
+ 
+ MAKEDOC_CPP = $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
  
- static struct mapping_t FolderHelp[] = {
-   { N_("Exit"),  OP_EXIT },
diff --git a/mail/mutt/patches/patch-ac b/mail/mutt/patches/patch-ac
index e463019fa76..dc46e88abff 100644
--- a/mail/mutt/patches/patch-ac
+++ b/mail/mutt/patches/patch-ac
@@ -1,30 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2000/05/20 18:41:41 kim Exp $
+$NetBSD: patch-ac,v 1.2.2.1 2002/06/23 18:51:41 jlam Exp $
 
---- init.c	2000/05/17 03:35:49	2.29
-+++ init.c	2000/05/20 07:30:46
-@@ -42,7 +42,6 @@
- #include "init.h"
- #include "mailbox.h"
+--- po/Makefile.in.in.orig	Tue Jan  1 21:17:15 2002
++++ po/Makefile.in.in	Wed Jan  2 09:54:40 2002
+@@ -23,7 +23,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(datadir)/gettext/po
  
--#include <pwd.h>
- #include <ctype.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -1710,13 +1709,13 @@
-   /* Get some information about the user */
-   if ((pw = getpwuid (getuid ())))
-   {
-+    char rnbuf[STRING];
-+
-     Username = safe_strdup (pw->pw_name);
-     if (!Homedir)
-       Homedir = safe_strdup (pw->pw_dir);
--    if ((p = strchr (pw->pw_gecos, ',')))
--      Realname = mutt_substrdup (pw->pw_gecos, p);
--    else
--      Realname = safe_strdup (pw->pw_gecos);
-+
-+    Realname = safe_strdup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
-     Shell = safe_strdup (pw->pw_shell);
-   }
-   else 
+ INSTALL = @INSTALL@
diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad
index b419f3df5c6..e976dd0cc99 100644
--- a/mail/mutt/patches/patch-ad
+++ b/mail/mutt/patches/patch-ad
@@ -1,15 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/05/20 18:41:41 kim Exp $
+$NetBSD: patch-ad,v 1.1.2.1 2002/06/23 18:51:41 jlam Exp $
 
---- lib.c	2000/05/16 15:23:02	2.24
-+++ lib.c	2000/05/20 07:31:00
-@@ -32,9 +32,9 @@
- #include <stdlib.h>
- #include <sys/wait.h>
- #include <errno.h>
--#include <pwd.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <pwd.h>
- 
- #include "lib.h"
+--- Makefile.in.orig	Wed Jan 30 17:50:34 2002
++++ Makefile.in	Wed Jan 30 17:56:07 2002
+@@ -144,7 +144,7 @@
+ 
+ INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
+ 
+-CPPFLAGS = @CPPFLAGS@ -I$(includedir)
++CPPFLAGS = @CPPFLAGS@
+ 
+ non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c 	pgpmicalg.c gnupgparse.c sha1.h 	doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes.txt 	OPS.MIX remailer.c remailer.h pgpewrap.c		contrib/pgp2.rc contrib/pgp5.rc contrib/gpg.rc 	mutt_ssl.c mutt_ssl.h README.SSL mutt_ssl_nss.c 	pgppacket.c pgppacket.h
  
diff --git a/mail/mutt/patches/patch-ae b/mail/mutt/patches/patch-ae
index a10b6258b52..2ae7bdabbdd 100644
--- a/mail/mutt/patches/patch-ae
+++ b/mail/mutt/patches/patch-ae
@@ -1,14 +1,63 @@
-$NetBSD: patch-ae,v 1.1 2000/05/20 18:41:42 kim Exp $
+$NetBSD: patch-ae,v 1.1.2.1 2002/06/23 18:51:42 jlam Exp $
 
---- mutt.h	2000/05/16 19:00:15	2.66
-+++ mutt.h	2000/05/20 07:30:32
-@@ -36,6 +36,9 @@
- #include <posix1_lim.h>
- #endif
- 
-+#include <pwd.h>
-+#include <grp.h>
-+
- #include "rfc822.h"
- #include "hash.h"
+--- contrib/gpg.rc.orig	Tue Dec 11 10:33:57 2001
++++ contrib/gpg.rc	Tue Apr 16 10:28:08 2002
+@@ -31,44 +31,44 @@
+ # breaking PGP/MIME.
  
+ # decode application/pgp
+-set pgp_decode_command="/usr/bin/gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
++set pgp_decode_command="gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
+ 
+ # verify a pgp/mime signature
+-set pgp_verify_command="/usr/bin/gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
++set pgp_verify_command="gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
+ 
+ # decrypt a pgp/mime attachment
+-set pgp_decrypt_command="/usr/bin/gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
++set pgp_decrypt_command="gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
+ 
+ # create a pgp/mime signed attachment
+-# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
+-set pgp_sign_command="/usr/bin/gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
++# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
++set pgp_sign_command="gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
+ 
+ # create a application/pgp signed (old-style) message
+-# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
+-set pgp_clearsign_command="/usr/bin/gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
++# set pgp_clearsign_command="gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
++set pgp_clearsign_command="gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
+ 
+ # create a pgp/mime encrypted attachment
+ # set pgp_encrypt_only_command="pgpewrap gpg-2comp  -v --batch  --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+-set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
++set pgp_encrypt_only_command="pgpewrap gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+ 
+ # create a pgp/mime encrypted and signed attachment
+ # set pgp_encrypt_sign_command="pgpewrap gpg-2comp  --passphrase-fd 0 -v --batch  --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+-set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
++set pgp_encrypt_sign_command="pgpewrap gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+ 
+ # import a key into the public key ring
+-set pgp_import_command="/usr/bin/gpg  --no-verbose --import -v %f"
++set pgp_import_command="gpg  --no-verbose --import -v %f"
+ 
+ # export a key from the public key ring
+-set pgp_export_command="/usr/bin/gpg   --no-verbose --export --armor %r"
++set pgp_export_command="gpg   --no-verbose --export --armor %r"
+ 
+ # verify a key
+-set pgp_verify_key_command="/usr/bin/gpg   --verbose --batch  --fingerprint --check-sigs %r"
++set pgp_verify_key_command="gpg   --verbose --batch  --fingerprint --check-sigs %r"
+ 
+ # read in the public key ring
+-set pgp_list_pubring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
++set pgp_list_pubring_command="gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
+ 
+ # read in the secret key ring
+-set pgp_list_secring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
++set pgp_list_secring_command="gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
+ 
+ # fetch keys
+ # set pgp_getkeys_command="pkspxycwrap %r"
diff --git a/mail/mutt/patches/patch-af b/mail/mutt/patches/patch-af
deleted file mode 100644
index e2eb53a4cd2..00000000000
--- a/mail/mutt/patches/patch-af
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/05/20 18:41:43 kim Exp $
-
---- muttlib.c	2000/05/16 15:23:02	2.19
-+++ muttlib.c	2000/05/20 07:46:06
-@@ -33,10 +33,12 @@
- #include <stdlib.h>
- #include <sys/wait.h>
- #include <errno.h>
--#include <pwd.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#define MIN(a,b) ((a) < (b) ? (a) : (b))
-+#define MAX(a,b) ((a) < (b) ? (b) : (a))
-+
- BODY *mutt_new_body (void)
- {
-   BODY *p = (BODY *) safe_calloc (1, sizeof (BODY));
-@@ -452,6 +454,46 @@
-   return (s);
- }
- 
-+
-+char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw)
-+{
-+  regmatch_t pat_match[1];
-+  size_t pwnl;
-+  int idx;
-+  char *p;
-+  
-+  if (!pw || !pw->pw_gecos) 
-+    return NULL;
-+
-+  memset (dest, 0, destlen);
-+  
-+  if (GecosMask.rx)
-+  {
-+    if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
-+      strfcpy (dest, pw->pw_gecos + pat_match[0].rm_so, 
-+	       MIN (pat_match[0].rm_eo - pat_match[0].rm_so + 1, destlen));
-+  }
-+  else if ((p = strchr (pw->pw_gecos, ',')))
-+    strfcpy (dest, pw->pw_gecos, MIN (destlen, p - pw->pw_gecos + 1));
-+  else
-+    strfcpy (dest, pw->pw_gecos, destlen);
-+
-+  pwnl = strlen (pw->pw_name);
-+
-+  for (idx = 0; dest[idx]; idx++)
-+  {
-+    if (dest[idx] == '&')
-+    {
-+      memmove (&dest[idx + pwnl], &dest[idx + 1],
-+	       MAX(destlen - idx - pwnl - 1, 0));
-+      memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl));
-+      dest[idx] = toupper (dest[idx]);
-+    }
-+  }
-+      
-+  return dest;
-+}
-+  
- 
- char *mutt_get_parameter (const char *s, PARAMETER *p)
- {
diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag
deleted file mode 100644
index 27a03ca462c..00000000000
--- a/mail/mutt/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2000/07/28 09:32:49 wiz Exp $
-
---- protos.h.orig	Tue May 16 17:23:12 2000
-+++ protos.h	Wed Jun 21 08:29:26 2000
-@@ -115,6 +115,7 @@
- char *mutt_expand_path (char *, size_t);
- char *_mutt_expand_path (char *, size_t, int);
- char *mutt_find_hook (int, const char *);
-+char *mutt_gecos_name (char *, size_t, struct passwd *);
- char *mutt_gen_msgid (void);
- char *mutt_get_name (ADDRESS *);
- char *mutt_get_parameter (const char *, PARAMETER *);
diff --git a/mail/mutt/patches/patch-ah b/mail/mutt/patches/patch-ah
deleted file mode 100644
index 0041cdfb91f..00000000000
--- a/mail/mutt/patches/patch-ah
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2001/01/10 17:45:32 tron Exp $
-
---- imap/md5.h.orig	Fri Aug 20 10:24:06 1999
-+++ imap/md5.h	Wed Jan 10 18:30:43 2001
-@@ -26,14 +26,24 @@
- #ifndef MD5_H
- #define MD5_H 1
- 
-+#include <sys/types.h>
-+
- /* POINTER defines a generic pointer type */
- typedef unsigned char *POINTER;
- 
- /* UINT2 defines a two byte word */
--typedef unsigned short int UINT2;
-+#ifdef __sun__
-+typedef uint16_t UINT2;
-+#else
-+typedef u_int16_t UINT2;
-+#endif
- 
- /* UINT4 defines a four byte word */
--typedef unsigned long int UINT4;
-+#ifdef __sun__
-+typedef uint32_t UINT4;
-+#else
-+typedef u_int32_t UINT4;
-+#endif
- 
- /* MD5 context. */
- typedef struct {
diff --git a/mail/mutt/patches/patch-ai b/mail/mutt/patches/patch-ai
deleted file mode 100644
index bde48e1abc9..00000000000
--- a/mail/mutt/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2001/05/10 14:25:35 agc Exp $
-
-If Subject is NULL, don't try to dereference it.
-
---- rfc2047.c	2001/05/10 14:11:38	1.1
-+++ rfc2047.c	2001/05/10 14:12:35
-@@ -390,6 +390,10 @@
- 
-   dlen--; /* save room for the terminal nul */
- 
-+  if (s == NULL) {
-+	return;
-+  }
-+
-   while (*s && dlen > 0)
-   {
-     if ((p = strstr (s, "=?")) == NULL ||
diff --git a/mail/mutt/patches/patch-aj b/mail/mutt/patches/patch-aj
deleted file mode 100644
index 0ad5dd1d59e..00000000000
--- a/mail/mutt/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2001/06/20 07:07:24 jlam Exp $
-
---- Makefile.in.orig	Fri Jul 28 14:51:01 2000
-+++ Makefile.in
-@@ -137,7 +137,7 @@
- 
- 
- # top_srcdir is for building outside of the source tree
--INCLUDES = -I$(top_srcdir) -I. $(IMAP_INCLUDES) -Iintl -I$(includedir)
-+INCLUDES = -I$(top_srcdir) -I. $(IMAP_INCLUDES) -Iintl
- 
- non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1dgst.c 	gnupgparse.c sha.h sha_locl.h 	doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes.txt 	OPS.MIX remailer.c remailer.h pgpewrap		contrib/pgp2.rc contrib/pgp5.rc contrib/gpg.rc 	imap/imap_ssl.c imap/imap_ssl.h README.SSL
- 
diff --git a/mail/mutt/patches/patch-ak b/mail/mutt/patches/patch-ak
deleted file mode 100644
index ed9ef869dbe..00000000000
--- a/mail/mutt/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2001/06/20 07:07:24 jlam Exp $
-
---- doc/Makefile.in.orig	Wed Mar 29 04:42:49 2000
-+++ doc/Makefile.in
-@@ -31,7 +31,7 @@
- 
- DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
- 	-DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
--INCLUDES=-I. -I.. -I$(includedir) -I$(top_srcdir)
-+INCLUDES=-I. -I.. -I$(top_srcdir)
- 
- MAKEDOC_CPP=$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
- 
diff --git a/mail/mutt/patches/patch-al b/mail/mutt/patches/patch-al
deleted file mode 100644
index d52bb22e55c..00000000000
--- a/mail/mutt/patches/patch-al
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-al,v 1.3 2001/10/18 08:04:25 tron Exp $
-
---- sendlib.c	2001/10/11 07:58:26	2.88
-+++ sendlib.c	2001/10/17 16:22:48	2.89
-@@ -1831,6 +1831,13 @@
- 	if (dup (1) < 0)
- 	  _exit (S_ERR);
-       }
-+      else 
-+      {
-+	if (open ("/dev/null", O_WRONLY | O_APPEND) < 0)	/* stdout */
-+	  _exit (S_ERR);
-+	if (open ("/dev/null", O_RDWR | O_APPEND) < 0)		/* stderr */
-+	  _exit (S_ERR);
-+      }
- 
-       execv (path, args);
-       _exit (S_ERR);
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 2b4bbced29e..59500600cec 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/03/11 08:57:50 skrll Exp $
+# $NetBSD: Makefile,v 1.46.2.1 2002/06/23 18:51:47 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--with-pager=${NMH_PAGER}
 .endif
 
 .if defined(KERBEROS)
-USE_KERBEROS=		# defined
+PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=	--with-krb4
 .else
 CONFIGURE_ARGS+=	--without-krb4
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index f9cec8c3807..649b33f778a 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,18 +1,43 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/04 01:15:25 jtb Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:51:48 jlam Exp $
 
-DISTNAME=	nullmailer-1.00RC5
-CATEGORIES=	mail
-MASTER_SITES=	http://untroubled.org/nullmailer/
+DISTNAME=		nullmailer-1.00RC5
+CATEGORIES=		mail
+MASTER_SITES=		http://untroubled.org/nullmailer/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://untroubled.org/nullmailer/
-COMMENT=	Simple relay-only mail transport agent
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://untroubled.org/nullmailer/
+COMMENT=		Simple relay-only mail transport agent
 
-GNU_CONFIGURE=	# defined
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR} --localstatedir=/var
+
+INSTALL_TARGET=		install install-data-local install-root
+
+.include "../../mk/bsd.prefs.mk"
+
+NULLMAILER_GROUP?=	nullmail
+NULLMAILER_USER?=	nullmail
+PKG_GROUPS?=		${NULLMAILER_GROUP}
+PKG_USERS?=		${NULLMAILER_USER}
+
+MAKE_ENV+=		NULLMAILER_GROUP=${NULLMAILER_GROUP}
+MAKE_ENV+=		NULLMAILER_USER=${NULLMAILER_USER}
+
+PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}		\
+			NULLMAILER_GROUP=${NULLMAILER_GROUP}		\
+			NULLMAILER_USER=${NULLMAILER_USER}
+
+pre-configure:
+	for f in ${WRKSRC}/doc/nullmailer-send.8; do			\
+		${SED} -e 's:@PREFIX@:${PREFIX}:g'			\
+			-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:g'	\
+		$$f > $$f.tmp && ${MV} -f $$f.tmp $$f;			\
+	done
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nullmailer
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog	\
 		HOWTO NEWS README TODO ${PREFIX}/share/doc/nullmailer
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/nullmailer/PLIST b/mail/nullmailer/PLIST
index 1be13e207b6..a897ebd7050 100644
--- a/mail/nullmailer/PLIST
+++ b/mail/nullmailer/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/04 01:15:25 jtb Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:51:48 jlam Exp $
 bin/mailq
+@exec ${CHMOD} u+s %D/bin/mailq
+@exec ${CHOWN} ${NULLMAILER_USER}:${NULLMAILER_GROUP} %D/bin/mailq
 bin/nullmailer-inject
 libexec/nullmailer/qmqp
 libexec/nullmailer/smtp
@@ -7,6 +9,8 @@ man/man1/nullmailer-inject.1
 man/man1/sendmail.1
 man/man7/nullmailer.7
 sbin/nullmailer-queue
+@exec ${CHMOD} u+s %D/sbin/nullmailer-queue
+@exec ${CHOWN} ${NULLMAILER_USER}:${NULLMAILER_GROUP} %D/sbin/nullmailer-queue
 sbin/nullmailer-send
 sbin/sendmail
 share/doc/nullmailer/AUTHORS
@@ -17,6 +21,16 @@ share/doc/nullmailer/HOWTO
 share/doc/nullmailer/NEWS
 share/doc/nullmailer/README
 share/doc/nullmailer/TODO
-@dirrm share/doc/nullmailer
+@exec ${MKDIR} /var/nullmailer
+@exec ${MKDIR} /var/nullmailer/queue
+@exec ${MKDIR} /var/nullmailer/tmp
+@exec mkfifo /var/nullmailer/trigger
+@exec ${CHMOD} 600 /var/nullmailer/trigger
+@exec ${CHOWN} -R ${NULLMAILER_USER}:${NULLMAILER_GROUP} /var/nullmailer/*
 @dirrm libexec/nullmailer
-@dirrm etc/nullmailer
+@dirrm share/doc/nullmailer
+@unexec ${RMDIR} ${PKG_SYSCONFDIR}/nullmailer 2>/dev/null || true
+@unexec ${RMDIR} /var/nullmailer/queue 2>/dev/null || true
+@unexec ${RMDIR} /var/nullmailer/tmp 2>/dev/null || true
+@unexec ${RM} -f /var/nullmailer/trigger 2>/dev/null || true
+@unexec ${RMDIR} /var/nullmailer 2>/dev/null || true
diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
index b26ebedea5f..e16922fda82 100644
--- a/mail/nullmailer/distinfo
+++ b/mail/nullmailer/distinfo
@@ -2,3 +2,5 @@
 SHA1 (nullmailer-1.00RC5.tar.gz) = 5d47098fc5cdbf2db3b40ef2c81e83867e7a7410
 Size (nullmailer-1.00RC5.tar.gz) = 111691 bytes
 SHA1 (patch-aa) = d7ceeca053ca504232c4a50037e4985315b4ebf5
+SHA1 (patch-ab) = cc5ee1356d9759c53579e1115d409a0af0d80a3e
+SHA1 (patch-ac) = f8c8b1df4fe97ca2ab4780a58be707fe79e83e55
diff --git a/mail/nullmailer/patches/patch-ab b/mail/nullmailer/patches/patch-ab
new file mode 100644
index 00000000000..a5886173977
--- /dev/null
+++ b/mail/nullmailer/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.2.2 2002/06/23 18:51:50 jlam Exp $
+
+--- Makefile.in.orig	Mon May 13 17:39:12 2002
++++ Makefile.in	Mon May 13 17:38:58 2002
+@@ -365,10 +365,10 @@
+ 	chmod 600 $(DESTDIR)$(localstatedir)/trigger
+ 
+ install-root:
+-	chown nullmail $(DESTDIR)$(localstatedir)/*
+-	chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue
++	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(localstatedir)/*
++	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(sbindir)/nullmailer-queue
+ 	chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue
+-	chown nullmail $(DESTDIR)$(bindir)/mailq
++	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(bindir)/mailq
+ 	chmod u+s $(DESTDIR)$(bindir)/mailq
+ 
+ dist-hook:
diff --git a/mail/nullmailer/patches/patch-ac b/mail/nullmailer/patches/patch-ac
new file mode 100644
index 00000000000..ee4adb4cf79
--- /dev/null
+++ b/mail/nullmailer/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1.2.2 2002/06/23 18:51:50 jlam Exp $
+
+--- doc/nullmailer-send.8.orig	Tue May 14 01:33:23 2002
++++ doc/nullmailer-send.8	Tue May 14 01:33:55 2002
+@@ -61,10 +61,10 @@
+ .B /var/nullmailer/trigger
+ A trigger file to cause immediate delivery.
+ .TP
+-.B /usr/local/etc/nullmailer
++.B @PKG_SYSCONFDIR@/nullmailer
+ The configuration directory.
+ .TP
+-.B /usr/local/libexec/nullmailer
++.B @PREFIX@/libexec/nullmailer
+ The protocol program directory.
+ .SH SEE ALSO
+ nullmailer-queue(8),
diff --git a/mail/p5-MailTools/Makefile b/mail/p5-MailTools/Makefile
index b77900d5778..26340d8b6fb 100644
--- a/mail/p5-MailTools/Makefile
+++ b/mail/p5-MailTools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2002/03/15 12:44:49 martti Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2002/06/23 18:51:51 jlam Exp $
 
-DISTNAME=	MailTools-1.43
+DISTNAME=	MailTools-1.44
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5mto
 CATEGORIES=	mail perl5
diff --git a/mail/p5-MailTools/distinfo b/mail/p5-MailTools/distinfo
index 3c7ddf642a5..05270943a54 100644
--- a/mail/p5-MailTools/distinfo
+++ b/mail/p5-MailTools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/03/15 12:44:49 martti Exp $
+$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:51:51 jlam Exp $
 
-SHA1 (MailTools-1.43.tar.gz) = c82b4ec3f5128f3d22ecbedcd10d95f4dff16851
-Size (MailTools-1.43.tar.gz) = 41256 bytes
+SHA1 (MailTools-1.44.tar.gz) = a4c89623db76f9e83c96f72519d43084a6da5dee
+Size (MailTools-1.44.tar.gz) = 41496 bytes
diff --git a/mail/p5-Sendmail-AccessDB/DESCR b/mail/p5-Sendmail-AccessDB/DESCR
new file mode 100644
index 00000000000..2c85efba443
--- /dev/null
+++ b/mail/p5-Sendmail-AccessDB/DESCR
@@ -0,0 +1,6 @@
+a package for making it easy to abstract the "SpamFriend" and
+"SpamHater" features in sendmail, as well as those for whitelisting
+certain hosts/addresses/etc.. Especially useful for making sure that
+addresses you whitelisted as "always accept for" in /etc/mail/access
+also get whitelisted in Milter-based applications as well (be they
+senders or recipients) 
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
new file mode 100644
index 00000000000..f070072d937
--- /dev/null
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:51:53 jlam Exp $
+
+DISTNAME=	Sendmail-AccessDB-0.07
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	mail perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Sendmail/}
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.megacity.org/software.html
+COMMENT=	perl5 module for manipulating the sendmail accessdb
+
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Sendmail/AccessDB/.packlist
+
+do-configure:
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+
+.include "../../lang/perl5/buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Sendmail-AccessDB/PLIST b/mail/p5-Sendmail-AccessDB/PLIST
new file mode 100644
index 00000000000..3b8032de24c
--- /dev/null
+++ b/mail/p5-Sendmail-AccessDB/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1.1.1.34.2 2002/06/23 18:51:54 jlam Exp $
diff --git a/mail/p5-Sendmail-AccessDB/distinfo b/mail/p5-Sendmail-AccessDB/distinfo
new file mode 100644
index 00000000000..8b4f3f87945
--- /dev/null
+++ b/mail/p5-Sendmail-AccessDB/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:51:55 jlam Exp $
+
+SHA1 (Sendmail-AccessDB-0.07.tar.gz) = 2f9249ffcb710c488fa000c8219c941a3c353742
+Size (Sendmail-AccessDB-0.07.tar.gz) = 14768 bytes
diff --git a/mail/p5-razor-agents/Makefile b/mail/p5-razor-agents/Makefile
index 2645142cf42..0c5eacf08fb 100644
--- a/mail/p5-razor-agents/Makefile
+++ b/mail/p5-razor-agents/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/31 10:56:29 simonb Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:51:56 jlam Exp $
 #
 
 DISTNAME=	razor-agents-1.19
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5ra
 CATEGORIES=	mail
-MASTER_SITES=	http://prdownloads.sourceforge.net/razor/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=razor/}
 #MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
 MAINTAINER=	packages@netbsd.org
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 7135ddc3931..8ff0f8e819c 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2002/01/13 21:52:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.59.2.1 2002/06/23 18:51:57 jlam Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -77,6 +77,8 @@ do-install:
 .include "../../mk/bsd.pkg.mk"
 .if ${OPSYS} == "SunOS"
 BUILDNAME= gs5
+.elif ${OPSYS} == "Linux"
+BUILDNAME= lrh  
 .else
 BUILDNAME= neb
 .endif
diff --git a/mail/postfix/MESSAGE b/mail/postfix/MESSAGE
new file mode 100644
index 00000000000..621f2c948da
--- /dev/null
+++ b/mail/postfix/MESSAGE
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.2.2 2002/06/23 18:51:58 jlam Exp $
+
+To activate postfix:
+
+- Check the configuration files in /etc/postfix (see ${PREFIX}/share/postfix)
+- Modify /etc/mailer.conf (see ${PREFIX}/etc/mailer.conf.postfix)
+- Set postfix=YES in /etc/rc.conf
+===========================================================================
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4b91f389012..a0c6ea23351 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2002/05/05 14:46:27 martti Exp $
+# $NetBSD: Makefile,v 1.61.2.1 2002/06/23 18:51:59 jlam Exp $
 
-DISTNAME=	postfix-1.1.8
+DISTNAME=	postfix-1.1.11
 CATEGORIES=	mail
-MASTER_SITES=	ftp://postfix.cloud9.net/official/
+MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
@@ -57,6 +57,7 @@ BUILD_DEFS+=	USE_SASL
 
 PLIST_SRC+=	${PKGDIR}/PLIST
 ALL_TARGET=	#empty
+MAKE_ENV=	CC="${CC}" OPT="${CFLAGS}"
 
 pre-configure:
 	${CP} ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.dist
@@ -89,18 +90,18 @@ post-build:
 	    <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix
 
 pre-install:
-	${INSTALL_DATA_DIR} /etc/postfix 
-	${INSTALL_DATA_DIR} ${PREFIX}/share/postfix 
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix 
+	${INSTALL_DATA_DIR} /etc/postfix
+	${INSTALL_DATA_DIR} ${PREFIX}/share/postfix
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/postfix
 	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/postfix \
 	    ${PREFIX}/libexec/postfix
 	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
 	-${RM} -f ${WRKSRC}/conf/*.orig
 .if defined(USE_SASL) && ${USE_SASL} == "YES"
-	echo "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
+	${ECHO} "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${PREFIX}/lib/sasl
-	echo lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl
+	${ECHO} lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl
 .endif
 	${TEST} -f /etc/postfix/postfix-files || \
 		${INSTALL_DATA} ${WRKSRC}/conf/postfix-files /etc/postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index c99081a5c3f..06fb0937cdb 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2002/05/05 14:46:27 martti Exp $
+$NetBSD: distinfo,v 1.18.2.1 2002/06/23 18:51:59 jlam Exp $
 
-SHA1 (postfix/postfix-1.1.8.tar.gz) = 4b82a6de31a49578797c85300d39c539bdc71702
-Size (postfix/postfix-1.1.8.tar.gz) = 1187634 bytes
+SHA1 (postfix/postfix-1.1.11.tar.gz) = 3a28c32800f94df0c504df68c4c6191f48217c5c
+Size (postfix/postfix-1.1.11.tar.gz) = 1190741 bytes
 SHA1 (patch-aa) = 01d0df30acc0ee454771ade263b6e793d0dba6a4
 SHA1 (patch-ab) = d4e50ffc31d71ff64067101f6d733655fcf76713
 SHA1 (patch-ac) = 0c79f73f1a9327e97ab6e6910d03b479c849d9f4
 SHA1 (patch-ad) = 78f24bf3f7e6829c2a5c9a402e33dea25f1a55d2
 SHA1 (patch-ae) = 66908f37243ce4da24129ccb53120b4e068ffa1d
-SHA1 (patch-af) = 606510ca128f70ac2f5972313039248c11130bb0
+SHA1 (patch-af) = fbee5a8854857e2a99c59bcfaee4775df735f086
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 6f187db7475..ff0b310047c 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,13 +1,7 @@
-$NetBSD: patch-af,v 1.10 2002/03/27 07:17:10 martti Exp $
+$NetBSD: patch-af,v 1.10.2.1 2002/06/23 18:52:00 jlam Exp $
 
 --- conf/main.cf.orig	Mon Mar 25 21:09:24 2002
 +++ conf/main.cf	Wed Mar 27 07:33:47 2002
-@@ -1,3 +1,5 @@
-+#	$NetBSD: patch-af,v 1.10 2002/03/27 07:17:10 martti Exp $
-+#
- # Global Postfix configuration file. This file lists only a subset
- # of all 100+ parameters. See the sample-xxx.cf files for a full list.
- # 
 @@ -31,14 +33,19 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.  The default value is $program_directory.
diff --git a/mail/procmail/MESSAGE b/mail/procmail/MESSAGE
index 1a7cbcfdac9..2f27a7a88a4 100644
--- a/mail/procmail/MESSAGE
+++ b/mail/procmail/MESSAGE
@@ -1,9 +1,9 @@
-=============================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 01:01:07 zuntum Exp $
+=======================================================================
+$NetBSD: MESSAGE,v 1.1.2.1 2002/06/23 18:52:01 jlam Exp $
 
 Please note the following:
 
-- The system-wide procmailrc is /etc/procmailrc
-- The system-wide procmailrc directory is /etc/procmailrcs/
+- The system-wide procmailrc is ${PKG_SYSCONFDIR}/procmailrc
+- The system-wide procmailrc directory is ${PKG_SYSCONFDIR}/procmailrcs/
 
-=============================================================
+=======================================================================
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index a91a7048b96..f78d251795f 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/11/08 12:05:58 bouyer Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2002/06/23 18:52:01 jlam Exp $
 #
 
 DISTNAME=	procmail-3.22
@@ -23,6 +23,12 @@ PROCMAIL_TRUSTED_IDS?=\
 pre-configure:
 	${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}"	\
 	>> ${WRKSRC}/config.h
+	${ECHO} "#undef ETCRC" >> ${WRKSRC}/config.h
+	${ECHO} "#undef ETCRCS" >> ${WRKSRC}/config.h
+	${ECHO} "#define ETCRC \"${PKG_SYSCONFDIR}/procmailrc\""	\
+	>> ${WRKSRC}/config.h
+	${ECHO} "#define ETCRCS \"${PKG_SYSCONFDIR}/procmailrcs/\""	\
+	>> ${WRKSRC}/config.h
 .ifdef(PROCMAIL_MAILSPOOLHOME)
 	${ECHO} "#define MAILSPOOLHOME \"/${PROCMAIL_MAILSPOOLHOME}\""	\
 	>> ${WRKSRC}/src/authenticate.h
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index 57ef99422b2..f79bb2500ff 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/01/28 17:44:48 zuntum Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2002/06/23 18:52:02 jlam Exp $
 #
 
 DISTNAME=	qmail-conf-0.60
@@ -26,7 +26,7 @@ LOCALBASE=	/
 
 post-patch:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${STRIPFLAG} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	# derive LOCALBASE from ${DIGEST}, because we have deliberately altered LOCALBASE
 	# and there's no easy way to guess what the real LOCALBASE is
 	${ECHO} ${DIGEST} | ${SED} 's,/bin/digest,,' > ${WRKSRC}/conf-ucspi-tcp
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index a8ea3797ab7..1e506a6f5bc 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/16 22:25:55 zuntum Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:52:03 jlam Exp $
 #
 
 DISTNAME=		qmailanalog-0.70
@@ -18,7 +18,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 
 pre-build:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${STRIPFLAG} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${PREFIX}/qmailanalog > ${WRKSRC}/conf-home
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index 05c67f31f7b..90189922524 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2002/05/03 15:09:51 taca Exp $
+# $NetBSD: Makefile.common,v 1.5.2.1 2002/06/23 18:52:03 jlam Exp $
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libexecdir=${LOCALBASE}/libexec \
@@ -20,7 +20,7 @@ VERSION=		4.0.4
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
 
 .if defined(KERBEROS)
-USE_KERBEROS=		# defined
+PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=	--enable-kerberos
 .endif
 
diff --git a/mail/sendmail-current/DESCR b/mail/sendmail-current/DESCR
deleted file mode 100644
index 3dd2e5933dd..00000000000
--- a/mail/sendmail-current/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Sendmail acts a unified "post office" to which all mail can be submitted.
-Address interpretation is controlled by a production system, which can
-parse both domain-based addressing and old-style "ad hoc" addresses.
-The production system is powerful enough to rewrite addresses in the message
-header to conform to the standards of a number of common target networks,
-including old (NCP/RFC733) Arpanet, new (TCP/RFC822) Arpanet, UUCP, and
-Phonenet. Sendmail also implements an SMTP server, message queueing, and
-aliasing.
diff --git a/mail/sendmail-current/MESSAGE b/mail/sendmail-current/MESSAGE
deleted file mode 100644
index c396bf2057a..00000000000
--- a/mail/sendmail-current/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/11/11 06:17:29 hubertf Exp $
-
-To use "${PKGNAME}" as the system's mail transport agent you have
-to install "${PREFIX}/etc/mailer.conf.sendmail" as global mailwrapper
-configuration file. The command below will do that for you:
-
-ln -fs ${PREFIX}/etc/mailer.conf.sendmail /etc/mailer.conf
-===========================================================================
diff --git a/mail/sendmail-current/Makefile b/mail/sendmail-current/Makefile
deleted file mode 100644
index b6c8ebe8a26..00000000000
--- a/mail/sendmail-current/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2002/01/24 15:48:19 wiz Exp $
-
-DISTNAME=	sendmail.8.12.0.Beta10
-PKGNAME=	sendmail-8.11.99.10
-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
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.sendmail.org/
-COMMENT=	The well known Mail Transport Agent
-
-IGNORE=		"security issue found, build broken due to lack of useradd"
-
-DEPENDS=	m4-1.4:../../devel/m4
-
-LICENSE=	no-profit
-
-NO_CONFIGURE=	yes
-MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
-		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}"
-
-WRKSRC=		${WRKDIR}/sendmail-8.12.0.Beta10
-SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
-
-BUILD_DEFS+=    USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-USE_DB2?=	YES
-.else
-USE_DB2?=	NO
-.endif
-
-MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-DESCR_SRC=	${WRKDIR}/.DESCR_SRC
-
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
-DEPENDS+=	openldap-1.2.*:../../databases/openldap
-.endif
-.if ${USE_DB2} == YES
-DEPENDS+=	db-2.7.7:../../databases/db
-.endif
-.if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES
-USE_SSL=	yes
-.endif
-
-post-patch:
-	${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
-	${CHMOD} +w ${SITECONFIG}
-	${CP} ${PKGDIR}/DESCR ${DESCR_SRC}
-	${ECHO} '---' >> ${DESCR_SRC}
-	${ECHO} -n 'compiled features:' >> ${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}
-.endif
-.if ${OPSYS} == "NetBSD"
-	${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >> ${SITECONFIG}
-	${ECHO} -n ' TCPWRAPPERS' >> ${DESCR_SRC}
-.endif
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
-	${CAT} ${FILESDIR}/site.config.m4-ldap >> ${SITECONFIG}
-	${ECHO} -n ' LDAP' >> ${DESCR_SRC}
-.endif
-.if ${USE_DB2} == YES
-	${CAT} ${FILESDIR}/site.config.m4-db2 >> ${SITECONFIG}
-	${ECHO} -n ' DB2' >> ${DESCR_SRC}
-.endif
-.if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES
-	${CAT} ${FILESDIR}/site.config.m4-starttls >> ${SITECONFIG}
-	${ECHO} -n ' STARTTLS' >> ${DESCR_SRC}
-.endif
-	${ECHO} >> ${DESCR_SRC}
-
-do-build:
-	@(cd ${WRKSRC}; ./Build)
-
-post-build:
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
-	  <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.sendmail
-	${CAT} ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} > ${PLIST_SRC}
-	${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
-.if ${USE_DB2} == YES
-	${ECHO} "" >> ${MESSAGE_SRC}
-	${ECHO} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" >> ${MESSAGE_SRC}
-	${ECHO} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." >> ${MESSAGE_SRC}
-	${ECHO} >>${PLIST_SRC} "@exec mv -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || true"
-	${ECHO} >>${PLIST_SRC} "@unexec mv -f /usr/sbin/makemap.8.8 /usr/sbin/makemap || true"
-.endif
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail
-
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf.sendmail ${PREFIX}/etc
-	${CP} -pr ${WRKSRC}/cf ${PREFIX}/share/sendmail
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
-.if ${USE_DB2} == YES
-	${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
-.endif
-
-.include "../../mk/bsd.pkg.mk"
-
-# has to be below include for bsd.pkg.mk, else substition fails
-OBJDIR!=	${ECHO} obj.`uname -srm | ${TR} \  .`
diff --git a/mail/sendmail-current/PLIST.common b/mail/sendmail-current/PLIST.common
deleted file mode 100644
index 46bd72b0fe7..00000000000
--- a/mail/sendmail-current/PLIST.common
+++ /dev/null
@@ -1,191 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.2 2002/02/15 10:12:48 skrll Exp $
-bin/newaliases
-bin/mailq
-bin/hoststat
-bin/purgestat
-bin/vacation
-etc/mailer.conf.sendmail
-libexec/sendmail/sendmail
-libexec/sendmail/smrsh
-sbin/editmap
-sbin/mailstats
-sbin/makemap
-sbin/praliases
-share/misc/helpfile
-share/sendmail/README
-share/sendmail/cf/Build
-share/sendmail/cf/Makefile
-share/sendmail/cf/chez.cs.mc
-share/sendmail/cf/clientproto.mc
-share/sendmail/cf/cs-hpux10.mc
-share/sendmail/cf/cs-hpux9.mc
-share/sendmail/cf/cs-osf1.mc
-share/sendmail/cf/cs-solaris2.mc
-share/sendmail/cf/cs-sunos4.1.mc
-share/sendmail/cf/cs-ultrix4.mc
-share/sendmail/cf/cyrusproto.mc
-share/sendmail/cf/generic-bsd4.4.cf
-share/sendmail/cf/generic-bsd4.4.mc
-share/sendmail/cf/generic-hpux10.cf
-share/sendmail/cf/generic-hpux10.mc
-share/sendmail/cf/generic-hpux9.cf
-share/sendmail/cf/generic-hpux9.mc
-share/sendmail/cf/generic-nextstep3.3.mc
-share/sendmail/cf/generic-osf1.cf
-share/sendmail/cf/generic-osf1.mc
-share/sendmail/cf/generic-solaris2.cf
-share/sendmail/cf/generic-solaris2.mc
-share/sendmail/cf/generic-sunos4.1.cf
-share/sendmail/cf/generic-sunos4.1.mc
-share/sendmail/cf/generic-ultrix4.cf
-share/sendmail/cf/generic-ultrix4.mc
-share/sendmail/cf/huginn.cs.mc
-share/sendmail/cf/knecht.mc
-share/sendmail/cf/mail.cs.mc
-share/sendmail/cf/mail.eecs.mc
-share/sendmail/cf/mailspool.cs.mc
-share/sendmail/cf/python.cs.mc
-share/sendmail/cf/s2k-osf1.mc
-share/sendmail/cf/s2k-ultrix4.mc
-share/sendmail/cf/tcpproto.mc
-share/sendmail/cf/ucbarpa.mc
-share/sendmail/cf/ucbvax.mc
-share/sendmail/cf/uucpproto.mc
-share/sendmail/cf/vangogh.cs.mc
-share/sendmail/domain/Berkeley.EDU.m4
-share/sendmail/domain/CS.Berkeley.EDU.m4
-share/sendmail/domain/EECS.Berkeley.EDU.m4
-share/sendmail/domain/S2K.Berkeley.EDU.m4
-share/sendmail/domain/berkeley-only.m4
-share/sendmail/domain/generic.m4
-share/sendmail/feature/accept_unqualified_senders.m4
-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/redirect.m4
-share/sendmail/feature/relay_based_on_MX.m4
-share/sendmail/feature/relay_entire_domain.m4
-share/sendmail/feature/relay_hosts_only.m4
-share/sendmail/feature/relay_local_from.m4
-share/sendmail/feature/relay_mail_from.m4
-share/sendmail/feature/smrsh.m4
-share/sendmail/feature/stickyhost.m4
-share/sendmail/feature/use_ct_file.m4
-share/sendmail/feature/use_cw_file.m4
-share/sendmail/feature/uucpdomain.m4
-share/sendmail/feature/virtuser_entire_domain.m4
-share/sendmail/feature/virtusertable.m4
-share/sendmail/hack/cssubdomain.m4
-share/sendmail/m4/cf.m4
-share/sendmail/m4/cfhead.m4
-share/sendmail/m4/proto.m4
-share/sendmail/m4/version.m4
-share/sendmail/mailer/cyrus.m4
-share/sendmail/mailer/fax.m4
-share/sendmail/mailer/local.m4
-share/sendmail/mailer/mail11.m4
-share/sendmail/mailer/phquery.m4
-share/sendmail/mailer/pop.m4
-share/sendmail/mailer/procmail.m4
-share/sendmail/mailer/qpage.m4
-share/sendmail/mailer/smtp.m4
-share/sendmail/mailer/usenet.m4
-share/sendmail/mailer/uucp.m4
-share/sendmail/ostype/aix3.m4
-share/sendmail/ostype/aix4.m4
-share/sendmail/ostype/aix5.m4
-share/sendmail/ostype/altos.m4
-share/sendmail/ostype/amdahl-uts.m4
-share/sendmail/ostype/aux.m4
-share/sendmail/ostype/bsd4.3.m4
-share/sendmail/ostype/bsd4.4.m4
-share/sendmail/ostype/bsdi.m4
-share/sendmail/ostype/bsdi1.0.m4
-share/sendmail/ostype/bsdi2.0.m4
-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
-share/sendmail/ostype/hpux9.m4
-share/sendmail/ostype/irix4.m4
-share/sendmail/ostype/irix5.m4
-share/sendmail/ostype/irix6.m4
-share/sendmail/ostype/isc4.1.m4
-share/sendmail/ostype/linux.m4
-share/sendmail/ostype/maxion.m4
-share/sendmail/ostype/mklinux.m4
-share/sendmail/ostype/nextstep.m4
-share/sendmail/ostype/openbsd.m4
-share/sendmail/ostype/osf1.m4
-share/sendmail/ostype/powerux.m4
-share/sendmail/ostype/ptx2.m4
-share/sendmail/ostype/qnx.m4
-share/sendmail/ostype/riscos4.5.m4
-share/sendmail/ostype/sco-uw-2.1.m4
-share/sendmail/ostype/sco3.2.m4
-share/sendmail/ostype/sinix.m4
-share/sendmail/ostype/solaris2.m4
-share/sendmail/ostype/solaris2.ml.m4
-share/sendmail/ostype/solaris2.pre5.m4
-share/sendmail/ostype/solaris8.m4
-share/sendmail/ostype/sunos3.5.m4
-share/sendmail/ostype/sunos4.1.m4
-share/sendmail/ostype/svr4.m4
-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
-share/sendmail/siteconfig/uucp.ucbarpa.m4
-share/sendmail/siteconfig/uucp.ucbvax.m4
-@dirrm libexec/sendmail
-@dirrm share/sendmail/siteconfig
-@dirrm share/sendmail/sh
-@dirrm share/sendmail/ostype
-@dirrm share/sendmail/mailer
-@dirrm share/sendmail/m4
-@dirrm share/sendmail/hack
-@dirrm share/sendmail/feature
-@dirrm share/sendmail/domain
-@unexec ${RM} -rf %D/share/sendmail/cf
-@dirrm share/sendmail
diff --git a/mail/sendmail-current/PLIST.netbsd b/mail/sendmail-current/PLIST.netbsd
deleted file mode 100644
index fdb943f98d8..00000000000
--- a/mail/sendmail-current/PLIST.netbsd
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.netbsd,v 1.1 2001/11/01 01:05:36 zuntum Exp $
-man/cat1/mailq.0
-man/cat1/newaliases.0
-man/cat1/vacation.0
-man/cat5/aliases.0
-man/cat8/editmap.0
-man/cat8/makemap.0
-man/cat8/smrsh.0
-man/cat8/mailstats.0
-man/cat8/praliases.0
-man/cat8/sendmail.0
diff --git a/mail/sendmail-current/PLIST.solaris b/mail/sendmail-current/PLIST.solaris
deleted file mode 100644
index 91f1578c170..00000000000
--- a/mail/sendmail-current/PLIST.solaris
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.solaris,v 1.1 2001/11/01 01:05:36 zuntum Exp $
-man/man1/mailq.1
-man/man1/newaliases.1
-man/man1/vacation.1
-man/man5/aliases.5
-man/man8/editmap.8
-man/man8/makemap.8
-man/man8/smrsh.8
-man/man8/mailstats.8
-man/man8/praliases.8
-man/man8/sendmail.8
diff --git a/mail/sendmail-current/distinfo b/mail/sendmail-current/distinfo
deleted file mode 100644
index 9d9893bd0ff..00000000000
--- a/mail/sendmail-current/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/05/29 03:39:56 itojun Exp $
-
-SHA1 (sendmail.8.12.0.Beta10.tar.gz) = 0129fcc1117face5edb7cdca472911dc68d0b8cd
-Size (sendmail.8.12.0.Beta10.tar.gz) = 1695241 bytes
-SHA1 (patch-aa) = 746a7f53d8f9064650b0488957e433a98296039e
-SHA1 (patch-ab) = a71c822ddb8791cf5b548144f41f12e78134e1de
-SHA1 (patch-ac) = 1c0757df6977f85d4e21998de6a870a8dc9a4f03
-SHA1 (patch-ad) = 2dc1bb8f3511c80f724e76de093a9445a4e9f2d1
-SHA1 (patch-ae) = 620cd3cee9a0dde54353e2f18dc06a1144a9b2e6
-SHA1 (patch-af) = a4e36341b1b7fe00887d528c9fce0b41da07092c
diff --git a/mail/sendmail-current/files/mailer.conf b/mail/sendmail-current/files/mailer.conf
deleted file mode 100644
index 68cf6a044a5..00000000000
--- a/mail/sendmail-current/files/mailer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: mailer.conf,v 1.1.1.1 2001/04/15 01:20:00 itojun Exp $
-#
-# Execute the "real" sendmail program, named @@PREFIX@@/libexec/sendmail/sendmail
-#
-sendmail	@@PREFIX@@/libexec/sendmail/sendmail
-send-mail	@@PREFIX@@/libexec/sendmail/sendmail
-mailq		@@PREFIX@@/libexec/sendmail/sendmail
-newaliases	@@PREFIX@@/libexec/sendmail/sendmail
-hoststat	@@PREFIX@@/libexec/sendmail/sendmail
-purgestat	@@PREFIX@@/libexec/sendmail/sendmail
diff --git a/mail/sendmail-current/files/site.config.m4 b/mail/sendmail-current/files/site.config.m4
deleted file mode 100644
index c4d1160702c..00000000000
--- a/mail/sendmail-current/files/site.config.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: site.config.m4,v 1.1.1.1 2001/04/15 01:20:00 itojun Exp $
-
-# pathnames specific to pkgsrc
-#
-define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
-define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
-define(`confSBINDIR', `${PREFIX}/sbin')
-define(`confUBINDIR', `${PREFIX}/bin')
-define(`confHFDIR', `${PREFIX}/share/misc')
-define(`confMANROOT', `${PREFIX}/man/cat')
diff --git a/mail/sendmail-current/files/site.config.m4-db2 b/mail/sendmail-current/files/site.config.m4-db2
deleted file mode 100644
index e6bbd6de029..00000000000
--- a/mail/sendmail-current/files/site.config.m4-db2
+++ /dev/null
@@ -1,3 +0,0 @@
-# enable db2
-APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include/db2')
-APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib -ldb2')
diff --git a/mail/sendmail-current/files/site.config.m4-ldap b/mail/sendmail-current/files/site.config.m4-ldap
deleted file mode 100644
index ba8c5836d14..00000000000
--- a/mail/sendmail-current/files/site.config.m4-ldap
+++ /dev/null
@@ -1,4 +0,0 @@
-# enable ldap
-APPENDDEF(`confMAPDEF', `-DLDAPMAP')
-APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include')
-APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib -lldap -llber')
diff --git a/mail/sendmail-current/files/site.config.m4-starttls b/mail/sendmail-current/files/site.config.m4-starttls
deleted file mode 100644
index 9fe83f9fa9f..00000000000
--- a/mail/sendmail-current/files/site.config.m4-starttls
+++ /dev/null
@@ -1,5 +0,0 @@
-# enable STARTTLS
-APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include')
-APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -D_FFR_TLS_TOREK')
-APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail-current/files/site.config.m4-tcpwrappers b/mail/sendmail-current/files/site.config.m4-tcpwrappers
deleted file mode 100644
index c15ac7f9cb3..00000000000
--- a/mail/sendmail-current/files/site.config.m4-tcpwrappers
+++ /dev/null
@@ -1,3 +0,0 @@
-# enable tcpwrapeprs
-APPENDDEF(`confENVDEF', `-DTCPWRAPPERS')
-APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
diff --git a/mail/sendmail-current/files/site.config.m4-v6 b/mail/sendmail-current/files/site.config.m4-v6
deleted file mode 100644
index e249d65be54..00000000000
--- a/mail/sendmail-current/files/site.config.m4-v6
+++ /dev/null
@@ -1,3 +0,0 @@
-# enable IPv6 
-APPENDDEF(`confENVDEF', `-DNETINET6')
-APPENDDEF(`confENVDEF', `-DNEEDSGETIPNODE')
diff --git a/mail/sendmail-current/patches/patch-aa b/mail/sendmail-current/patches/patch-aa
deleted file mode 100644
index 3bb167d6a27..00000000000
--- a/mail/sendmail-current/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/15 01:20:00 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')
- define(`confENVDEF', ` -DNETISO')
- define(`confDEPEND_TYPE', `CC-M')
--define(`confSBINGRP', `wheel')
--define(`confUBINOWN', `root')
--define(`confUBINGRP', `wheel')
--define(`confMANOWN', `root')
--define(`confMANGRP', `wheel')
-+define(`confSBINOWN', `${BSD_BINOWN}')
-+define(`confSBINGRP', `${BSD_BINGRP}')
-+define(`confUBINOWN', `${BSD_BINOWN}')
-+define(`confUBINGRP', `${BSD_BINGRP}')
-+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-current/patches/patch-ab b/mail/sendmail-current/patches/patch-ab
deleted file mode 100644
index 2848bf2dfb9..00000000000
--- a/mail/sendmail-current/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/15 01:20:00 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 @@
- define(`confENVDEF', `-DSOLARIS=20600')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl -lkstat')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail-current/patches/patch-ac b/mail/sendmail-current/patches/patch-ac
deleted file mode 100644
index 0435b51f366..00000000000
--- a/mail/sendmail-current/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/15 01:20:00 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 @@
- define(`confENVDEF', `-DSOLARIS=20700')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail-current/patches/patch-ad b/mail/sendmail-current/patches/patch-ad
deleted file mode 100644
index 5566f5b8e80..00000000000
--- a/mail/sendmail-current/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/04/15 01:20:00 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')
-+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-current/patches/patch-ae b/mail/sendmail-current/patches/patch-ae
deleted file mode 100644
index 36ee01b378b..00000000000
--- a/mail/sendmail-current/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/04/15 01:20:00 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')
- 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-current/patches/patch-af b/mail/sendmail-current/patches/patch-af
deleted file mode 100644
index 9abc6906161..00000000000
--- a/mail/sendmail-current/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/04/15 01:20:00 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 @@
- 
- #if NETINET6
- 	if (type == AF_INET6 &&
--	    IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr))
-+	    (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr) ||
-+	    IN6_IS_ADDR_LINKLOCAL((struct in6_addr *) addr)))
- 	{
- 		/* Avoid reverse lookup for IPv6 unspecified address */
- 		SM_SET_H_ERRNO(HOST_NOT_FOUND);
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 5d7fcd47412..b642d36c8ae 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2001/11/29 01:12:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.42.2.1 2002/06/23 18:52:04 jlam Exp $
 
 DISTNAME=	sendmail.8.11.6
 PKGNAME=	sendmail-8.11.6
@@ -25,35 +25,41 @@ COMMENT=	The well known Mail Transport Agent
 
 LICENSE=	no-profit
 
-NO_CONFIGURE=	yes
 MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
-		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}"
-
+		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
+		BUILDLINK_DIR="${BUILDLINK_DIR}"
 WRKSRC=		${WRKDIR}/${PKGNAME:C/nb[0-9]+$//}
 SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
 
-BUILD_DEFS+=    USE_INET6
+BUILD_DEFS+=    USE_WIDEPATCH USE_INET6 USE_TCPWRAPPERS USE_LDAP USE_DB2 \
+		USE_STARTTLS
 
 .include "../../mk/bsd.prefs.mk"
 
+MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
+DESCR_SRC=	${WRKDIR}/.DESCR_SRC
+
 .if ${OPSYS} == "SunOS"
 USE_DB2?=	YES
 .else
 USE_DB2?=	NO
 .endif
-
-MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-DESCR_SRC=	${WRKDIR}/.DESCR_SRC
+.if ${USE_DB2} == YES
+.include "../../databases/db/buildlink.mk"
+.endif
 
 .if defined(USE_LDAP) && ${USE_LDAP} == YES
-DEPENDS+=	openldap-1.2.*:../../databases/openldap
-.endif
-.if ${USE_DB2} == YES
-DEPENDS+=	db-2.7.7:../../databases/db
+.include "../../databases/openldap/buildlink.mk"
 .endif
+
 .if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES
-USE_SSL=	yes
+.include "../../security/openssl/buildlink.mk"
+.endif
+
+USE_TCPWRAPPERS?=	YES
+.if ${USE_TCPWRAPPERS} == YES
+.include "../../security/tcp_wrappers/buildlink.mk"
 .endif
 
 post-patch:
@@ -69,7 +75,7 @@ post-patch:
 	${CAT} ${FILESDIR}/site.config.m4-v6 >> ${SITECONFIG}
 	${ECHO} -n ' INET6' >> ${DESCR_SRC}
 .endif
-.if ${OPSYS} == "NetBSD"
+.if ${USE_TCPWRAPPERS} == YES
 	${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >> ${SITECONFIG}
 	${ECHO} -n ' TCPWRAPPERS' >> ${DESCR_SRC}
 .endif
@@ -91,7 +97,7 @@ post-patch:
 	${ECHO} >> ${DESCR_SRC}
 
 do-build:
-	@(cd ${WRKSRC}; ./Build)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
 
 post-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
diff --git a/mail/sendmail/files/site.config.m4-db2 b/mail/sendmail/files/site.config.m4-db2
index e6bbd6de029..01924fc895f 100644
--- a/mail/sendmail/files/site.config.m4-db2
+++ b/mail/sendmail/files/site.config.m4-db2
@@ -1,3 +1,3 @@
 # enable db2
-APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include/db2')
-APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib -ldb2')
+APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include/db2')
+APPENDDEF(`confLIBS', `-L${BUILDLINK_DIR}/lib -ldb2')
diff --git a/mail/sendmail/files/site.config.m4-ldap b/mail/sendmail/files/site.config.m4-ldap
index ba8c5836d14..a497cd25e0d 100644
--- a/mail/sendmail/files/site.config.m4-ldap
+++ b/mail/sendmail/files/site.config.m4-ldap
@@ -1,4 +1,4 @@
 # enable ldap
 APPENDDEF(`confMAPDEF', `-DLDAPMAP')
-APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include')
+APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include')
 APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib -lldap -llber')
diff --git a/mail/sendmail/files/site.config.m4-starttls b/mail/sendmail/files/site.config.m4-starttls
index 9fe83f9fa9f..72fdd2ee7ec 100644
--- a/mail/sendmail/files/site.config.m4-starttls
+++ b/mail/sendmail/files/site.config.m4-starttls
@@ -1,5 +1,5 @@
 # enable STARTTLS
-APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include')
-APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib')
+APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include')
+APPENDDEF(`confLIBS', `-L${BUILDLINK_DIR}/lib')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -D_FFR_TLS_TOREK')
 APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail/files/site.config.m4-tcpwrappers b/mail/sendmail/files/site.config.m4-tcpwrappers
index c15ac7f9cb3..e5f069a4592 100644
--- a/mail/sendmail/files/site.config.m4-tcpwrappers
+++ b/mail/sendmail/files/site.config.m4-tcpwrappers
@@ -1,3 +1,4 @@
-# enable tcpwrapeprs
-APPENDDEF(`confENVDEF', `-DTCPWRAPPERS')
+# enable tcpwrappers
+APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include -DTCPWRAPPERS')
+APPENDDEF(`confLIBS', `-L${BUILDLINK_DIR}/lib')
 APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
diff --git a/mail/solid-pop3d/DESCR b/mail/solid-pop3d/DESCR
new file mode 100644
index 00000000000..534de28dd95
--- /dev/null
+++ b/mail/solid-pop3d/DESCR
@@ -0,0 +1,6 @@
+The Solid POP3 Server is an implementation of a Post Office Protocol
+version 3 server that has flexibility as its main goal. The server is
+easily configurable and has support for few features such as APOP
+authentication scheme, virtual hosting, maildir and mailbox handling,
+bulletins and expiration of messages. Each user can specify position and
+type of his maildrop.
diff --git a/mail/solid-pop3d/MESSAGE b/mail/solid-pop3d/MESSAGE
new file mode 100644
index 00000000000..2c4a7d0a96a
--- /dev/null
+++ b/mail/solid-pop3d/MESSAGE
@@ -0,0 +1,16 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1.50.2 2002/06/23 18:52:15 jlam Exp $
+
+The config file for ${PKGNAME} must be located at ${PKG_SYSCONFDIR}
+Example files are located at ${EGDIR}
+
+To use ${PKGNAME} you must add 'spop3d' user:
+
+	spop3d:*:68:32766::0:0:spop3d:/sbin/nonexistent:/sbin/nologin
+
+To run ${PKGNAME} from inetd, make sure you didn't enable standalone
+option and add the following line to /etc/inetd.conf:
+
+	pop3 stream tcp nowait root ${PREFIX}/sbin/spop3d spop3d
+
+===========================================================================
diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile
new file mode 100644
index 00000000000..38bb24e45cf
--- /dev/null
+++ b/mail/solid-pop3d/Makefile
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile,v 1.1.1.1.6.2 2002/06/23 18:52:15 jlam Exp $
+
+DISTNAME=		solid-pop3d-0.15
+CATEGORIES=		mail
+MASTER_SITES=		http://solidpop3d.pld.org.pl/
+
+MAINTAINER=		socrtp@soclab.eu.org
+HOMEPAGE=		http://solidpop3d.pld.org.pl/
+COMMENT=		Flexible POP3 server
+
+EGDIR=			${PREFIX}/share/examples/spop3d
+MESSAGE_SUBST+=		EGDIR=${EGDIR}
+
+PLIST_SRC=
+EXAMPLES=
+
+GNU_CONFIGURE=		yes
+
+CONFIGURE_ARGS+=	--enable-logextend	\
+			--enable-statistics
+
+.if defined(SPOP3D_ENABLE_APOP)
+CONFIGURE_ARGS+=	--enable-apop
+PLIST_SRC+=		${.CURDIR}/PLIST.apop
+.endif
+
+.if defined(SPOP3D_ENABLE_STANDALONE)
+CONFIGURE_ARGS+=	--enable-standalone
+CONFIGURE_ARGS+=	--enable-connect
+.endif
+
+.if defined(SPOP3D_ENABLE_ALIASES)
+CONFIGURE_ARGS+=	--enable-mapping
+CONFIGURE_ARGS+=	--enable-nonip
+.endif
+
+.if defined(USE_INET6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+EXAMPLES+=		config.example
+
+PLIST_SRC+=		${.CURDIR}/PLIST
+
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	cd ${WRKSRC}/doc; for i in ${EXAMPLES}; do			\
+		${INSTALL_DATA} $${i} ${EGDIR}/$${i};			\
+	done
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/solid-pop3d
+.for i in AUTHORS CONFIGFILE COPYING ChangeLog INSTALL README THANKS VIRTUALS
+	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/solid-pop3d
+.endfor
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/solid-pop3d/PLIST b/mail/solid-pop3d/PLIST
new file mode 100644
index 00000000000..37f1fc7e98a
--- /dev/null
+++ b/mail/solid-pop3d/PLIST
@@ -0,0 +1,16 @@
+@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:52:16 jlam Exp $
+man/man5/spop3d.conf.5
+man/man5/dot-spop3d.5
+man/man8/spop3d.8
+sbin/spop3d
+share/examples/spop3d/config.example
+share/doc/solid-pop3d/AUTHORS
+share/doc/solid-pop3d/CONFIGFILE
+share/doc/solid-pop3d/COPYING
+share/doc/solid-pop3d/ChangeLog
+share/doc/solid-pop3d/INSTALL
+share/doc/solid-pop3d/README
+share/doc/solid-pop3d/THANKS
+share/doc/solid-pop3d/VIRTUALS
+@dirrm share/examples/spop3d
+@dirrm share/doc/solid-pop3d
diff --git a/mail/solid-pop3d/PLIST.apop b/mail/solid-pop3d/PLIST.apop
new file mode 100644
index 00000000000..9662810cf3f
--- /dev/null
+++ b/mail/solid-pop3d/PLIST.apop
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.apop,v 1.1.1.1.50.2 2002/06/23 18:52:17 jlam Exp $
+man/man1/pop_auth.1
diff --git a/mail/solid-pop3d/distinfo b/mail/solid-pop3d/distinfo
new file mode 100644
index 00000000000..c3481640b94
--- /dev/null
+++ b/mail/solid-pop3d/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:52:17 jlam Exp $
+
+SHA1 (solid-pop3d-0.15.tar.gz) = 77534072dc352700acf23d29c781659833e53a04
+Size (solid-pop3d-0.15.tar.gz) = 102927 bytes
+SHA1 (patch-aa) = ce2a1959bfd917f99281c6b0f3e5ed9fd47511d8
diff --git a/mail/solid-pop3d/patches/patch-aa b/mail/solid-pop3d/patches/patch-aa
new file mode 100644
index 00000000000..d87b1941758
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1.50.2 2002/06/23 18:52:18 jlam Exp $
+
+--- configure	Mon May  6 01:06:20 2002
++++ configure	Mon May  6 01:06:28 2002
+@@ -82,7 +82,7 @@
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ infodir='${prefix}/share/info'
+-mandir='${prefix}/share/man'
++mandir='${prefix}/man'
+ 
+ # Initialize some other variables.
+ subdirs=
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index b0f4e34fd11..7c2ca85e154 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/05/03 14:57:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2002/06/23 18:52:19 jlam Exp $
 
 DISTNAME=	sqwebmail-3.3.1
 CATEGORIES=	www
@@ -14,7 +14,7 @@ REPLACE_PERL=		sysconftool
 
 .include "../../mail/courier-auth/Makefile.common"
 
-.if defined(STRIPFLAG) && !empty(STRIPFLAG:M-s)
+.if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
 INSTALL_TARGET=         install-strip
 .endif
 
diff --git a/mail/sylpheed-claws/DESCR b/mail/sylpheed-claws/DESCR
new file mode 100644
index 00000000000..969b8e67d6b
--- /dev/null
+++ b/mail/sylpheed-claws/DESCR
@@ -0,0 +1,20 @@
+Sylpheed is an e-mail client (and news reader) based on GTK+, running on
+X Window System, and aiming for
+
+ * Quick response
+ * Graceful, and sophisticated interface
+ * Easy configuration, intuitive operation
+ * Abundant features
+
+The appearance and interface are similar to some popular e-mail clients for
+Windows, such as Outlook Express, Becky!, and Datula. The interface is also
+designed to emulate the mailers on Emacsen, and almost all commands are
+accessible with the keyboard.
+
+The messages are managed by MH format, and you'll be able to use it together
+with another mailer based on MH format (like Mew). You can also utilize
+fetchmail or/and procmail, and external programs on receiving (like inc or
+imget).
+
+Sylpheed-Claws has many extra features and is regularly synchronised with
+ the main Sylpheed branch. 
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
new file mode 100644
index 00000000000..d874492e2be
--- /dev/null
+++ b/mail/sylpheed-claws/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:52:23 jlam Exp $
+
+DISTNAME=	sylpheed-0.7.6claws
+PKGNAME=	sylpheed-claws-0.7.6
+CATEGORIES=	mail news x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	ptiJo@noos.fr
+HOMEPAGE=	http://sylpheed-claws.sourceforge.net/
+COMMENT=	X based e-mail and netnews client
+
+CONFLICTS=	sylpheed-*
+
+BUILD_USES_MSGFMT=	yes
+
+USE_BUILDLINK_ONLY=	yes
+USE_GMAKE=		yes
+USE_X11BASE=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-gpgme
+CONFIGURE_ARGS+=	--enable-nls
+CONFIGURE_ARGS+=	--enable-ssl
+
+.include "../../mk/bsd.prefs.mk"
+BUILD_DEFS+=		USE_INET6
+
+.if defined(USE_INET6) && ${USE_INET6} == YES
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.include "../../graphics/imlib/buildlink.mk"
+.include "../../security/gpgme/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws/PLIST b/mail/sylpheed-claws/PLIST
new file mode 100644
index 00000000000..93996271754
--- /dev/null
+++ b/mail/sylpheed-claws/PLIST
@@ -0,0 +1,152 @@
+@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:52:24 jlam Exp $
+bin/sylpheed
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sylpheed.mo
+share/sylpheed/faq/de/sylpheed-faq-1.html
+share/sylpheed/faq/de/sylpheed-faq-2.html
+share/sylpheed/faq/de/sylpheed-faq-3.html
+share/sylpheed/faq/de/sylpheed-faq.html
+share/sylpheed/faq/en/sylpheed-faq-1.html
+share/sylpheed/faq/en/sylpheed-faq-2.html
+share/sylpheed/faq/en/sylpheed-faq-3.html
+share/sylpheed/faq/en/sylpheed-faq.html
+share/sylpheed/faq/es/sylpheed-faq-1.html
+share/sylpheed/faq/es/sylpheed-faq-2.html
+share/sylpheed/faq/es/sylpheed-faq-3.html
+share/sylpheed/faq/es/sylpheed-faq.html
+share/sylpheed/faq/fr/sylpheed-faq-1.html
+share/sylpheed/faq/fr/sylpheed-faq-2.html
+share/sylpheed/faq/fr/sylpheed-faq-3.html
+share/sylpheed/faq/fr/sylpheed-faq.html
+share/sylpheed/faq/it/sylpheed-faq-1.html
+share/sylpheed/faq/it/sylpheed-faq-2.html
+share/sylpheed/faq/it/sylpheed-faq-3.html
+share/sylpheed/faq/it/sylpheed-faq.html
+share/sylpheed/manual/de/sylpheed-1.html
+share/sylpheed/manual/de/sylpheed-10.html
+share/sylpheed/manual/de/sylpheed-11.html
+share/sylpheed/manual/de/sylpheed-12.html
+share/sylpheed/manual/de/sylpheed-13.html
+share/sylpheed/manual/de/sylpheed-14.html
+share/sylpheed/manual/de/sylpheed-15.html
+share/sylpheed/manual/de/sylpheed-16.html
+share/sylpheed/manual/de/sylpheed-17.html
+share/sylpheed/manual/de/sylpheed-18.html
+share/sylpheed/manual/de/sylpheed-19.html
+share/sylpheed/manual/de/sylpheed-2.html
+share/sylpheed/manual/de/sylpheed-20.html
+share/sylpheed/manual/de/sylpheed-3.html
+share/sylpheed/manual/de/sylpheed-4.html
+share/sylpheed/manual/de/sylpheed-5.html
+share/sylpheed/manual/de/sylpheed-6.html
+share/sylpheed/manual/de/sylpheed-7.html
+share/sylpheed/manual/de/sylpheed-8.html
+share/sylpheed/manual/de/sylpheed-9.html
+share/sylpheed/manual/de/sylpheed.html
+share/sylpheed/manual/en/sylpheed-1.html
+share/sylpheed/manual/en/sylpheed-10.html
+share/sylpheed/manual/en/sylpheed-11.html
+share/sylpheed/manual/en/sylpheed-12.html
+share/sylpheed/manual/en/sylpheed-13.html
+share/sylpheed/manual/en/sylpheed-14.html
+share/sylpheed/manual/en/sylpheed-15.html
+share/sylpheed/manual/en/sylpheed-16.html
+share/sylpheed/manual/en/sylpheed-17.html
+share/sylpheed/manual/en/sylpheed-18.html
+share/sylpheed/manual/en/sylpheed-19.html
+share/sylpheed/manual/en/sylpheed-2.html
+share/sylpheed/manual/en/sylpheed-20.html
+share/sylpheed/manual/en/sylpheed-3.html
+share/sylpheed/manual/en/sylpheed-4.html
+share/sylpheed/manual/en/sylpheed-5.html
+share/sylpheed/manual/en/sylpheed-6.html
+share/sylpheed/manual/en/sylpheed-7.html
+share/sylpheed/manual/en/sylpheed-8.html
+share/sylpheed/manual/en/sylpheed-9.html
+share/sylpheed/manual/en/sylpheed.html
+share/sylpheed/manual/es/sylpheed-1.html
+share/sylpheed/manual/es/sylpheed-10.html
+share/sylpheed/manual/es/sylpheed-11.html
+share/sylpheed/manual/es/sylpheed-12.html
+share/sylpheed/manual/es/sylpheed-13.html
+share/sylpheed/manual/es/sylpheed-14.html
+share/sylpheed/manual/es/sylpheed-15.html
+share/sylpheed/manual/es/sylpheed-16.html
+share/sylpheed/manual/es/sylpheed-17.html
+share/sylpheed/manual/es/sylpheed-18.html
+share/sylpheed/manual/es/sylpheed-19.html
+share/sylpheed/manual/es/sylpheed-2.html
+share/sylpheed/manual/es/sylpheed-20.html
+share/sylpheed/manual/es/sylpheed-3.html
+share/sylpheed/manual/es/sylpheed-4.html
+share/sylpheed/manual/es/sylpheed-5.html
+share/sylpheed/manual/es/sylpheed-6.html
+share/sylpheed/manual/es/sylpheed-7.html
+share/sylpheed/manual/es/sylpheed-8.html
+share/sylpheed/manual/es/sylpheed-9.html
+share/sylpheed/manual/es/sylpheed.html
+share/sylpheed/manual/fr/sylpheed-1.html
+share/sylpheed/manual/fr/sylpheed-10.html
+share/sylpheed/manual/fr/sylpheed-11.html
+share/sylpheed/manual/fr/sylpheed-12.html
+share/sylpheed/manual/fr/sylpheed-13.html
+share/sylpheed/manual/fr/sylpheed-14.html
+share/sylpheed/manual/fr/sylpheed-15.html
+share/sylpheed/manual/fr/sylpheed-16.html
+share/sylpheed/manual/fr/sylpheed-17.html
+share/sylpheed/manual/fr/sylpheed-18.html
+share/sylpheed/manual/fr/sylpheed-19.html
+share/sylpheed/manual/fr/sylpheed-2.html
+share/sylpheed/manual/fr/sylpheed-20.html
+share/sylpheed/manual/fr/sylpheed-3.html
+share/sylpheed/manual/fr/sylpheed-4.html
+share/sylpheed/manual/fr/sylpheed-5.html
+share/sylpheed/manual/fr/sylpheed-6.html
+share/sylpheed/manual/fr/sylpheed-7.html
+share/sylpheed/manual/fr/sylpheed-8.html
+share/sylpheed/manual/fr/sylpheed-9.html
+share/sylpheed/manual/fr/sylpheed.html
+share/sylpheed/manual/ja/sylpheed-1.html
+share/sylpheed/manual/ja/sylpheed-10.html
+share/sylpheed/manual/ja/sylpheed-11.html
+share/sylpheed/manual/ja/sylpheed-12.html
+share/sylpheed/manual/ja/sylpheed-13.html
+share/sylpheed/manual/ja/sylpheed-14.html
+share/sylpheed/manual/ja/sylpheed-15.html
+share/sylpheed/manual/ja/sylpheed-16.html
+share/sylpheed/manual/ja/sylpheed-17.html
+share/sylpheed/manual/ja/sylpheed-2.html
+share/sylpheed/manual/ja/sylpheed-3.html
+share/sylpheed/manual/ja/sylpheed-4.html
+share/sylpheed/manual/ja/sylpheed-5.html
+share/sylpheed/manual/ja/sylpheed-6.html
+share/sylpheed/manual/ja/sylpheed-7.html
+share/sylpheed/manual/ja/sylpheed-8.html
+share/sylpheed/manual/ja/sylpheed-9.html
+share/sylpheed/manual/ja/sylpheed.html
+share/sylpheed/manual/ja/sylpheed.sgml
+@dirrm share/sylpheed/manual/ja
+@dirrm share/sylpheed/manual/fr
+@dirrm share/sylpheed/manual/es
+@dirrm share/sylpheed/manual/en
+@dirrm share/sylpheed/manual/de
+@dirrm share/sylpheed/manual
+@dirrm share/sylpheed/faq/it
+@dirrm share/sylpheed/faq/fr
+@dirrm share/sylpheed/faq/es
+@dirrm share/sylpheed/faq/en
+@dirrm share/sylpheed/faq/de
+@dirrm share/sylpheed/faq
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
new file mode 100644
index 00000000000..982fb100d71
--- /dev/null
+++ b/mail/sylpheed-claws/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:52:24 jlam Exp $
+
+SHA1 (sylpheed-0.7.6claws.tar.bz2) = c864a7af21d0bd7feed41baa38ce01e2807ad76e
+Size (sylpheed-0.7.6claws.tar.bz2) = 1540297 bytes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index b3e9fe0648e..214885138eb 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2002/05/04 07:44:38 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:52:20 jlam Exp $
 
-DISTNAME=		sylpheed-0.7.5
+DISTNAME=		sylpheed-0.7.6
 CATEGORIES=		mail news x11
 MASTER_SITES=		http://sylpheed.good-day.net/sylpheed/
 EXTRACT_SUFX=		.tar.bz2
@@ -9,6 +9,8 @@ MAINTAINER=	oishi@ims.ac.jp
 HOMEPAGE=	http://sylpheed.good-day.net/index.cgi.en
 COMMENT=	X based e-mail and netnews client
 
+CONFLICTS=	sylpheed-claws-*
+
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK_ONLY=	yes
@@ -16,9 +18,16 @@ USE_GMAKE=		yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-nls
-CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ARGS+=	--enable-gpgme
+CONFIGURE_ARGS+=	--disable-compface
+
+.include "../../mk/bsd.prefs.mk"
+BUILD_DEFS+=		USE_INET6
+
+.if defined(USE_INET6) && ${USE_INET6} == YES
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
 
 .include "../../security/gpgme/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
diff --git a/mail/sylpheed/PLIST b/mail/sylpheed/PLIST
index f4f04a9b7eb..0f138bd31d8 100644
--- a/mail/sylpheed/PLIST
+++ b/mail/sylpheed/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/17 15:14:20 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:52:21 jlam Exp $
 bin/sylpheed
 share/locale/cs/LC_MESSAGES/sylpheed.mo
 share/locale/da/LC_MESSAGES/sylpheed.mo
@@ -21,6 +21,10 @@ share/locale/sv/LC_MESSAGES/sylpheed.mo
 share/locale/tr/LC_MESSAGES/sylpheed.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
+share/sylpheed/faq/de/sylpheed-faq-1.html
+share/sylpheed/faq/de/sylpheed-faq-2.html
+share/sylpheed/faq/de/sylpheed-faq-3.html
+share/sylpheed/faq/de/sylpheed-faq.html
 share/sylpheed/faq/en/sylpheed-faq-1.html
 share/sylpheed/faq/en/sylpheed-faq-2.html
 share/sylpheed/faq/en/sylpheed-faq-3.html
@@ -33,6 +37,10 @@ share/sylpheed/faq/fr/sylpheed-faq-1.html
 share/sylpheed/faq/fr/sylpheed-faq-2.html
 share/sylpheed/faq/fr/sylpheed-faq-3.html
 share/sylpheed/faq/fr/sylpheed-faq.html
+share/sylpheed/faq/it/sylpheed-faq-1.html
+share/sylpheed/faq/it/sylpheed-faq-2.html
+share/sylpheed/faq/it/sylpheed-faq-3.html
+share/sylpheed/faq/it/sylpheed-faq.html
 share/sylpheed/manual/en/sylpheed-1.html
 share/sylpheed/manual/en/sylpheed-10.html
 share/sylpheed/manual/en/sylpheed-11.html
@@ -43,7 +51,9 @@ share/sylpheed/manual/en/sylpheed-15.html
 share/sylpheed/manual/en/sylpheed-16.html
 share/sylpheed/manual/en/sylpheed-17.html
 share/sylpheed/manual/en/sylpheed-18.html
+share/sylpheed/manual/en/sylpheed-19.html
 share/sylpheed/manual/en/sylpheed-2.html
+share/sylpheed/manual/en/sylpheed-20.html
 share/sylpheed/manual/en/sylpheed-3.html
 share/sylpheed/manual/en/sylpheed-4.html
 share/sylpheed/manual/en/sylpheed-5.html
@@ -61,7 +71,10 @@ share/sylpheed/manual/ja/sylpheed-14.html
 share/sylpheed/manual/ja/sylpheed-15.html
 share/sylpheed/manual/ja/sylpheed-16.html
 share/sylpheed/manual/ja/sylpheed-17.html
+share/sylpheed/manual/ja/sylpheed-18.html
+share/sylpheed/manual/ja/sylpheed-19.html
 share/sylpheed/manual/ja/sylpheed-2.html
+share/sylpheed/manual/ja/sylpheed-20.html
 share/sylpheed/manual/ja/sylpheed-3.html
 share/sylpheed/manual/ja/sylpheed-4.html
 share/sylpheed/manual/ja/sylpheed-5.html
@@ -74,8 +87,10 @@ share/sylpheed/manual/ja/sylpheed.sgml
 @dirrm share/sylpheed/manual/ja
 @dirrm share/sylpheed/manual/en
 @dirrm share/sylpheed/manual
+@dirrm share/sylpheed/faq/it
 @dirrm share/sylpheed/faq/fr
 @dirrm share/sylpheed/faq/es
 @dirrm share/sylpheed/faq/en
+@dirrm share/sylpheed/faq/de
 @dirrm share/sylpheed/faq
 @dirrm share/sylpheed
diff --git a/mail/sylpheed/distinfo b/mail/sylpheed/distinfo
index 1a82f1e7878..843db9ee5cb 100644
--- a/mail/sylpheed/distinfo
+++ b/mail/sylpheed/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/05/04 07:44:39 uebayasi Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:52:22 jlam Exp $
 
-SHA1 (sylpheed-0.7.5.tar.bz2) = ce3d18e6eb2cbe53bf539b14ce5c8550a190a4e9
-Size (sylpheed-0.7.5.tar.bz2) = 1701512 bytes
+SHA1 (sylpheed-0.7.6.tar.bz2) = e674ee38903a94003ebe2282a9d8268095eea832
+Size (sylpheed-0.7.6.tar.bz2) = 1731069 bytes
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index f3655d34949..79c8eaedfd9 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2002/05/07 22:49:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:52:25 jlam Exp $
 
-DISTNAME=	teapop-0.3.4
-PKGREVISION=	1
+DISTNAME=	teapop-0.3.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/			\
 		http://www.toontown.org/pub/teapop/
 
-MAINTAINER=	dawszy@netbsd.org
+MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://www.toontown.org/teapop/
 COMMENT=	Yet another RFC1939 compliant POP3 server
 
@@ -21,6 +20,12 @@ CONF_FILES=	${EGDIR}/teapop.passwd ${PKG_SYSCONFDIR}/teapop.passwd
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(POP_WITH_DRAC)
+.include "../../mail/drac/buildlink.mk"
+CONFIGURE_ARGS+=	--with-drac=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=	--with-dracinc=${BUILDLINK_DIR}/include
+.endif
+
 .if defined(TEAPOP_WITHOUT_APOP)
 CONFIGURE_ARGS+=--disable-apop
 .endif
@@ -30,9 +35,9 @@ CONFIGURE_ARGS+=--disable-vpop
 .endif
 
 .if defined(TEAPOP_WITH_MYSQL)
-DEPENDS+=      mysql-client>=3.23:../../databases/mysql-client
-CONFIGURE_ARGS+=       --with-mysql=${LOCALBASE}
-LDFLAGS+=      -L${LOCALBASE}/lib/mysql -Wl,-R${LOCALBASE}/lib/mysql
+.include "../../databases/mysql-client/buildlink.mk"
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_DIR}
+LDFLAGS+=	-L${BUILDLINK_DIR}/lib/mysql -Wl,-R${LOCALBASE}/lib/mysql
 .endif
 
 post-build:
diff --git a/mail/teapop/PLIST b/mail/teapop/PLIST
index 6ce1cf656f8..509dade04b0 100644
--- a/mail/teapop/PLIST
+++ b/mail/teapop/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/07 22:49:19 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:52:26 jlam Exp $
 etc/rc.d/teapop
-etc/teapop.passwd
 libexec/teapop
 man/man8/teapop.8
 sbin/cronpopauth.pl
diff --git a/mail/teapop/distinfo b/mail/teapop/distinfo
index 5d3c07f7d3e..fa0efc6ba5e 100644
--- a/mail/teapop/distinfo
+++ b/mail/teapop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/04/29 16:44:17 hubertf Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:52:26 jlam Exp $
 
-SHA1 (teapop-0.3.4.tar.gz) = 36f710c0b57caf9595d6f901da33a4d74028bc79
-Size (teapop-0.3.4.tar.gz) = 139108 bytes
+SHA1 (teapop-0.3.5.tar.gz) = 27e86a4b467f24f2527ecf15ad92cbb3471d1346
+Size (teapop-0.3.5.tar.gz) = 139858 bytes
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index aeaa5680fca..2ebeea67b70 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/04/23 19:26:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:52:28 jlam Exp $
 #
 
-DISTNAME=	tmda-0.52
+DISTNAME=	tmda-0.55
 CATEGORIES=	mail python
 MASTER_SITES=	http://software.libertine.org/tmda/releases/ \
 		http://software.libertine.org/tmda/releases/old/
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index ff3f5159ce5..ec8b792b8e5 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/04/23 19:26:34 schmonz Exp $
+$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:52:28 jlam Exp $
 
-SHA1 (tmda-0.52.tgz) = 71482b20c2201cb0db3653a20cab580c2340707e
-Size (tmda-0.52.tgz) = 125340 bytes
+SHA1 (tmda-0.55.tgz) = 993ea1fc1034051b864e407f130da652c5b98c93
+Size (tmda-0.55.tgz) = 127568 bytes
author	jlam <jlam@pkgsrc.org>	2002-06-23 18:47:13 +0000
committer	jlam <jlam@pkgsrc.org>	2002-06-23 18:47:13 +0000
commit	759f695a1894bbbad984096b1fc5a2b518204b48 (patch)
tree	d083c952704be7ad44edb76d627f92c7fd938f5e /mail
parent	e43bd7cdef06b9274e767e76147d46a933f396af (diff)
download	pkgsrc-759f695a1894bbbad984096b1fc5a2b518204b48.tar.gz