[Midnightbsd-cvs] mports [23519] trunk/mail: fix ssl config

[laffer1 at midnightbsd.org]

Revision: 23519
          http://svnweb.midnightbsd.org/mports/?rev=23519
Author:   laffer1
Date:     2018-05-12 10:54:44 -0400 (Sat, 12 May 2018)
Log Message:
-----------
fix ssl config

Modified Paths:
--------------
    trunk/mail/courier/Makefile
    trunk/mail/courier-imap/Makefile
    trunk/mail/fetchmail/Makefile
    trunk/mail/msmtp/Makefile
    trunk/mail/mutt/Makefile

Modified: trunk/mail/courier/Makefile
===================================================================
--- trunk/mail/courier/Makefile	2018-05-12 14:52:03 UTC (rev 23518)
+++ trunk/mail/courier/Makefile	2018-05-12 14:54:44 UTC (rev 23519)
@@ -2,6 +2,7 @@
 
 PORTNAME=	courier
 PORTVERSION=	0.65.3
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -57,8 +58,7 @@
 MIMETYPES=	${LOCALBASE}/etc/mime.types
 WITH_TRANSPORT=	local esmtp dsn
 
-USES=		fam gettext gmake libtool perl5 pkgconfig tar:bzip2
-USE_OPENSSL=	yes
+USES=		fam gettext gmake libtool perl5 pkgconfig ssl tar:bzip2
 USE_PERL5=	yes
 USE_SUBMAKE=	yes
 

Modified: trunk/mail/courier-imap/Makefile
===================================================================
--- trunk/mail/courier-imap/Makefile	2018-05-12 14:52:03 UTC (rev 23518)
+++ trunk/mail/courier-imap/Makefile	2018-05-12 14:54:44 UTC (rev 23519)
@@ -2,6 +2,7 @@
 
 PORTNAME=	courier-imap
 PORTVERSION=	4.5.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -13,7 +14,7 @@
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 
-USES=		gmake tar:bzip2
+USES=		gmake ssl tar:bzip2
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
@@ -48,7 +49,6 @@
 CONFDIR?=	${PREFIX}/etc/${PORTNAME}
 USERDB?=	${PREFIX}/etc/userdb
 LIBEXECDIR?=	${PREFIX}/libexec/${PORTNAME}
-USE_OPENSSL=	yes
 PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 

Modified: trunk/mail/fetchmail/Makefile
===================================================================
--- trunk/mail/fetchmail/Makefile	2018-05-12 14:52:03 UTC (rev 23518)
+++ trunk/mail/fetchmail/Makefile	2018-05-12 14:54:44 UTC (rev 23519)
@@ -8,7 +8,7 @@
 
 PORTNAME=	fetchmail
 PORTVERSION=	6.3.26
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/${PORTNAME}/branch_6.3/ \
 		http://mandree.home.pages.de/${PORTNAME}/
@@ -28,9 +28,8 @@
 FETCHMAILRC=	${PREFIX}/etc/fetchmailrc
 SUB_FILES=	pkg-message
 
-USES=		gmake tar:xz
+USES=		gmake ssl tar:xz
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
 		--without-hesiod --enable-fallback=no \
 		--with-ssl=${OPENSSLBASE}

Modified: trunk/mail/msmtp/Makefile
===================================================================
--- trunk/mail/msmtp/Makefile	2018-05-12 14:52:03 UTC (rev 23518)
+++ trunk/mail/msmtp/Makefile	2018-05-12 14:54:44 UTC (rev 23519)
@@ -2,7 +2,7 @@
 
 PORTNAME=	msmtp
 PORTVERSION=	1.4.32
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -31,7 +31,7 @@
 LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--with-ssl=gnutls
 .elif ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
+EXTENSIONS+=	ssl
 CONFIGURE_ARGS+=	--with-ssl=openssl
 CONFIGURE_ENV+=		libssl_CFLAGS="-I${OPENSSLINC}" \
 			libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"

Modified: trunk/mail/mutt/Makefile
===================================================================
--- trunk/mail/mutt/Makefile	2018-05-12 14:52:03 UTC (rev 23518)
+++ trunk/mail/mutt/Makefile	2018-05-12 14:54:44 UTC (rev 23519)
@@ -4,7 +4,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.9.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -37,8 +37,7 @@
 		--enable-external-dotlock --enable-pop --enable-imap \
 		--enable-compressed --enable-sidebar
 
-USE_OPENSSL=	yes
-USES+=		cpe ncurses
+USES+=		cpe ncurses ssl
 
 .if defined(MUTT_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}