Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jan 2018 13:16:40 +0000 (UTC)
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r458728 - in head/mail: opensmtpd opensmtpd-devel
Message-ID:  <201801111316.w0BDGenL024964@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fluffy
Date: Thu Jan 11 13:16:40 2018
New Revision: 458728
URL: https://svnweb.freebsd.org/changeset/ports/458728

Log:
  - Drop OPENSSL_PORT redefine, it was used for OSVERSION<103000 [1];
    follow system-wide DEFAULT_VERSIONS+= ssl=<openssl variant>
  - Sort plist
  - @sample config
  
  PR:		225067 [1]
  Reported by:	Charlie Li [1]

Modified:
  head/mail/opensmtpd-devel/Makefile
  head/mail/opensmtpd/Makefile
  head/mail/opensmtpd/pkg-plist

Modified: head/mail/opensmtpd-devel/Makefile
==============================================================================
--- head/mail/opensmtpd-devel/Makefile	Thu Jan 11 12:59:14 2018	(r458727)
+++ head/mail/opensmtpd-devel/Makefile	Thu Jan 11 13:16:40 2018	(r458728)
@@ -4,7 +4,7 @@
 PORTNAME=	opensmtpd
 PORTVERSION=	201606220754
 DISTVERSIONSUFFIX=	p1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
@@ -19,14 +19,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-OPTIONS_DEFINE=		CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT TABLE_DB
+OPTIONS_DEFINE=		CA_BUNDLE LIBASR MAILERCONF PAM TABLE_DB
 
 OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB
 
 CA_BUNDLE_DESC=		Install CA bundle for SSL
 LIBASR_DESC=		Use stable version of libasr
 MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
-SSL_PORT_DESC=		SSL/TLS support via OpenSSL/LibreSSL from port
 TABLE_DB_DESC=		Build table-db plugin (aliases)
 
 USES=		cpe groff libtool ssl
@@ -51,7 +50,6 @@ LIBASR_LIB_DEPENDS=	libasr.so:dns/libasr
 LIBASR_LIB_DEPENDS_OFF=	libasr.so:dns/libasr-devel
 
 PAM_CONFIGURE_WITH=	auth-pam=smtpd
-SSL_PORT_VARS=		with_openssl_port=yes
 TABLE_DB_CONFIGURE_WITH=	table-db
 
 CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \

Modified: head/mail/opensmtpd/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile	Thu Jan 11 12:59:14 2018	(r458727)
+++ head/mail/opensmtpd/Makefile	Thu Jan 11 13:16:40 2018	(r458728)
@@ -4,7 +4,7 @@
 PORTNAME=	opensmtpd
 PORTVERSION=	5.9.2p1
 PORTEPOCH=	1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
 		http://distfiles.pirateparty.in/ashish/
@@ -17,14 +17,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM SSL_PORT TABLE_DB
+OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
 
 OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB
 
 CA_BUNDLE_DESC=	Install CA bundle for SSL
 LIBASRDEVEL_DESC=	Use development version of libasr
 MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
-SSL_PORT_DESC=		SSL/TLS support via OpenSSL/LibreSSL from port
 TABLE_DB_DESC=		Build table-db plugin (aliases)
 
 USES=		cpe groff libtool ssl
@@ -49,7 +48,6 @@ LIBASRDEVEL_LIB_DEPENDS_OFF=	libasr.so:dns/libasr
 LIBASRDEVEL_LIB_DEPENDS=	libasr.so:dns/libasr-devel
 
 PAM_CONFIGURE_WITH=	auth-pam=smtpd
-SSL_PORT_VARS=		with_openssl_port=yes
 TABLE_DB_CONFIGURE_WITH=	table-db
 
 CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \

Modified: head/mail/opensmtpd/pkg-plist
==============================================================================
--- head/mail/opensmtpd/pkg-plist	Thu Jan 11 12:59:14 2018	(r458727)
+++ head/mail/opensmtpd/pkg-plist	Thu Jan 11 13:16:40 2018	(r458728)
@@ -1,15 +1,15 @@
-etc/mail/smtpd.conf.sample
+@sample etc/mail/smtpd.conf.sample
 libexec/opensmtpd/encrypt
 libexec/opensmtpd/mail.local
 %%TABLE_DB%%libexec/opensmtpd/makemap
 @(,,2555) sbin/smtpctl
 sbin/smtpd
+man/man5/aliases.5.gz
+man/man5/forward.5.gz
+man/man5/smtpd.conf.5.gz
+man/man5/table.5.gz
 %%TABLE_DB%%man/man8/makemap.8.gz
 %%TABLE_DB%%man/man8/newaliases.8.gz
 man/man8/sendmail.8.gz
-man/man8/smtpd.8.gz
 man/man8/smtpctl.8.gz
-man/man5/table.5.gz
-man/man5/smtpd.conf.5.gz
-man/man5/forward.5.gz
-man/man5/aliases.5.gz
+man/man8/smtpd.8.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801111316.w0BDGenL024964>