From 7e42330e3f7709056ccc5e328ef0e541fb246651 Mon Sep 17 00:00:00 2001
From: Roman Bogorodskiy <novel@FreeBSD.org>
Date: Wed, 18 May 2011 09:47:14 +0000
Subject: - Update to 1.4.24 - Make OpenSSL support enabled by default

---
 mail/msmtp/Makefile                    |  6 +++---
 mail/msmtp/distinfo                    |  4 ++--
 mail/msmtp/files/patch-src-Makefile.in | 11 +++++++++++
 mail/msmtp/pkg-plist                   |  1 -
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 mail/msmtp/files/patch-src-Makefile.in

(limited to 'mail/msmtp')

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 74c6c95c37b4..1607090979a6 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	msmtp
-PORTVERSION=	1.4.23
-PORTREVISION=	2
+PORTVERSION=	1.4.24
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -25,7 +24,7 @@ INFO=	msmtp
 LICENSE=	GPLv3
 
 OPTIONS=	GNUTLS "Adds GnuTLS support" off \
-		OPENSSL "Adds support for SSL (Secure Socket Layer)" off \
+		OPENSSL "Adds support for SSL (Secure Socket Layer)" on \
 		GSASL "Adds GSASL support" off \
 		NLS "Native Language Support via gettext utilities" on \
 		IDN "Enable Internationalized Domain Names" on \
@@ -38,6 +37,7 @@ CONFIGURE_ARGS+=	--with-ssl=gnutls
 .elif defined(WITH_OPENSSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-ssl=openssl
+CONFIGURE_ENV+=		libssl_CFLAGS="-I${OPENSSLINC}" libssl_LIBS="-L${OPENSSLLIB} -lssl"
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 0e0b43c77b40..04be909718aa 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (msmtp-1.4.23.tar.bz2) = 269cd30eeb867167c6a599e23399f4fc24196fcdef3bac5b120d806b3b421810
-SIZE (msmtp-1.4.23.tar.bz2) = 942443
+SHA256 (msmtp-1.4.24.tar.bz2) = f19f3fcc67da448420b3adbd5add09f8fe110664dd64f3c2cd693ef0cb736887
+SIZE (msmtp-1.4.24.tar.bz2) = 299358
diff --git a/mail/msmtp/files/patch-src-Makefile.in b/mail/msmtp/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..c3c7f7bce333
--- /dev/null
+++ b/mail/msmtp/files/patch-src-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2011-05-18 12:03:49.000000000 +0400
++++ src/Makefile.in	2011-05-18 12:04:01.000000000 +0400
+@@ -232,7 +232,7 @@
+ 	stream.h tools.c tools.h xalloc.c xalloc.h gettext.h \
+ 	$(am__append_1) $(am__append_2)
+ AM_CPPFLAGS = $(tls_CFLAGS) $(libgsasl_CFLAGS) $(libidn_CFLAGS) $(libgnome_keyring_CFLAGS)
+-msmtp_LDADD = $(tls_LIBS) $(libgsasl_LIBS) $(libidn_LIBS) $(libgnome_keyring_LIBS)
++msmtp_LDADD = $(tls_LIBS) $(libgsasl_LIBS) $(libidn_LIBS) $(libgnome_keyring_LIBS) $(LTLIBINTL)
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/mail/msmtp/pkg-plist b/mail/msmtp/pkg-plist
index 2db0b2cfa9b1..84828a00644a 100644
--- a/mail/msmtp/pkg-plist
+++ b/mail/msmtp/pkg-plist
@@ -1,3 +1,2 @@
 bin/msmtp
 %%NLS%%share/locale/de/LC_MESSAGES/msmtp.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/msmtp.mo
-- 
cgit v1.2.3