4 files changed, 22 insertions, 38 deletions

diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 77d129e5f8eb..0a48557d314f 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libesmtp
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.stafford.uklinux.net/libesmtp/ \
@@ -26,18 +25,20 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 # require-all-recipients (implied by enable-all) is required for Balsa
 CONFIGURE_ARGS=	--enable-all --disable-isoc
 
+DOCS=		AUTHORS ChangeLog NEWS Notes README TODO
+EXAMPLES=	examples/*
+
 post-install:
-.ifndef(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Notes ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/libesmtp/distinfo b/mail/libesmtp/distinfo
index 94a8e3dac6b2..a22e0e85ca4d 100644
--- a/mail/libesmtp/distinfo
+++ b/mail/libesmtp/distinfo
@@ -1 +1 @@
-MD5 (libesmtp-1.0.tar.bz2) = 6da5742bd8119a48a8385adfad14ea85
+MD5 (libesmtp-1.0.1.tar.bz2) = cc46945dda55629bb7c81c2b3b39d0b3
diff --git a/mail/libesmtp/files/patch-ntml::ntlmdes.c b/mail/libesmtp/files/patch-ntml::ntlmdes.c
deleted file mode 100644
index cceb11310ffa..000000000000
--- a/mail/libesmtp/files/patch-ntml::ntlmdes.c
+++ /dev/null
@@ -1,21 +0,0 @@
-*** ntlm/ntlmdes.c.orig	Wed Feb 12 07:08:05 2003
---- ntlm/ntlmdes.c	Wed Feb 12 07:08:24 2003
-***************
-*** 60,67 ****
-    des_ecb_encrypt (iv, result, ks, DES_ENCRYPT);
-  
-    /* paranoia */
-!   memset (key, 0, sizeof key);
-!   memset (ks, 0, sizeof ks);
-  }
-  
-  /* Copy and convert to upper case.  If supplied string is shorter than the
---- 60,67 ----
-    des_ecb_encrypt (iv, result, ks, DES_ENCRYPT);
-  
-    /* paranoia */
-!   memset (&key, 0, sizeof key);
-!   memset (&ks, 0, sizeof ks);
-  }
-  
-  /* Copy and convert to upper case.  If supplied string is shorter than the
diff --git a/mail/libesmtp/pkg-plist b/mail/libesmtp/pkg-plist
index dc04ed576b92..d5d167b66453 100644
--- a/mail/libesmtp/pkg-plist
+++ b/mail/libesmtp/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/libesmtp-config
 include/auth-client.h
 include/auth-plugin.h
@@ -6,15 +7,18 @@ lib/esmtp-plugins/sasl-cram-md5.so
 lib/esmtp-plugins/sasl-login.so
 lib/esmtp-plugins/sasl-ntlm.so
 lib/esmtp-plugins/sasl-plain.so
+@dirrm lib/esmtp-plugins
 lib/libesmtp.a
 lib/libesmtp.so
 lib/libesmtp.so.6
-%%PORTDOCS%%share/doc/libesmtp/INSTALL
-%%PORTDOCS%%share/doc/libesmtp/Notes
-%%PORTDOCS%%share/doc/libesmtp/README
-%%PORTDOCS%%share/examples/libesmtp/Makefile
-%%PORTDOCS%%share/examples/libesmtp/mail-file.c
-%%PORTDOCS%%share/examples/libesmtp/test-mail
-%%PORTDOCS%%@dirrm share/examples/libesmtp
-%%PORTDOCS%%@dirrm share/doc/libesmtp
-@unexec rmdir %D/lib/esmtp-plugins 2>/dev/null || true
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/Notes
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/Makefile
+%%EXAMPLESDIR%%/mail-file.c
+%%EXAMPLESDIR%%/test-mail
+@dirrm %%EXAMPLESDIR%%