summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/msmtp/Makefile8
-rw-r--r--mail/msmtp/PLIST3
-rw-r--r--mail/msmtp/distinfo14
-rw-r--r--mail/msmtp/options.mk12
-rw-r--r--mail/msmtp/patches/patch-aa29
-rw-r--r--mail/msmtp/patches/patch-ab19
-rw-r--r--mail/msmtp/patches/patch-ac12
-rw-r--r--mail/msmtp/patches/patch-ad12
-rw-r--r--mail/msmtp/patches/patch-ae12
-rw-r--r--mail/msmtp/patches/patch-af12
10 files changed, 21 insertions, 112 deletions
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 77082936890..42d62c2a8e8 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2006/04/05 16:41:34 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/08 08:05:22 obache Exp $
-DISTNAME= msmtp-1.4.5
+DISTNAME= msmtp-1.4.13
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=msmtp/}
EXTRACT_SUFX= .tar.bz2
@@ -11,6 +11,7 @@ COMMENT= SMTP plugin for MUAs
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
+USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -18,7 +19,7 @@ EGDIR= ${PREFIX}/share/examples/msmtp
CONF_FILES= ${EGDIR}/msmtprc-user.example \
${PKG_SYSCONFDIR}/msmtprc
-INFO_FILES= # PLIST
+INFO_FILES= yes
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Interix"
@@ -31,4 +32,5 @@ post-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-user.example ${EGDIR}
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST
index a04ea5202b9..9209d12f494 100644
--- a/mail/msmtp/PLIST
+++ b/mail/msmtp/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/05 16:41:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/09/08 08:05:22 obache Exp $
bin/msmtp
info/msmtp.info
man/man1/msmtp.1
share/examples/msmtp/msmtprc-user.example
+share/locale/de/LC_MESSAGES/msmtp.mo
@dirrm share/examples/msmtp
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 76d24b8e218..3c13ae08343 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.13 2006/01/14 20:08:20 ben Exp $
+$NetBSD: distinfo,v 1.14 2007/09/08 08:05:23 obache Exp $
-SHA1 (msmtp-1.4.5.tar.bz2) = 2734c4b0ab50d221c6c8248cdafc4af6ee0f6cf5
-RMD160 (msmtp-1.4.5.tar.bz2) = 21428a4d7c93da8383fe8f752b224dd2c0aff014
-Size (msmtp-1.4.5.tar.bz2) = 489336 bytes
-SHA1 (patch-aa) = 30be9810fdbdd1de0c4727c94d5c799317548bdb
-SHA1 (patch-ab) = 9ce732fb3258f0b5fcafaabaa92960489a62124e
-SHA1 (patch-ac) = 54b47760510320c08cf9703ce79ea431a69115e4
-SHA1 (patch-ad) = 1191e01ccad89532badb4240cb1e190965f1ed40
-SHA1 (patch-ae) = 1d5c4ece937ce23580ab2aef3d9362925023d7ad
-SHA1 (patch-af) = 3810dba45fdf83a8534fdac118b9da66db5bafc8
+SHA1 (msmtp-1.4.13.tar.bz2) = c1d0dee2b8e035289a0467d687ec8066dba61e97
+RMD160 (msmtp-1.4.13.tar.bz2) = a9e701fcfbcf38d240c474dbc8860de259dedc4e
+Size (msmtp-1.4.13.tar.bz2) = 704779 bytes
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
index f80deaf5746..bc0c42a6488 100644
--- a/mail/msmtp/options.mk
+++ b/mail/msmtp/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.8 2005/08/31 18:37:33 tv Exp $
+# $NetBSD: options.mk,v 1.9 2007/09/08 08:05:23 obache Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.msmtp
PKG_OPTIONS_OPTIONAL_GROUPS= ssl
PKG_OPTIONS_GROUP.ssl= gnutls ssl
-PKG_SUPPORTED_OPTIONS= gsasl inet6
+PKG_SUPPORTED_OPTIONS= gsasl idn inet6
PKG_SUGGESTED_OPTIONS= ssl
.include "../../mk/bsd.options.mk"
@@ -29,3 +29,11 @@ CONFIGURE_ARGS+= --disable-ssl
.if !empty(PKG_OPTIONS:Mgsasl)
. include "../../security/gsasl/buildlink3.mk"
.endif
+
+###
+### Internationalized Domain Names (IDN) support
+###
+.if !empty(PKG_OPTIONS:Midn)
+. include "../../devel/libidn/buildlink3.mk"
+CONFIGURE_ARGS+= --with-libidn
+.endif
diff --git a/mail/msmtp/patches/patch-aa b/mail/msmtp/patches/patch-aa
deleted file mode 100644
index 3cc143e26cd..00000000000
--- a/mail/msmtp/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/01/08 16:38:41 joerg Exp $
-
---- src/net.c.orig 2005-08-14 20:13:06.000000000 +0000
-+++ src/net.c
-@@ -43,7 +43,6 @@
- #define NI_MAXHOST 1025
- #endif
- #include <errno.h>
--extern int errno;
- #else /* UNIX */
- #include <unistd.h>
- #include <fcntl.h>
-@@ -57,7 +56,6 @@ extern int h_errno;
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <errno.h>
--extern int errno;
- #endif /* UNIX */
-
- #include "gettext.h"
-@@ -325,7 +323,7 @@ void net_set_io_timeout(int socket, int
- * en-us/winsock/winsock/setsockopt_2.asp
- * We activate these timeouts only for Windows systems that also have
- * getaddrinfo(), which means XP or newer, to work around this problem. */
--#if defined __MINGW32__ && !defined HAVE_GETADDRINFO
-+#if (defined __MINGW32__ && !defined HAVE_GETADDRINFO) || defined __WINSOCK
- /* do nothing */
- #else
- struct timeval tv;
diff --git a/mail/msmtp/patches/patch-ab b/mail/msmtp/patches/patch-ab
deleted file mode 100644
index 8afc1019b12..00000000000
--- a/mail/msmtp/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/01/08 16:38:41 joerg Exp $
-
---- src/msmtp.c.orig 2005-08-14 20:13:02.000000000 +0000
-+++ src/msmtp.c
-@@ -31,7 +31,6 @@
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
- #include <time.h>
- #include <getopt.h>
- extern char *optarg;
-@@ -3382,5 +3381,5 @@ exit:
- list_xfree(errmsg, free);
- }
-
-- return error_code;
-+ return (error_code == EX_OK) ? 0 : error_code;
- }
diff --git a/mail/msmtp/patches/patch-ac b/mail/msmtp/patches/patch-ac
deleted file mode 100644
index 47bfe850211..00000000000
--- a/mail/msmtp/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/08 16:38:41 joerg Exp $
-
---- src/conf.c.orig 2006-01-08 16:30:23.000000000 +0000
-+++ src/conf.c
-@@ -31,7 +31,6 @@
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
-
- #include "gettext.h"
- #include "xalloc.h"
diff --git a/mail/msmtp/patches/patch-ad b/mail/msmtp/patches/patch-ad
deleted file mode 100644
index a3c83eabd70..00000000000
--- a/mail/msmtp/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/08 16:38:41 joerg Exp $
-
---- src/tls.c.orig 2006-01-08 16:34:02.000000000 +0000
-+++ src/tls.c
-@@ -33,7 +33,6 @@
- #include <limits.h>
- #include <time.h>
- #include <errno.h>
--extern int errno;
-
- #ifdef HAVE_GNUTLS
- #include <gnutls/gnutls.h>
diff --git a/mail/msmtp/patches/patch-ae b/mail/msmtp/patches/patch-ae
deleted file mode 100644
index 34f7f8202ac..00000000000
--- a/mail/msmtp/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/08 16:38:41 joerg Exp $
-
---- src/os_env.c.orig 2006-01-08 16:32:07.000000000 +0000
-+++ src/os_env.c
-@@ -29,7 +29,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--extern int errno;
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/mail/msmtp/patches/patch-af b/mail/msmtp/patches/patch-af
deleted file mode 100644
index b925836c6af..00000000000
--- a/mail/msmtp/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/08 16:38:41 joerg Exp $
-
---- src/smtp.c.orig 2006-01-08 16:33:04.000000000 +0000
-+++ src/smtp.c
-@@ -33,7 +33,6 @@
- #include <strings.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
-
- #ifdef USE_GSASL
- #include <gsasl.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-09 03:44:12 +0000