24 files changed, 26 insertions, 34 deletions

diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 27c043fae492..5e8283611559 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	avenger
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index 2aa554a51722..193f848899a6 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bmf
 PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index b0568d6da368..477126552a2c 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bogofilter
 PORTVERSION=	1.2.4
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	mail
 MASTER_SITES=	SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION}
 
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 57eb10a528f6..fccc726521c8 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.18
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
 PKGNAMESUFFIX=	23
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 2c990a3c6510..2f552c2ed177 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.4.17
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 44352402712d..dd931eaa794b 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dk-milter
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}
 
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 48f2d88fb3fb..8555e84381b9 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	drac
 PORTVERSION=	1.12
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cc.umanitoba.ca/src/ \
 		http://atreides.freenix.no/~anders/ \
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 5b84192505bb..2dc4c8c6c5d0 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.32.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/mail/greyfix/Makefile b/mail/greyfix/Makefile
index e2257b4f08f0..7ef75807426d 100644
--- a/mail/greyfix/Makefile
+++ b/mail/greyfix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	greyfix
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.kim-minh.com/pub/greyfix/ \
 		http://stereochro.me/distfiles/
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index a2bb1c3172de..b2bfc8542577 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	isync
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index 7dc937794dac..1be7f1eeb9a4 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	meta1
 PORTVERSION=	1.0.0b.0.0
+PORTREVISION=	1
 DISTVERSION=	1.0.Beta0.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.MeTA1.org/download/.beta/proto/
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index cd799ba385a4..e0b483e5a5a7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.5.23
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.mutt.org/mutt/devel/ \
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 5b5a51b79c7f..03352f482293 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		opendkim
 PORTVERSION=		2.9.2
-PORTREVISION=		3
+1P1O1R1T1R1E1V1I1S1I1O1N1=1	1	131
 CATEGORIES=		mail security
 MASTER_SITES=		SF
 MASTER_SITE_SUBDIR=	${PORTNAME} \
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 99495ee4789d..9536ea4b7f3f 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	perdition
 PORTVERSION=	1.18
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail net security
 MASTER_SITES=	http://horms.net/projects/perdition/download/${PORTVERSION}/
 
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index f5731737fcbc..5e7567b64920 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	popular
 PORTVERSION=	1.5.5
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://www.remote.org/jochen/mail/popular/download/
 
@@ -25,19 +25,6 @@ LIBS+=		-L${LOCALBASE}/lib
 
 USE_RC_SUBR=	pcheckd pproxy pserv 0ringd
 
-OPTIONS_DEFINE=	DB4
-OPTIONS_DEFAULT=	DB4
-OPTIONS_SUB=	yes
-
-DB4_DESC=	Build db4 pdm module
-DB4_LIB_DEPENDS=	libdb4.so:${PORTSDIR}/databases/db4
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDB4}
-PDM_MODULES+=	db4
-.endif
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/pproxy.rc ${STAGEDIR}${ETCDIR}/pproxy.rc.sample
diff --git a/mail/popular/pkg-plist b/mail/popular/pkg-plist
index 152637add057..f046d8795209 100644
--- a/mail/popular/pkg-plist
+++ b/mail/popular/pkg-plist
@@ -29,9 +29,9 @@ lib/popular/libpdm_any.so
 lib/popular/libpdm_master-1.5.5.so
 lib/popular/libpdm_master.a
 lib/popular/libpdm_master.so
-%%DB4%%lib/popular/libpdm_db4-1.5.5.so
-%%DB4%%lib/popular/libpdm_db4.a
-%%DB4%%lib/popular/libpdm_db4.so
+@comment %%DB4%%lib/popular/libpdm_db4-1.5.5.so
+@comment %%DB4%%lib/popular/libpdm_db4.a
+@comment %%DB4%%lib/popular/libpdm_db4.so
 man/man1/pcheck.1.gz
 man/man1/pcontrol.1.gz
 man/man1/pdeliver.1.gz
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 887fb1777743..32a59e9f38a6 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	2.12-20140709
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index f0d3aef8db96..48f5d4093a06 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.11.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix210/Makefile b/mail/postfix210/Makefile
index 97d089db0f70..ccdf3acdcd5b 100644
--- a/mail/postfix210/Makefile
+++ b/mail/postfix210/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.10.3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index b7b933758810..5b9b70902739 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.8.17
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix29/Makefile b/mail/postfix29/Makefile
index cc483c0d92f2..7f8a9caf41f4 100644
--- a/mail/postfix29/Makefile
+++ b/mail/postfix29/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.9.9
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 056fd6a52360..9297123596e7 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		spamprobe
 PORTVERSION=	1.4d
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=		mail
 MASTER_SITES=	SF
 
diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile
index 64eef91c451a..4e19dc39de07 100644
--- a/mail/spmfilter/Makefile
+++ b/mail/spmfilter/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	spmfilter
 PORTVERSION=	0.6.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.${PORTNAME}.org/files/
 
diff --git a/mail/vacation/Makefile b/mail/vacation/Makefile
index e7cf29473913..463356fdd9b3 100644
--- a/mail/vacation/Makefile
+++ b/mail/vacation/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vacation
 PORTVERSION=	3.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/v/vacation/