62 files changed, 131 insertions, 231 deletions

diff --git a/UPDATING b/UPDATING
index f1c8d00f8c5c..0dfac4e8da03 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20121210:
+  AFFECTS: users of security/cyrus-sasl2
+  AUTHOR: ume@FreeBSD.org
+
+  The cyrus-sasl2 library has been updated to version 2.1.26.  Please
+  rebuild all ports that depend on it.
+
+  If you use portmaster:
+        portmaster -r cyrus-sasl-
+  If you use portupgrade:
+        portupgrade -fr security/cyrus-sasl2
+
 20121202:
   AFFECTS: Users of www/owncloud
   AUTHOR: crees@FreeBSD.org
diff --git a/databases/cyrus-imspd/Makefile b/databases/cyrus-imspd/Makefile
index ffb7421143f5..098d5ae19a8a 100644
--- a/databases/cyrus-imspd/Makefile
+++ b/databases/cyrus-imspd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cyrus-imspd
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	databases mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://ftp.kfki.hu/packages/mail/cyrus/
@@ -15,7 +16,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The cyrus IMSP (Internet Message Support Protocol) server
 
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index 84cee660550a..d2c8581c0462 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmemcached
 PORTVERSION=	1.0.7
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
@@ -27,8 +27,8 @@ CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libsasl.so.2)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+.if exists(${LOCALBASE}/lib/libsasl.so.3)
+LIB_DEPENDS+=	sasl2.3:${PORTSDIR}/security/cyrus-sasl2
 .endif
 
 .if ${OSVERSION} < 800000
diff --git a/databases/memcached12/Makefile b/databases/memcached12/Makefile
index 583b1b6ae7e3..120a49b88a28 100644
--- a/databases/memcached12/Makefile
+++ b/databases/memcached12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	memcached
 PORTVERSION=	1.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_GENTOO}
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--enable-replication --disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-sasl
 CFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 0fd1a101c605..104c3f01653f 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index a0fb6482ea72..0d7ebeb4a66f 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Libraries for KDE-PIM applications
 
 LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
 		assuan.0:${PORTSDIR}/security/libassuan \
-		sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
+		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		grantlee_gui.0:${PORTSDIR}/devel/grantlee \
 		clucene.0:${PORTSDIR}/textproc/clucene
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index ebfe438f1ebe..074c2480d968 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	4.4.11.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/kdepim-${PORTVERSION}/src
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index eaf49dd1a2bf..7a970e684193 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,7 +16,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
 LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
-		sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
+		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		ical.44:${PORTSDIR}/devel/libical \
 		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index b4390d9f3a6b..493ab52fce35 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	subcommander
 PORTVERSION=	2.0.0.b5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/46766/
 DISTNAME=	Subcommander-${PORTVERSION:S/.b/b/g}p1
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 9dc48eb8c626..ba5392a670b7 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.7.7
-#PORTREVISION?=	1
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:main/} \
 		${MASTER_SITE_LOCAL:S/$/:book/}
@@ -51,7 +51,7 @@ PLIST_SUB+=	NEON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
 PLIST_SUB+=	SASL=""
 .else
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 8eaf2d2e66f3..676494c086e7 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	#please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync.
-#PORTREVISION?=	1
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.5/:book
@@ -52,7 +52,7 @@ PLIST_SUB+=	NEON="@comment "
 .endif
 
 .if defined(WITH_SASL)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
 PLIST_SUB+=	SASL=""
 .else
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 754021fb4f25..461429dd7f83 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 7d82ff0cf3ec..36d03ca566b2 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese mail
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/devel/:body \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/:body \
@@ -90,7 +90,7 @@ OPTIONS=	MUTT_CYRUS_SASL2		"Enable SASL2 authentication"	off \
 USE_GETTEXT=	yes
 .endif
 .if defined(WITH_MUTT_CYRUS_SASL2)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .endif
 .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
 WITH_MUTT_IMAP_HEADER_CACHE=	yes
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 80eddf2aa085..da74145ca6a7 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	avenger
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
@@ -33,7 +34,7 @@ CONFIGURE_ENV=	WFLAGS='-Wall'
 CONFIGURE_ARGS=	--with-db=${LOCALBASE}
 
 .if defined(WITH_AVENGER_SASL2)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 # Note, for version 0.7.2, the --enable-sasl=/... syntax is broken
 #CONFIGURE_ARGS+=	--enable-sasl=${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-sasl
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index c888d7b59d2f..7d4235085bbc 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:		cyrus-imapd
-# Date created:					Jan 4th 2001
-# Whom:						ume@FreeBSD.org
-#
 # $FreeBSD$
-#
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.1.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -20,7 +15,7 @@ PATCHFILES=	${PORTNAME}-2.1.16-ipv6-20031121.diff.gz
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^1].*
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index a68c83997d8c..e3b648f0c835 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:		cyrus-imapd
-# Date created:					Jan 4th 2001
-# Whom:						ume@FreeBSD.org
-#
 # $FreeBSD$
-#
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.2.13p1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -16,7 +11,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^2].*
 
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 28f51c0a81de..ca6a7a1bfbc7 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:		cyrus-imapd
-# Date created:					Dec 10th 2005
-# Whom:						ume@FreeBSD.org
-#
 # $FreeBSD$
-#
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
 
@@ -17,8 +12,8 @@ COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
-		pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		pcre:${PORTSDIR}/devel/pcre
 BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].*
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index b21b0ca1f421..08ffc332ffa0 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.4.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index dc47f425b656..e10306e480eb 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
 MASTER_SITE_SUBDIR=	exim4/:exim
@@ -334,7 +335,7 @@ SEDLIST+=	-e 's,^\# (AUTH_SPA=),\1,'
 .endif
 
 .if defined(WITH_AUTH_SASL)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 SEDLIST+=	-e 's,^\# (AUTH_CYRUS_SASL=),\1,' \
 		-e 's,^\# (AUTH_LIBS=.*-lsasl2),\1,'
 .endif
diff --git a/mail/hotwayd/Makefile b/mail/hotwayd/Makefile
index b7536553e3c9..efa6b897cc8a 100644
--- a/mail/hotwayd/Makefile
+++ b/mail/hotwayd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hotwayd
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
@@ -15,7 +16,7 @@ MAINTAINER=	john@jnielsen.net
 COMMENT=	A Hotmail -> POP3 gateway
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+		sasl2:${PORTSDIR}/security/cyrus-sasl2
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index ab9f9c6e5a91..2e32042863e8 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libetpan
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -18,7 +19,7 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		expat:${PORTSDIR}/textproc/expat2 \
-		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+		sasl2:${PORTSDIR}/security/cyrus-sasl2
 
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool autoconf
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 07d1dcfc7945..4c621502a1f0 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mail-notification
 DISTVERSION=	5.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	mailnotify
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index 1eb93338a86e..0666b5a9bf56 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	meta1
 PORTVERSION=	1.0.0a.13.0
+PORTREVISION=	1
 DISTVERSION=	1.0.Alpha13.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.MeTA1.org/download/.alpha/calist/
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 6740b01b2d7b..f49c946e7563 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -124,6 +124,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.5.21
+PORTREVISION=	1
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -321,7 +322,7 @@ CFLAGS+=	-I${NCURSESINC}
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 .endif
 .if defined(WITH_MUTT_CYRUS_SASL2)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .endif
 .if exists(${LOCALBASE}/lib/libidn.so) && !defined(WITHOUT_MUTT_IDN)
 WITH_MUTT_IDN=	yes
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 58459269939a..6addc780943a 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -53,6 +53,7 @@
 
 PORTNAME=	nmh
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	nmh
@@ -104,7 +105,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-utmpx
 .endif
 
 .if defined(WITH_SASL2)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl=${PREFIX}
 .endif
 
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 06787864635d..85f5602f19cc 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	2.10-20121031
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -126,7 +127,7 @@ POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index d626d4fc84fb..16fafa5140c2 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.9.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -131,7 +132,7 @@ POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 78cc586edc8f..a640a442b816 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.6.17
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -120,7 +121,7 @@ POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 4d7b106f1376..2af1cc84933c 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.7.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -122,7 +123,7 @@ POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index b3825161477e..b81fcd432361 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.8.12
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -133,7 +134,7 @@ POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index e3b6c22d6d33..da1cdb1ac5de 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sendmail
 PORTVERSION=	8.14.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
@@ -93,7 +94,7 @@ SENDMAIL_WITH_SASL2=	yes
 .if defined(SENDMAIL_WITH_SASL2)
 SASL_SUFFIX?=	+sasl2
 CONFLICTS+=	sendmail-ldap-8.* sendmail-sasl-8.* sendmail-tls-8.*
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .if !defined(SENDMAIL_WITHOUT_SASLAUTHD)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
 .endif
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index b22e633b4fe5..f2a830a9fae6 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jabberd
 PORTVERSION=	2.2.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://cloud.github.com/downloads/Jabberd2/jabberd2/
 DIST_SUBDIR=	jabber
@@ -174,7 +174,7 @@ SUB_LIST+=	REQUIRE="LOGIN"
 
 .if defined(WITH_CYRUS)
 CONFIGURE_ARGS+=	--with-sasl=cyrus
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .else
 CONFIGURE_ARGS+=	--with-sasl=gsasl
 LIB_DEPENDS+=	gsasl.16:${PORTSDIR}/security/gsasl
diff --git a/net-mgmt/argus-clients/Makefile b/net-mgmt/argus-clients/Makefile
index 0268716bdb3d..5637369ad479 100644
--- a/net-mgmt/argus-clients/Makefile
+++ b/net-mgmt/argus-clients/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	argus-clients
 PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -20,7 +20,7 @@ PORTSCOUT=	ignore:1	# This is the last version of 2.0.x branch
 CONFLICTS=	argus-clients-3* argus-clients-sasl-3*
 
 .if defined(WITH_SASL)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .endif
 
 USE_BISON=	build
diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile
index 9711b0e60ac2..b742d577f052 100644
--- a/net-mgmt/argus/Makefile
+++ b/net-mgmt/argus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	argus
 PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -20,7 +20,7 @@ PORTSCOUT=	ignore:1	# This is the last version of 2.0.X branch
 CONFLICTS=	argus-3* argus-sasl-3*
 
 .if defined(WITH_SASL)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .endif
 RUN_DEPENDS=	${LOCALBASE}/bin/ragrep:${PORTSDIR}/net-mgmt/argus-clients
 
diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile
index 2d912f3bad9e..a9396afd6f8a 100644
--- a/net-mgmt/argus3-clients/Makefile
+++ b/net-mgmt/argus3-clients/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	argus-clients
 PORTVERSION=	3.0.4.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -28,7 +29,7 @@ USE_NCURSES=	yes
 
 .if defined(WITH_SASL)
 PKGNAMESUFFIX=	-sasl
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
 
diff --git a/net-mgmt/argus3/Makefile b/net-mgmt/argus3/Makefile
index 0837c7bd4796..48194c97be87 100644
--- a/net-mgmt/argus3/Makefile
+++ b/net-mgmt/argus3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	argus
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -28,7 +29,7 @@ GNU_CONFIGURE=	true
 
 .if ${PORT_OPTIONS:MSASL}
 PKGNAMESUFFIX=	-sasl
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
 
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index 7b201f5230b3..da6e27a648ff 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ekiga3
 PORTVERSION=	3.2.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/
 DISTNAME=	ekiga-${PORTVERSION}
@@ -75,7 +75,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4
 
 .if defined(WITH_LDAP)
 USE_OPENLDAP=	yes
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}"
 .else
 CONFIGURE_ARGS+=	--disable-ldap
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index b7af9a3c6065..4bef5653e573 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-vnc
 PORTVERSION=	0.3.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
@@ -16,7 +16,7 @@ COMMENT=	VNC viewer widget for GTK+
 
 LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt \
-		sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
+		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_GNOME=	pygtk2 gnomehack
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index ff155c039171..e9fb371abd8a 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		openldap
 DISTVERSION=		2.3.43
-PORTREVISION=	1
+PORTREVISION=		2
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -139,7 +139,7 @@ CONFIGURE_ARGS=		--with-threads=posix \
 			--enable-dynamic
 
 .if defined(WITH_SASL) && !defined(WITHOUT_SASL)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl
 .else
 CONFIGURE_ARGS+=	--without-cyrus-sasl
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index c6b48ff546d1..c7b84c7774af 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -42,8 +42,8 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	8
 
 OPTIONS_DEFINE=	SASL FETCH
@@ -172,7 +172,7 @@ CONFIGURE_ARGS+=	--without-fetch
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl
 .else
 CONFIGURE_ARGS+=	--without-cyrus-sasl
diff --git a/net/samba4-devel/Makefile b/net/samba4-devel/Makefile
index 95fc7b0dc2b0..f0123a7976dc 100644
--- a/net/samba4-devel/Makefile
+++ b/net/samba4-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA_PORTNAME}
 PORTVERSION?=		${SAMBA_VERSION}
-PORTREVISION?=		3
+PORTREVISION?=		4
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba/samba4
@@ -78,7 +78,7 @@ LIB_DEPENDS+=		execinfo.1:${PORTSDIR}/devel/libexecinfo
 # BLKID
 LIB_DEPENDS+=		blkid.1:${PORTSDIR}/misc/e2fsprogs-libblkid
 # SASL
-LIB_DEPENDS=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 # tdb
 LIB_DEPENDS+=		tdb.1:${PORTSDIR}/databases/tdb
 CONFIGURE_ARGS+=	--enable-external-libtdb
diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
index 3e5764eb8d1f..a05624d223b3 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	cyrus-sasl2-ldapdb
-# Date created:				May 18 2005
-# Whom:					ume@FreeBSD.org
-#
 # $FreeBSD$
-#
 
 PORTNAME=	ldapdb
-PORTVERSION=	2.1.25
+PORTVERSION=	2.1.26
 #PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
@@ -22,7 +17,7 @@ COMMENT=	SASL LDAPDB auxprop plugin
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 
 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2
 DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distinfo
@@ -63,7 +58,7 @@ CONFIGURE_ARGS+=--enable-ldapdb --with-ldap=${LOCALBASE}
 PLIST_FILES=	lib/sasl2/libldapdb.a \
 		lib/sasl2/libldapdb.la \
 		lib/sasl2/libldapdb.so \
-		lib/sasl2/libldapdb.so.2
+		lib/sasl2/libldapdb.so.3
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index fce2ad943b41..e8cb01006d05 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	cyrus-sasl2-saslauthd
-# Date created:				May 27 2003
-# Whom:					ume@FreeBSD.org
-#
 # $FreeBSD$
-#
 
 PORTNAME=	saslauthd
-PORTVERSION=	2.1.25
+PORTVERSION=	2.1.26
 #PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
@@ -22,7 +17,7 @@ COMMENT=	SASL authentication server for cyrus-sasl2
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 
 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2
 DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distinfo
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 3322b6754eb0..4213655850d3 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	cyrus-sasl2
-# Date created:				Nov 1 1999
-# Whom:					hetzels@westbend.net
-#
 # $FreeBSD$
-#
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.25
-PORTREVISION=	2
+PORTVERSION=	2.1.26
+#PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/
 
@@ -48,6 +43,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--includedir=${PREFIX}/include \
 		--enable-static \
 		--enable-auth-sasldb \
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index a5e3a13cd747..c6406751ecd3 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cyrus-sasl-2.1.25.tar.gz) = 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
-SIZE (cyrus-sasl-2.1.25.tar.gz) = 5209240
+SHA256 (cyrus-sasl-2.1.26.tar.gz) = 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
+SIZE (cyrus-sasl-2.1.26.tar.gz) = 5220231
diff --git a/security/cyrus-sasl2/files/patch-lib-saslutil.c b/security/cyrus-sasl2/files/patch-lib-saslutil.c
deleted file mode 100644
index 1f611747136c..000000000000
--- a/security/cyrus-sasl2/files/patch-lib-saslutil.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- lib/saslutil.c.orig	2011-10-21 13:59:59.354462366 +0200
-+++ lib/saslutil.c	2011-10-21 14:10:55.849675881 +0200
-@@ -555,32 +555,44 @@
- 		  NULL,		/* don't care abour service/port */
- 		  &hints,
- 		  &result) != 0) {
--	/* errno on Unix, WSASetLastError on Windows are already done by the function */
--	return (-1);
-+        if (abort_if_no_fqdn) {
-+	    /* errno on Unix, WSASetLastError on Windows are already done by the function */
-+	    return (-1);
-+	} else {
-+	    goto LOWERCASE;
-+	}
-     }
- 
--    if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {
-+    if (result == NULL || result->ai_canonname == NULL) {
- 	freeaddrinfo (result);
-+        if (abort_if_no_fqdn) {
- #ifdef WIN32
--	WSASetLastError (WSANO_DATA);
-+	    WSASetLastError (WSANO_DATA);
- #elif defined(ENODATA)
--	errno = ENODATA;
-+	    errno = ENODATA;
- #elif defined(EADDRNOTAVAIL)
--	errno = EADDRNOTAVAIL;
-+	    errno = EADDRNOTAVAIL;
- #endif
--	return (-1);
-+	    return (-1);
-+	} else {
-+	    goto LOWERCASE;
-+	}
-     }
- 
--    if (abort_if_no_fqdn && strchr (result->ai_canonname, '.') == NULL) {
-+    if (strchr (result->ai_canonname, '.') == NULL) {
- 	freeaddrinfo (result);
-+        if (abort_if_no_fqdn) {
- #ifdef WIN32
--	WSASetLastError (WSANO_DATA);
-+	    WSASetLastError (WSANO_DATA);
- #elif defined(ENODATA)
--	errno = ENODATA;
-+	    errno = ENODATA;
- #elif defined(EADDRNOTAVAIL)
--	errno = EADDRNOTAVAIL;
-+	    errno = EADDRNOTAVAIL;
- #endif
--	return (-1);
-+	    return (-1);
-+	} else {
-+	    goto LOWERCASE;
-+	}
-     }
- 
- 
diff --git a/security/cyrus-sasl2/files/patch-plugins::gssapi.c b/security/cyrus-sasl2/files/patch-plugins::gssapi.c
deleted file mode 100644
index b718945a0c24..000000000000
--- a/security/cyrus-sasl2/files/patch-plugins::gssapi.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: plugins/gssapi.c
-diff -u -p plugins/gssapi.c.orig plugins/gssapi.c
---- plugins/gssapi.c.orig	2011-05-12 04:25:55.000000000 +0900
-+++ plugins/gssapi.c	2011-10-08 00:31:28.401398246 +0900
-@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
-     }
-     
-     if (output_token->value && output) {
--	unsigned char * p = (unsigned char *) text->encode_buf;
-+	unsigned char * p;
- 	
- 	ret = _plug_buf_alloc(text->utils,
- 			      &(text->encode_buf),
-@@ -383,6 +383,8 @@ sasl_gss_encode(void *context, const str
- 	    GSS_UNLOCK_MUTEX(text->utils);
- 	    return ret;
- 	}
-+
-+	p = (unsigned char *) text->encode_buf;
- 	
- 	p[0] = (output_token->length>>24) & 0xFF;
- 	p[1] = (output_token->length>>16) & 0xFF;
diff --git a/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c b/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c
deleted file mode 100644
index d0baf975a6f5..000000000000
--- a/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sasldb/db_berkeley.c
-diff -u -p sasldb/db_berkeley.c.orig sasldb/db_berkeley.c
---- sasldb/db_berkeley.c.orig	2009-04-29 00:09:18.000000000 +0900
-+++ sasldb/db_berkeley.c	2010-05-27 14:25:14.458302060 +0900
-@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
diff --git a/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c b/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c
deleted file mode 100644
index f00988a95dff..000000000000
--- a/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: utils/dbconverter-2.c
-diff -u -p utils/dbconverter-2.c.orig utils/dbconverter-2.c
---- utils/dbconverter-2.c.orig	2003-02-14 04:56:17.000000000 +0900
-+++ utils/dbconverter-2.c	2010-05-27 14:28:26.249314464 +0900
-@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index b4fc2701c9ba..fe8142945b19 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -9,51 +9,52 @@ include/sasl/saslutil.h
 lib/libsasl2.a
 lib/libsasl2.la
 lib/libsasl2.so
-lib/libsasl2.so.2
+lib/libsasl2.so.3
 lib/sasl2/libanonymous.a
 lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
-lib/sasl2/libanonymous.so.2
+lib/sasl2/libanonymous.so.3
 %%CRAM%%lib/sasl2/libcrammd5.a
 %%CRAM%%lib/sasl2/libcrammd5.la
 %%CRAM%%lib/sasl2/libcrammd5.so
-%%CRAM%%lib/sasl2/libcrammd5.so.2
+%%CRAM%%lib/sasl2/libcrammd5.so.3
 %%DIGEST%%lib/sasl2/libdigestmd5.a
 %%DIGEST%%lib/sasl2/libdigestmd5.la
 %%DIGEST%%lib/sasl2/libdigestmd5.so
-%%DIGEST%%lib/sasl2/libdigestmd5.so.2
+%%DIGEST%%lib/sasl2/libdigestmd5.so.3
 %%GSSAPI%%lib/sasl2/libgssapiv2.a
 %%GSSAPI%%lib/sasl2/libgssapiv2.la
 %%GSSAPI%%lib/sasl2/libgssapiv2.so
-%%GSSAPI%%lib/sasl2/libgssapiv2.so.2
+%%GSSAPI%%lib/sasl2/libgssapiv2.so.3
 %%LOGIN%%lib/sasl2/liblogin.a
 %%LOGIN%%lib/sasl2/liblogin.la
 %%LOGIN%%lib/sasl2/liblogin.so
-%%LOGIN%%lib/sasl2/liblogin.so.2
+%%LOGIN%%lib/sasl2/liblogin.so.3
 %%SCRAM%%lib/sasl2/libscram.a
 %%SCRAM%%lib/sasl2/libscram.la
 %%SCRAM%%lib/sasl2/libscram.so
-%%SCRAM%%lib/sasl2/libscram.so.2
+%%SCRAM%%lib/sasl2/libscram.so.3
 %%SQL%%lib/sasl2/libsql.a
 %%SQL%%lib/sasl2/libsql.la
 %%SQL%%lib/sasl2/libsql.so
-%%SQL%%lib/sasl2/libsql.so.2
+%%SQL%%lib/sasl2/libsql.so.3
 %%NTLM%%lib/sasl2/libntlm.a
 %%NTLM%%lib/sasl2/libntlm.la
 %%NTLM%%lib/sasl2/libntlm.so
-%%NTLM%%lib/sasl2/libntlm.so.2
+%%NTLM%%lib/sasl2/libntlm.so.3
 %%OTP%%lib/sasl2/libotp.a
 %%OTP%%lib/sasl2/libotp.la
 %%OTP%%lib/sasl2/libotp.so
-%%OTP%%lib/sasl2/libotp.so.2
+%%OTP%%lib/sasl2/libotp.so.3
 %%PLAIN%%lib/sasl2/libplain.a
 %%PLAIN%%lib/sasl2/libplain.la
 %%PLAIN%%lib/sasl2/libplain.so
-%%PLAIN%%lib/sasl2/libplain.so.2
+%%PLAIN%%lib/sasl2/libplain.so.3
 lib/sasl2/libsasldb.a
 lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
-lib/sasl2/libsasldb.so.2
+lib/sasl2/libsasldb.so.3
+libdata/pkgconfig/libsasl2.pc
 sbin/pluginviewer
 sbin/sasldblistusers2
 sbin/saslpasswd2
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index f6c23f5c6b1e..74223832f598 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	hydra
 PORTVERSION=	7.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://freeworld.thc.org/releases/ \
 		PACKETSTORM/groups/thc/
diff --git a/security/qca-cyrus-sasl/Makefile b/security/qca-cyrus-sasl/Makefile
index 68951d8182a1..d892f9ef304e 100644
--- a/security/qca-cyrus-sasl/Makefile
+++ b/security/qca-cyrus-sasl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qca-cyrus-sasl
 DISTVERSION=	2.0.0-beta3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/plugins/
 
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index 0e5e25c7aff6..793b7e4445ba 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sssd
 DISTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	https://fedorahosted.org/released/${PORTNAME}/
 
@@ -28,7 +28,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		pcre.1:${PORTSDIR}/devel/pcre \
 		unistring.1:${PORTSDIR}/devel/libunistring \
 		nss3.1:${PORTSDIR}/security/nss \
-		sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
+		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		xml2:${PORTSDIR}/textproc/libxml2
 BUILD_DEPENDS=	xmlcatalog:${PORTSDIR}/textproc/libxml2 \
 		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
diff --git a/security/tclsasl/Makefile b/security/tclsasl/Makefile
index 2de8fd7794b3..5e8f1f619b35 100644
--- a/security/tclsasl/Makefile
+++ b/security/tclsasl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tclsasl
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security tcl
 MASTER_SITES=	http://beepcore-tcl.sourceforge.net/
 EXTRACT_SUFX=	.tgz
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	A Tcl interface to the Cyrus SASLv2 library
 
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/www/cacheboy15-devel/Makefile b/www/cacheboy15-devel/Makefile
index 7dd334da3fac..253b09256663 100644
--- a/www/cacheboy15-devel/Makefile
+++ b/www/cacheboy15-devel/Makefile
@@ -76,7 +76,7 @@
 
 PORTNAME=	cacheboy
 DISTVERSION=	1.5.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	CACHEBOY_1.5.2
@@ -205,7 +205,7 @@ external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
 .if defined(WITH_SQUID_SASL_AUTH)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/cacheboy16/Makefile b/www/cacheboy16/Makefile
index c36d49f003b3..33a0d61f0178 100644
--- a/www/cacheboy16/Makefile
+++ b/www/cacheboy16/Makefile
@@ -76,7 +76,7 @@
 
 PORTNAME=	cacheboy
 DISTVERSION=	1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	cacheboy-1.6-r13601
@@ -205,7 +205,7 @@ external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
 .if defined(WITH_SQUID_SASL_AUTH)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/lusca-head/Makefile b/www/lusca-head/Makefile
index ec3d08a9f280..4e2a89c44ce4 100644
--- a/www/lusca-head/Makefile
+++ b/www/lusca-head/Makefile
@@ -76,7 +76,7 @@
 
 PORTNAME=	lusca
 DISTVERSION=	r14809
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	lusca-cache
@@ -208,7 +208,7 @@ external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
 .if defined(WITH_SQUID_SASL_AUTH)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile
index b5fb63fdff9a..fd232a3c9e4c 100644
--- a/www/mod_authn_sasl/Makefile
+++ b/www/mod_authn_sasl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_authn_sasl
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=mod-authn-sasl/mod-authn-sasl/${PORTVERSION}
diff --git a/www/squid/Makefile b/www/squid/Makefile
index f87a8ea12a1d..27ee11c5798a 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -77,7 +77,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.7.${SQUID_STABLE_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
@@ -229,7 +229,7 @@ external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
 .if defined(WITH_SQUID_SASL_AUTH)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 3b55e62347e8..ea451f222ef5 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -48,6 +48,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.1.${SQUID_STABLE_VER}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
@@ -253,7 +254,7 @@ external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
 .if defined(WITH_SQUID_SASL_AUTH)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/squid32/Makefile b/www/squid32/Makefile
index 4f4e9ff29ab1..b0892f795172 100644
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@@ -37,6 +37,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.2.${SQUID_STABLE_VER}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
@@ -273,7 +274,7 @@ external_acl+=	LDAP_group
 libexec+=	basic_ldap_auth ext_ldap_group_acl
 .endif
 .if ${PORT_OPTIONS:MAUTH_SASL}
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index aa23960d4383..48676454d8c4 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src