3 files changed, 30 insertions, 15 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 8ae6556d92ab..ecf0013e7d1b 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -7,7 +7,7 @@
 # Based on amavisd ports makefile.
 
 PORTNAME=	amavisd-new
-PORTVERSION=	2.5.4
+PORTVERSION=	2.6.0
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
@@ -28,7 +28,8 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Un
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${SITE_PERL}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy \
 		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \
-		p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server
+		p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server \
+		p5-Mail-DKIM>=0.31:${PORTSDIR}/mail/p5-Mail-DKIM
 
 USE_PERL5_RUN=	5.8.2+
 GNU_CONFIGURE=	yes
@@ -39,7 +40,7 @@ BUILD_WRKSRC=	${WRKSRC}/helper-progs
 DOCS=	AAAREADME.first INSTALL LDAP.schema LICENSE RELEASE_NOTES \
 		README_FILES/README.* README_FILES/screen.css \
 		README_FILES/amavisd-new-docs.html \
-		README_FILES/TODO-SNMP-AGENT
+		README_FILES/TODO-SNMP-AGENT		
 
 AMAVISUSER?=	vscan
 AMAVISGROUP?=	vscan
@@ -72,6 +73,7 @@ OPTIONS=	BDB	"Use BerkeleyDB for nanny/cache/snmp"	on \
 		LZOP	"LZOP support with archivers/lzop"	on \
 		FREEZE	"FREEZE support with archivers/freeze"	on \
 		P7ZIP	"P7ZIP support with archivers/p7zip"	on \
+		MSWORD	"Ms Word support with textproc/ripole"	on \
 		TNEF	"Add external tnef decoder converters/tnef"	off
 
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
@@ -206,10 +208,23 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze
 RUN_DEPENDS+=	${LOCALBASE}/bin/7zr:${PORTSDIR}/archivers/p7zip
 .endif
 
+.if defined(WITH_MSWORD)
+RUN_DEPENDS+=	${LOCALBASE}/bin/ripole:${PORTSDIR}/archivers/ripole
+.endif
+
 .if defined(WITH_TNEF)
 RUN_DEPENDS+=	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} " **** UPGRADE WARNING:  SQL SCHEMA CHANGED ****"
+	@${ECHO} " If you are upgrading from version prior to 2.6.0"
+	@${ECHO} " Hit ^c now and read /usr/ports/UPDATING section or"
+	@${ECHO} " /usr/local/share/doc/amavisd-new/RELEASE_NOTES"
+	@read -p "Hit ^c now to stop, any key to continue: " -t 5 a || true
+	@${ECHO} ""
+
 post-patch:
 .for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent amavisd-nanny amavisd-release
 	@${REINPLACE_CMD} "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f}
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 169a832eb280..2817795753d3 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,3 +1,3 @@
-MD5 (amavisd-new-2.5.4.tar.gz) = 9d482cb555e1e8c0834db6b90843b4a4
-SHA256 (amavisd-new-2.5.4.tar.gz) = 1b8410f023c94dcce61b0510fc737106f4c35a8cffee81c19364cdb86c48af2b
-SIZE (amavisd-new-2.5.4.tar.gz) = 791835
+MD5 (amavisd-new-2.6.0.tar.gz) = 71761c55054095279bda559177682164
+SHA256 (amavisd-new-2.6.0.tar.gz) = e979be2db9d28c2c44293245394c5001cd9a94bbdd0ca3f3b45eac5e7a91521a
+SIZE (amavisd-new-2.6.0.tar.gz) = 906076
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index b81cb2314900..3f36a898a959 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -34,22 +34,22 @@
 %%PORTDOCS%%%%DOCSDIR%%/amavisd-new-docs.html
 %%PORTDOCS%%%%DOCSDIR%%/TODO-SNMP-AGENT
 %%PORTDOCS%%%%DOCSDIR%%/screen.css
-%%PORTDOCS%%%%DOCSDIR%%/images/1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/2.png
-%%PORTDOCS%%%%DOCSDIR%%/images/3.png
-%%PORTDOCS%%%%DOCSDIR%%/images/4.png
-%%PORTDOCS%%%%DOCSDIR%%/images/5.png
-%%PORTDOCS%%%%DOCSDIR%%/images/6.png
-%%PORTDOCS%%%%DOCSDIR%%/images/7.png
-%%PORTDOCS%%%%DOCSDIR%%/images/8.png
-%%PORTDOCS%%%%DOCSDIR%%/images/9.png
 %%PORTDOCS%%%%DOCSDIR%%/images/blank.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.png
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/10.png
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/11.png
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/12.png
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/13.png
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/14.png
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/15.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/2.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/3.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/4.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/5.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/6.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/7.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/8.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/9.png
 %%PORTDOCS%%%%DOCSDIR%%/images/caution.png
 %%PORTDOCS%%%%DOCSDIR%%/images/draft.png
 %%PORTDOCS%%%%DOCSDIR%%/images/home.png