- Update to 0.40.

PR:		ports/113611
Submitted by:	Z.C.B. <vvelox@vvelox.net> (maintainer)
Approved by:	pav (portmgr, in mentor's absence)

3 files changed, 63 insertions, 32 deletions

diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index ecfdec6f2f2a..1f5aa38f4d73 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	qpsmtpd
-PORTVERSION=	0.32
+PORTVERSION=	0.40
 CATEGORIES=	mail
+MASTER_SITES=	http://smtpd.develooper.com/files/
+PKGNAMEPREFIX=	p5-
 DISTNAME=	qpsmtpd-${PORTVERSION}
 
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	A flexible SMTP daemon written in Perl and featuring a plugin API
 
-#none for Net::Milter yet... meaning the milter plugin does not work and thus deleted when installed
-#none for Clamd yet... meaning the plugins/virus/clamd does not work and thus deleted when installed
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
@@ -25,19 +25,16 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 		${SITE_PERL}/${PERL_ARCH}/Geo/IP.pm:${PORTSDIR}/net/p5-Geo-IP \
 		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
-		${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC
-
-MASTER_SITES=	http://smtpd.develooper.com/files/
-
-PKGNAMEPREFIX=	p5-
+		${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC \
+		clamd:${PORTSDIR}/security/clamav
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-
 PERL_CONFIGURE=	yes
 
-MAN3=		Qpsmtpd::Constants.3 \
+MAN3=		Qpsmtpd::Command.3 \
+		Qpsmtpd::Constants.3 \
 		Qpsmtpd::DSN.3 \
-		Qpsmtpd::Auth.3 \
+		Qpsmtpd::ConfigServer.3 \
 		Qpsmtpd::Transaction.3 \
 		Qpsmtpd::Address.3 \
 		Qpsmtpd.3 \
@@ -48,15 +45,18 @@ MAN3=		Qpsmtpd::Constants.3 \
 USE_RC_SUBR=	qpsmtpd.sh
 
 pre-configure:
-	@${RM} -v ${WRKSRC}/plugins/milter
-	@${RM} -v ${WRKSRC}/plugins/virus/clamdscan
+	@${RM} ${WRKSRC}/plugins/milter
 
 post-install:
-	@${MKDIR} -v ${PREFIX}/share/examples/${PORTNAME}
-	@${CP} -v ${WRKSRC}/config.sample/* ${PREFIX}/share/examples/${PORTNAME}
-	@${MKDIR} -v ${PREFIX}/share/${PORTNAME}
-	@${MKDIR} -v ${PREFIX}/share/${PORTNAME}/plugins
-	@${CP} -vr ${WRKSRC}/plugins/ ${PREFIX}/share/${PORTNAME}/plugins
+	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${DATADIR}/plugins
+	@(cd ${WRKSRC}/plugins/ && ${COPYTREE_SHARE} \* ${DATADIR}/plugins/)
+	@(cd ${WRKSRC}/config.sample/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_SHARE} ${WRKSRC}/README* ${DOCSDIR}/
+.endif
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} '*****************************************************************'
diff --git a/mail/p5-qpsmtpd/distinfo b/mail/p5-qpsmtpd/distinfo
index d967bcb282e1..c386eceac9f7 100644
--- a/mail/p5-qpsmtpd/distinfo
+++ b/mail/p5-qpsmtpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (qpsmtpd-0.32.tar.gz) = ec4622643b7fd504676dadd3b238bcf5
-SHA256 (qpsmtpd-0.32.tar.gz) = 21ff3cd3a929dbcfe694fdfd6cb7f581e8e4dfcd3e56f0449c90a218200d1e0e
-SIZE (qpsmtpd-0.32.tar.gz) = 108080
+MD5 (qpsmtpd-0.40.tar.gz) = 566e45bd00ff8095d5eb760d9c096843
+SHA256 (qpsmtpd-0.40.tar.gz) = d3c2da91be90a1571e1f2d17d450d52817e9ba2f7bbdbffadb89aa64d198cae5
+SIZE (qpsmtpd-0.40.tar.gz) = 141147
diff --git a/mail/p5-qpsmtpd/pkg-plist b/mail/p5-qpsmtpd/pkg-plist
index 0e74f2e9e572..c29adf4b866b 100644
--- a/mail/p5-qpsmtpd/pkg-plist
+++ b/mail/p5-qpsmtpd/pkg-plist
@@ -1,23 +1,36 @@
 bin/qpsmtpd-forkserver
 bin/qpsmtpd
 %%SITE_PERL%%/Qpsmtpd.pm
-%%SITE_PERL%%/Qpsmtpd/SelectServer.pm
-%%SITE_PERL%%/Qpsmtpd/Utils.pm
-%%SITE_PERL%%/Qpsmtpd/TcpServer.pm
-%%SITE_PERL%%/Qpsmtpd/Constants.pm
+%%SITE_PERL%%/Qpsmtpd/Address.pm
 %%SITE_PERL%%/Qpsmtpd/Auth.pm
+%%SITE_PERL%%/Qpsmtpd/Command.pm
+%%SITE_PERL%%/Qpsmtpd/Connection.pm
+%%SITE_PERL%%/Qpsmtpd/Constants.pm
+%%SITE_PERL%%/Qpsmtpd/ConfigServer.pm
 %%SITE_PERL%%/Qpsmtpd/DSN.pm
-%%SITE_PERL%%/Qpsmtpd/Transaction.pm
-%%SITE_PERL%%/Qpsmtpd/Address.pm
 %%SITE_PERL%%/Qpsmtpd/Plugin.pm
-%%SITE_PERL%%/Qpsmtpd/SMTP.pm
 %%SITE_PERL%%/Qpsmtpd/Postfix.pm
-%%SITE_PERL%%/Qpsmtpd/Connection.pm
+%%SITE_PERL%%/Qpsmtpd/SelectServer.pm
+%%SITE_PERL%%/Qpsmtpd/SMTP.pm
+%%SITE_PERL%%/Qpsmtpd/TcpServer.pm
+%%SITE_PERL%%/Qpsmtpd/Transaction.pm
+%%SITE_PERL%%/Qpsmtpd/Utils.pm
+%%SITE_PERL%%/Qpsmtpd/PollServer.pm
+%%SITE_PERL%%/Qpsmtpd/Postfix/Constants.pm
+%%SITE_PERL%%/Qpsmtpd/Postfix/pf2qp.pl
+%%SITE_PERL%%/Qpsmtpd/SMTP/Prefork.pm
+%%SITE_PERL%%/Qpsmtpd/TcpServer/Prefork.pm
+%%SITE_PERL%%/Danga/Client.pm
+%%SITE_PERL%%/Danga/TimeoutSocket.pm
 %%SITE_PERL%%/Apache/Qpsmtpd.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/qpsmtpd/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/qpsmtpd
+@dirrm %%SITE_PERL%%/Qpsmtpd/Postfix/
+@dirrm %%SITE_PERL%%/Qpsmtpd/SMTP/
+@dirrm %%SITE_PERL%%/Qpsmtpd/TcpServer/
 @dirrm %%SITE_PERL%%/Qpsmtpd/
 @dirrm %%SITE_PERL%%/Apache/
+@dirrm %%SITE_PERL%%/Danga/
 %%EXAMPLESDIR%%/IP
 %%EXAMPLESDIR%%/badhelo
 %%EXAMPLESDIR%%/badrcptto_patterns
@@ -26,10 +39,14 @@ bin/qpsmtpd
 %%EXAMPLESDIR%%/logging
 %%EXAMPLESDIR%%/loglevel
 %%EXAMPLESDIR%%/plugins
+%%EXAMPLESDIR%%/rcpthosts
 %%EXAMPLESDIR%%/relayclients
 %%EXAMPLESDIR%%/require_resolvable_fromhost
 %%EXAMPLESDIR%%/rhsbl_zones
 %%EXAMPLESDIR%%/size_threshold
+%%EXAMPLESDIR%%/tls_before_auth
+%%EXAMPLESDIR%%/tls_ciphers
+%%EXAMPLESDIR%%/flat_auth_pw
 @dirrm %%EXAMPLESDIR%%
 %%DATADIR%%/plugins/ident/geoip
 %%DATADIR%%/plugins/ident/p0f
@@ -41,6 +58,10 @@ bin/qpsmtpd
 %%DATADIR%%/plugins/auth/authdeny
 %%DATADIR%%/plugins/auth/authnull
 @dirrm %%DATADIR%%/plugins/auth
+%%DATADIR%%/plugins/async/check_earlytalker
+%%DATADIR%%/plugins/async/dnsbl
+%%DATADIR%%/plugins/async/require_resolvable_fromhost
+@dirrm %%DATADIR%%/plugins/async
 %%DATADIR%%/plugins/queue/exim-bsmtp
 %%DATADIR%%/plugins/queue/maildir
 %%DATADIR%%/plugins/queue/postfix-queue
@@ -57,12 +78,15 @@ bin/qpsmtpd
 %%DATADIR%%/plugins/virus/bitdefender
 %%DATADIR%%/plugins/virus/check_for_hi_virus
 %%DATADIR%%/plugins/virus/clamav
+%%DATADIR%%/plugins/virus/clamdscan
 %%DATADIR%%/plugins/virus/hbedv
 %%DATADIR%%/plugins/virus/kavscanner
 %%DATADIR%%/plugins/virus/klez_filter
 %%DATADIR%%/plugins/virus/sophie
 %%DATADIR%%/plugins/virus/aveclient
 @dirrm %%DATADIR%%/plugins/virus
+%%DATADIR%%/plugins/check_badmailfrom
+%%DATADIR%%/plugins/check_basicheaders
 %%DATADIR%%/plugins/check_earlytalker
 %%DATADIR%%/plugins/check_loop
 %%DATADIR%%/plugins/check_norelay
@@ -72,21 +96,28 @@ bin/qpsmtpd
 %%DATADIR%%/plugins/count_unrecognized_commands
 %%DATADIR%%/plugins/dns_whitelist_soft
 %%DATADIR%%/plugins/dnsbl
+%%DATADIR%%/plugins/domainkeys
+%%DATADIR%%/plugins/dont_require_anglebrackets
 %%DATADIR%%/plugins/greylisting
 %%DATADIR%%/plugins/hosts_allow
 %%DATADIR%%/plugins/http_config
-%%DATADIR%%/plugins/check_badrcptto_patterns
 %%DATADIR%%/plugins/check_badrcptto
+%%DATADIR%%/plugins/check_badrcptto_patterns
 %%DATADIR%%/plugins/check_badmailfromto
+%%DATADIR%%/plugins/parse_addr_withhelo
 %%DATADIR%%/plugins/quit_fortune
 %%DATADIR%%/plugins/rcpt_ok
+%%DATADIR%%/plugins/relay_only
 %%DATADIR%%/plugins/require_resolvable_fromhost
 %%DATADIR%%/plugins/rhsbl
 %%DATADIR%%/plugins/sender_permitted_from
 %%DATADIR%%/plugins/spamassassin
 %%DATADIR%%/plugins/tls
 %%DATADIR%%/plugins/tls_cert
-%%DATADIR%%/plugins/check_basicheaders
-%%DATADIR%%/plugins/check_badmailfrom
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.authentication
+%%PORTDOCS%%%%DOCSDIR%%/README.logging
+%%PORTDOCS%%%%DOCSDIR%%/README.plugins
 @dirrm %%DATADIR%%/plugins/
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%