From f08518b4b82bf55bcd86a527f05455819559300e Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 28 Jul 2003 14:51:35 +0000 Subject: -update to 1.0 changes: -bugfixes -build framework modifications -USE_LIBTOOL instead of .include libtool/buildlink -add a patch to include instead of to make it build with openssl-0.97 -- don't know whether this works with non-NetBSD systems; if needed, a link into .buildlink/include should help --- mail/libesmtp/Makefile | 9 +++++---- mail/libesmtp/PLIST | 4 ++-- mail/libesmtp/distinfo | 9 ++++----- mail/libesmtp/patches/patch-aa | 18 ------------------ mail/libesmtp/patches/patch-ac | 23 ----------------------- mail/libesmtp/patches/patch-ad | 13 +++++++++++++ 6 files changed, 24 insertions(+), 52 deletions(-) delete mode 100644 mail/libesmtp/patches/patch-aa delete mode 100644 mail/libesmtp/patches/patch-ac create mode 100644 mail/libesmtp/patches/patch-ad (limited to 'mail/libesmtp') diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index dc158772ab5..6fbe3867d94 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:39 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2003/07/28 14:51:35 drochner Exp $ -DISTNAME= libesmtp-1.0rc1 -PKGREVISION= 1 +DISTNAME= libesmtp-1.0 CATEGORIES= mail devel MASTER_SITES= http://www.stafford.uklinux.net/libesmtp/ \ http://www.tobez.org/download/port-mirrors/mail/libesmtp/ \ @@ -16,8 +15,10 @@ USE_BUILDLINK2= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-all +CONFIGURE_ARGS+= --disable-isoc +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/pthread.buildlink2.mk" .include "../../security/openssl/buildlink2.mk" -.include "../../devel/libtool/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/libesmtp/PLIST b/mail/libesmtp/PLIST index 62be38d9e3d..1b7c683a5f3 100644 --- a/mail/libesmtp/PLIST +++ b/mail/libesmtp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/22 13:01:24 cjep Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/07/28 14:51:35 drochner Exp $ bin/libesmtp-config include/auth-client.h include/auth-plugin.h @@ -19,5 +19,5 @@ lib/libesmtp.a lib/libesmtp.la lib/libesmtp.so lib/libesmtp.so.6 -lib/libesmtp.so.6.0 +lib/libesmtp.so.6.1 @dirrm lib/esmtp-plugins diff --git a/mail/libesmtp/distinfo b/mail/libesmtp/distinfo index a448e79d18f..a88c1c8bd53 100644 --- a/mail/libesmtp/distinfo +++ b/mail/libesmtp/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.2 2002/10/02 22:08:43 dillo Exp $ +$NetBSD: distinfo,v 1.3 2003/07/28 14:51:35 drochner Exp $ -SHA1 (libesmtp-1.0rc1.tar.bz2) = ae74259df8457ce5efb6e838674cd9464ffda2ce -Size (libesmtp-1.0rc1.tar.bz2) = 251615 bytes -SHA1 (patch-aa) = 83f000765b7bf3b498f0fa2130360c1aae85a043 +SHA1 (libesmtp-1.0.tar.bz2) = c8cd2eb0d3b03c7a041a63ad564bf5ae6e602eec +Size (libesmtp-1.0.tar.bz2) = 230169 bytes SHA1 (patch-ab) = cc027b93ae55b84c1b569ddcdd2644d4f63a33a5 -SHA1 (patch-ac) = e3c9b741915b7e24e307c9adfde2063a06430f5d +SHA1 (patch-ad) = 80446e62fef1bd6a99dec98020924fada41acffa diff --git a/mail/libesmtp/patches/patch-aa b/mail/libesmtp/patches/patch-aa deleted file mode 100644 index 6ca930c4f37..00000000000 --- a/mail/libesmtp/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/09/22 13:01:25 cjep Exp $ - ---- configure.in.orig Mon Jun 24 12:47:45 2002 -+++ configure.in -@@ -99,7 +99,13 @@ - fi - AC_DEFINE(_ISOC9X_SOURCE,1,[ISO compliant code]) - AC_DEFINE(_POSIX_C_SOURCE,199506L,[POSIX compliant code]) -+ case $host_vendor-$host_os in -+ *netbsd*) -+ AC_DEFINE(_XOPEN_SOURCE,520,[NetBSD needs this for getaddrinfo]) -+ ;; -+ *) - AC_DEFINE(_XOPEN_SOURCE,500,[Single Unix conformance]) -+ esac - fi - - dnl ######################################################################### diff --git a/mail/libesmtp/patches/patch-ac b/mail/libesmtp/patches/patch-ac deleted file mode 100644 index edfabed5697..00000000000 --- a/mail/libesmtp/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2002/10/02 22:08:43 dillo Exp $ - ---- configure.orig Thu Oct 3 00:01:46 2002 -+++ configure -@@ -6612,10 +6612,17 @@ EOF - cat >>confdefs.h <<\EOF - #define _POSIX_C_SOURCE 199506L - EOF -- -+case $host_vendor-$host_os in -+*netbsd*) -+cat >>confdefs.h <<\EOF -+#define _XOPEN_SOURCE 520 -+EOF -+;; -+*) - cat >>confdefs.h <<\EOF - #define _XOPEN_SOURCE 500 - EOF -+esac - - fi - diff --git a/mail/libesmtp/patches/patch-ad b/mail/libesmtp/patches/patch-ad new file mode 100644 index 00000000000..060a61c8419 --- /dev/null +++ b/mail/libesmtp/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2003/07/28 14:51:37 drochner Exp $ + +--- ntlm/ntlmdes.c.orig 2003-07-25 19:54:18.000000000 +0200 ++++ ntlm/ntlmdes.c 2003-07-25 19:54:34.000000000 +0200 +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "ntlm.h" -- cgit v1.2.3