4 files changed, 123 insertions, 122 deletions

diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index 991da176ba06..eb9121e6a8e5 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -6,32 +6,21 @@
 #
 
 PORTNAME=	qpsmtpd
-PORTVERSION=	0.40
-PORTREVISION=	5
+PORTVERSION=	0.81
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://smtpd.develooper.com/files/
 PKGNAMEPREFIX=	p5-
-DISTNAME=	qpsmtpd-${PORTVERSION}
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	A flexible SMTP daemon written in Perl and featuring a plugin API
 
-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 \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
-		${SITE_PERL}/${PERL_ARCH}/Net/DNS/Resolver.pm:${PORTSDIR}/dns/p5-Net-DNS \
-		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
-		${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 \
-		${SITE_PERL}/Clamd.pm:${PORTSDIR}/mail/p5-Clamd
+RUN_DEPENDS=	spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
+  mod_perl2>=0:${PORTSDIR}/www/mod_perl2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 PERL_CONFIGURE=	yes
 
+MAN1=	qpsmtpd-async.1
 MAN3=		Qpsmtpd::Command.3 \
 		Qpsmtpd::Constants.3 \
 		Qpsmtpd::DSN.3 \
@@ -45,33 +34,23 @@ MAN3=		Qpsmtpd::Command.3 \
 
 USE_RC_SUBR=	qpsmtpd
 
+SUB_LIST+=	PORTNAME=${PORTNAME}
+SUB_FILES+=	pkg-message
+
 pre-configure:
 	@${RM} ${WRKSRC}/plugins/milter
 
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${DATADIR}/
 	@${MKDIR} ${DATADIR}/plugins
 	@(cd ${WRKSRC}/plugins/ && ${COPYTREE_SHARE} \* ${DATADIR}/plugins/)
-	@(cd ${WRKSRC}/config.sample/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}/
 .endif
-	@${ECHO_MSG}
-	@${ECHO_MSG}
-	@${ECHO_MSG} '*****************************************************************'
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Please read http://wiki.qpsmtpd.org/ for more info about"
-	@${ECHO_MSG} "installation."
-	@${ECHO_MSG}
-	@${ECHO_MSG} "The example config can be found in "${PREFIX}"/share/examples/"${PORTNAME}"/"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "The plugins can be found in "${PREFIX}"/share/"${PORTNAME}"/plugins/"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "This port does also not make any assumptions about what user you"
-	@${ECHO_MSG} "wish to use or install location."
-	@${ECHO_MSG}
-	@${ECHO_MSG} '*****************************************************************'
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}/
+	@(cd ${WRKSRC}/config.sample/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/p5-qpsmtpd/distinfo b/mail/p5-qpsmtpd/distinfo
index c386eceac9f7..5c9e0f5d7344 100644
--- a/mail/p5-qpsmtpd/distinfo
+++ b/mail/p5-qpsmtpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (qpsmtpd-0.40.tar.gz) = 566e45bd00ff8095d5eb760d9c096843
-SHA256 (qpsmtpd-0.40.tar.gz) = d3c2da91be90a1571e1f2d17d450d52817e9ba2f7bbdbffadb89aa64d198cae5
-SIZE (qpsmtpd-0.40.tar.gz) = 141147
+MD5 (qpsmtpd-0.81.tar.gz) = 6eb40eb11abb11ea673b6120828d9eb3
+SHA256 (qpsmtpd-0.81.tar.gz) = 302f16be06c62aac3135a5ab8fe29612e7831769e11861e5a98190987b58517d
+SIZE (qpsmtpd-0.81.tar.gz) = 175691
diff --git a/mail/p5-qpsmtpd/files/pkg-message.in b/mail/p5-qpsmtpd/files/pkg-message.in
new file mode 100644
index 000000000000..4c87454b09be
--- /dev/null
+++ b/mail/p5-qpsmtpd/files/pkg-message.in
@@ -0,0 +1,6 @@
+*****************************************************************'
+Please read http://wiki.qpsmtpd.org/ for more info about installation.
+The example config can be found in %%PREFIX%%/share/examples/%%{PORTNAME}%%
+The plugins can be found in %%PREFIX%%/share/%%{PORTNAME%%/plugins/
+This port does also not make any assumptions about what user you
+wish to use or install location.
diff --git a/mail/p5-qpsmtpd/pkg-plist b/mail/p5-qpsmtpd/pkg-plist
index c29adf4b866b..2ac6adb1e8ef 100644
--- a/mail/p5-qpsmtpd/pkg-plist
+++ b/mail/p5-qpsmtpd/pkg-plist
@@ -1,97 +1,30 @@
-bin/qpsmtpd-forkserver
 bin/qpsmtpd
-%%SITE_PERL%%/Qpsmtpd.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/Plugin.pm
-%%SITE_PERL%%/Qpsmtpd/Postfix.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
-%%EXAMPLESDIR%%/dnsbl_zones
-%%EXAMPLESDIR%%/invalid_resolvable_fromhost
-%%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
-@dirrm %%DATADIR%%/plugins/ident
+bin/qpsmtpd-async
+bin/qpsmtpd-forkserver
+bin/qpsmtpd-prefork
+%%DATADIR%%/plugins/async/check_earlytalker
+%%DATADIR%%/plugins/async/dns_whitelist_soft
+%%DATADIR%%/plugins/async/dnsbl
+%%DATADIR%%/plugins/async/queue/smtp-forward
+%%DATADIR%%/plugins/async/require_resolvable_fromhost
+%%DATADIR%%/plugins/async/rhsbl
+%%DATADIR%%/plugins/async/uribl
 %%DATADIR%%/plugins/auth/auth_cvm_unix_local
 %%DATADIR%%/plugins/auth/auth_flat_file
 %%DATADIR%%/plugins/auth/auth_ldap_bind
 %%DATADIR%%/plugins/auth/auth_vpopmail_sql
 %%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
-%%DATADIR%%/plugins/queue/qmail-queue
-%%DATADIR%%/plugins/queue/smtp-forward
-@dirrm %%DATADIR%%/plugins/queue
-%%DATADIR%%/plugins/logging/adaptive
-%%DATADIR%%/plugins/logging/devnull
-%%DATADIR%%/plugins/logging/file
-%%DATADIR%%/plugins/logging/syslog
-%%DATADIR%%/plugins/logging/warn
-@dirrm %%DATADIR%%/plugins/logging
-%%DATADIR%%/plugins/virus/uvscan
-%%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_badmailfromto
+%%DATADIR%%/plugins/check_badrcptto
+%%DATADIR%%/plugins/check_badrcptto_patterns
 %%DATADIR%%/plugins/check_basicheaders
 %%DATADIR%%/plugins/check_earlytalker
 %%DATADIR%%/plugins/check_loop
 %%DATADIR%%/plugins/check_norelay
 %%DATADIR%%/plugins/check_relay
 %%DATADIR%%/plugins/check_spamhelo
+%%DATADIR%%/plugins/connection_time
 %%DATADIR%%/plugins/content_log
 %%DATADIR%%/plugins/count_unrecognized_commands
 %%DATADIR%%/plugins/dns_whitelist_soft
@@ -99,14 +32,30 @@ bin/qpsmtpd
 %%DATADIR%%/plugins/domainkeys
 %%DATADIR%%/plugins/dont_require_anglebrackets
 %%DATADIR%%/plugins/greylisting
+%%DATADIR%%/plugins/help
 %%DATADIR%%/plugins/hosts_allow
 %%DATADIR%%/plugins/http_config
-%%DATADIR%%/plugins/check_badrcptto
-%%DATADIR%%/plugins/check_badrcptto_patterns
-%%DATADIR%%/plugins/check_badmailfromto
+%%DATADIR%%/plugins/ident/geoip
+%%DATADIR%%/plugins/ident/p0f
+%%DATADIR%%/plugins/logging/adaptive
+%%DATADIR%%/plugins/logging/apache
+%%DATADIR%%/plugins/logging/connection_id
+%%DATADIR%%/plugins/logging/devnull
+%%DATADIR%%/plugins/logging/file
+%%DATADIR%%/plugins/logging/syslog
+%%DATADIR%%/plugins/logging/transaction_id
+%%DATADIR%%/plugins/logging/warn
+%%DATADIR%%/plugins/noop_counter
 %%DATADIR%%/plugins/parse_addr_withhelo
+%%DATADIR%%/plugins/queue/exim-bsmtp
+%%DATADIR%%/plugins/queue/maildir
+%%DATADIR%%/plugins/queue/postfix-queue
+%%DATADIR%%/plugins/queue/qmail-queue
+%%DATADIR%%/plugins/queue/smtp-forward
 %%DATADIR%%/plugins/quit_fortune
+%%DATADIR%%/plugins/random_error
 %%DATADIR%%/plugins/rcpt_ok
+%%DATADIR%%/plugins/rcpt_regexp
 %%DATADIR%%/plugins/relay_only
 %%DATADIR%%/plugins/require_resolvable_fromhost
 %%DATADIR%%/plugins/rhsbl
@@ -114,10 +63,77 @@ bin/qpsmtpd
 %%DATADIR%%/plugins/spamassassin
 %%DATADIR%%/plugins/tls
 %%DATADIR%%/plugins/tls_cert
+%%DATADIR%%/plugins/uribl
+%%DATADIR%%/plugins/virus/aveclient
+%%DATADIR%%/plugins/virus/bitdefender
+%%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/uvscan
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.authentication
 %%PORTDOCS%%%%DOCSDIR%%/README.logging
 %%PORTDOCS%%%%DOCSDIR%%/README.plugins
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IP
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/badhelo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/badrcptto_patterns
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsbl_zones
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flat_auth_pw
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/invalid_resolvable_fromhost
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logging
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loglevel
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rcpthosts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/relayclients
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/require_resolvable_fromhost
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rhsbl_zones
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/size_threshold
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls_before_auth
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls_ciphers
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/qpsmtpd/.packlist
+%%SITE_PERL%%/Apache/Qpsmtpd.pm
+%%SITE_PERL%%/Danga/Client.pm
+%%SITE_PERL%%/Danga/TimeoutSocket.pm
+%%SITE_PERL%%/Qpsmtpd.pm
+%%SITE_PERL%%/Qpsmtpd/Address.pm
+%%SITE_PERL%%/Qpsmtpd/Auth.pm
+%%SITE_PERL%%/Qpsmtpd/Command.pm
+%%SITE_PERL%%/Qpsmtpd/ConfigServer.pm
+%%SITE_PERL%%/Qpsmtpd/Connection.pm
+%%SITE_PERL%%/Qpsmtpd/Constants.pm
+%%SITE_PERL%%/Qpsmtpd/DSN.pm
+%%SITE_PERL%%/Qpsmtpd/Plugin.pm
+%%SITE_PERL%%/Qpsmtpd/Plugin/Async/DNSBLBase.pm
+%%SITE_PERL%%/Qpsmtpd/PollServer.pm
+%%SITE_PERL%%/Qpsmtpd/Postfix.pm
+%%SITE_PERL%%/Qpsmtpd/Postfix/Constants.pm
+%%SITE_PERL%%/Qpsmtpd/Postfix/pf2qp.pl
+%%SITE_PERL%%/Qpsmtpd/SMTP.pm
+%%SITE_PERL%%/Qpsmtpd/SMTP/Prefork.pm
+%%SITE_PERL%%/Qpsmtpd/TcpServer.pm
+%%SITE_PERL%%/Qpsmtpd/TcpServer/Prefork.pm
+%%SITE_PERL%%/Qpsmtpd/Transaction.pm
+%%SITE_PERL%%/Qpsmtpd/Utils.pm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry %%SITE_PERL%%/Danga
+@dirrmtry %%SITE_PERL%%/Apache
+@dirrm %%SITE_PERL%%/Qpsmtpd/TcpServer
+@dirrm %%SITE_PERL%%/Qpsmtpd/SMTP
+@dirrm %%SITE_PERL%%/Qpsmtpd/Postfix
+@dirrm %%SITE_PERL%%/Qpsmtpd/Plugin/Async
+@dirrm %%SITE_PERL%%/Qpsmtpd/Plugin
+@dirrm %%SITE_PERL%%/Qpsmtpd
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/qpsmtpd
+@dirrm %%DATADIR%%/plugins/virus
+@dirrm %%DATADIR%%/plugins/queue
+@dirrm %%DATADIR%%/plugins/logging
+@dirrm %%DATADIR%%/plugins/ident
+@dirrm %%DATADIR%%/plugins/auth
+@dirrm %%DATADIR%%/plugins/async/queue
+@dirrm %%DATADIR%%/plugins/async
 @dirrm %%DATADIR%%/plugins/
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%