Update esmtp to 1.2.

While here, set LICENSE=gnu-gpl-v2 and add user-destdir installation support.

News
~~~~
THIS PROJECT IS NO LONGER BEING MAINTAINED. IF IT DOESN'T WORK FOR YOU SEE
THESE LINKS <http://esmtp.sourceforge.net/links.html>.

  * Version 1.2 (2009-12-24):

    * Make force_mda in the esmtprc to work with the -t option (based on patch
    by Sourav K. Mandal)

  * Version 1.1 (2009-12-16):

    * Option to force local only MDA (Robert A.M. Diamond).

    * Use locking in esmtp-wrapper (Phil Sutter).

    * Update mutt option name in the user manual (Wu Fengguang).

  * Version 1.0 (2008-10-09):

    * Fix NTLM authentication (Nils Rennebarth).

    * Option to disable Message-ID header (Phil Sutter).

  * Version 0.6.0 (2007-09-03):

    * Handle CR-LF newline endings when parsing the headers.

    * Wrapper script for off-line mail delivery (Phil Sutter).

    * Document how to get CA certificates.

    * Corrections to the manpages (Reuben Thomas).

    * Tips for adding missing Date: headers in messages for local delivery
    (Bruce Schultz).

    * Use a reasonable default for the reverse path when one is not
    specified, instead of an empty one.

    * Prevent segfault expanding %F in the MDA string when the reverse
    path is not specified.

4 files changed, 24 insertions, 29 deletions

diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index b06a8764b2d..ad9d7b97727 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/01/17 12:02:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/12 13:12:08 obache Exp $
 #
 
-DISTNAME=	esmtp-0.5.1
-PKGREVISION=	4
+DISTNAME=	esmtp-1.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=esmtp/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +9,12 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://esmtp.sourceforge.net/
 COMMENT=	Relay-only Mail Transfer Agent with sendmail-compatible syntax
+LICENSE=	gnu-gpl-v2
+
+CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
+CONFLICTS+=	sendmail-[0-9]*
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		bison flex
@@ -30,14 +35,14 @@ EGDIR=			${PREFIX}/share/examples/esmtp
 CONF_FILES=		${EGDIR}/sample.esmtprc \
 			${PKG_SYSCONFDIR}/esmtprc
 
+INSTALLATION_DIRS=	${EGDIR} share/doc/esmtp
+
 .include "../../mail/libesmtp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/esmtp
-	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/esmtp
+	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/esmtp
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/esmtp/PLIST b/mail/esmtp/PLIST
index f00cd41bbf4..a03a181122f 100644
--- a/mail/esmtp/PLIST
+++ b/mail/esmtp/PLIST
@@ -1,6 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/03/12 13:12:08 obache Exp $
 bin/esmtp
+bin/mailq
+bin/newaliases
+lib/sendmail
 man/man1/esmtp.1
+man/man1/mailq.1
+man/man1/newaliases.1
+man/man1/sendmail.1
 man/man5/esmtprc.5
+sbin/sendmail
 share/doc/esmtp/README
 share/examples/esmtp/sample.esmtprc
diff --git a/mail/esmtp/distinfo b/mail/esmtp/distinfo
index 9d602851239..e8d854a4d9d 100644
--- a/mail/esmtp/distinfo
+++ b/mail/esmtp/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/12 04:13:12 minskim Exp $
+$NetBSD: distinfo,v 1.2 2010/03/12 13:12:08 obache Exp $
 
-SHA1 (esmtp-0.5.1.tar.bz2) = daf31e9e4283dbbc8a35b1841626b69bc636960e
-RMD160 (esmtp-0.5.1.tar.bz2) = 740e9bbd855095bd89673345f22bcab4557c013a
-Size (esmtp-0.5.1.tar.bz2) = 127355 bytes
-SHA1 (patch-aa) = be7a30232434f5b9bcc61b9523e434b8dc5bfed9
+SHA1 (esmtp-1.2.tar.bz2) = 01405c2ea5821c080edb37b16b1523234a442915
+RMD160 (esmtp-1.2.tar.bz2) = 3fcd5908273087858dca8162c8440760774d8bf0
+Size (esmtp-1.2.tar.bz2) = 127921 bytes
diff --git a/mail/esmtp/patches/patch-aa b/mail/esmtp/patches/patch-aa
deleted file mode 100644
index 524c463c373..00000000000
--- a/mail/esmtp/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/12 04:13:12 minskim Exp $
-
---- Makefile.in.orig	2005-03-10 18:00:26.000000000 +0000
-+++ Makefile.in
-@@ -630,11 +630,9 @@ info-am:
- 
- install-data-am: install-man
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am: install-binPROGRAMS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
- install-info: install-info-am
-