Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Dec 2012 15:10:03 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308609 - in head: . databases/cyrus-imspd databases/libmemcached databases/memcached12 deskutils/kdepim3 deskutils/kdepim4 deskutils/kdepim44 deskutils/kdepimlibs4 devel/subcommander2 ...
Message-ID:  <201212101510.qBAFA3AK040933@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Mon Dec 10 15:10:02 2012
New Revision: 308609
URL: http://svnweb.freebsd.org/changeset/ports/308609

Log:
  Update cyrus-sasl2 to 2.1.26.
  This bumps shlib version of libsasl2.

Deleted:
  head/security/cyrus-sasl2/files/patch-lib-saslutil.c
  head/security/cyrus-sasl2/files/patch-plugins::gssapi.c
  head/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c
  head/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c
Modified:
  head/UPDATING
  head/databases/cyrus-imspd/Makefile
  head/databases/libmemcached/Makefile
  head/databases/memcached12/Makefile
  head/deskutils/kdepim3/Makefile
  head/deskutils/kdepim4/Makefile
  head/deskutils/kdepim44/Makefile
  head/deskutils/kdepimlibs4/Makefile
  head/devel/subcommander2/Makefile
  head/devel/subversion/Makefile.common
  head/devel/subversion16/Makefile.common
  head/emulators/qemu-devel/Makefile
  head/japanese/mutt-devel/Makefile
  head/mail/avenger/Makefile
  head/mail/cyrus-imapd2/Makefile
  head/mail/cyrus-imapd22/Makefile
  head/mail/cyrus-imapd23/Makefile
  head/mail/cyrus-imapd24/Makefile
  head/mail/exim/Makefile
  head/mail/hotwayd/Makefile
  head/mail/libetpan/Makefile
  head/mail/mail-notification/Makefile
  head/mail/meta1/Makefile
  head/mail/mutt/Makefile
  head/mail/nmh/Makefile
  head/mail/postfix-current/Makefile
  head/mail/postfix/Makefile
  head/mail/postfix26/Makefile
  head/mail/postfix27/Makefile
  head/mail/postfix28/Makefile
  head/mail/sendmail/Makefile
  head/net-im/jabberd/Makefile
  head/net-mgmt/argus-clients/Makefile
  head/net-mgmt/argus/Makefile
  head/net-mgmt/argus3-clients/Makefile
  head/net-mgmt/argus3/Makefile
  head/net/ekiga3/Makefile
  head/net/gtk-vnc/Makefile
  head/net/openldap23-server/Makefile
  head/net/openldap24-server/Makefile
  head/net/samba4-devel/Makefile
  head/security/cyrus-sasl2-ldapdb/Makefile
  head/security/cyrus-sasl2-saslauthd/Makefile
  head/security/cyrus-sasl2/Makefile
  head/security/cyrus-sasl2/distinfo
  head/security/cyrus-sasl2/pkg-plist
  head/security/hydra/Makefile
  head/security/qca-cyrus-sasl/Makefile
  head/security/sssd/Makefile
  head/security/tclsasl/Makefile
  head/www/cacheboy15-devel/Makefile
  head/www/cacheboy16/Makefile
  head/www/lusca-head/Makefile
  head/www/mod_authn_sasl/Makefile
  head/www/squid/Makefile
  head/www/squid31/Makefile
  head/www/squid32/Makefile
  head/x11/kdebase3/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/UPDATING	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/databases/cyrus-imspd/Makefile
==============================================================================
--- head/databases/cyrus-imspd/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/databases/cyrus-imspd/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/databases/libmemcached/Makefile
==============================================================================
--- head/databases/libmemcached/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/databases/libmemcached/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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}/
 
 .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

Modified: head/databases/memcached12/Makefile
==============================================================================
--- head/databases/memcached12/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/databases/memcached12/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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 --
 .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

Modified: head/deskutils/kdepim3/Makefile
==============================================================================
--- head/deskutils/kdepim3/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/deskutils/kdepim3/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/deskutils/kdepim4/Makefile
==============================================================================
--- head/deskutils/kdepim4/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/deskutils/kdepim4/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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 applicati
 
 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

Modified: head/deskutils/kdepim44/Makefile
==============================================================================
--- head/deskutils/kdepim44/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/deskutils/kdepim44/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/deskutils/kdepimlibs4/Makefile
==============================================================================
--- head/deskutils/kdepimlibs4/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/deskutils/kdepimlibs4/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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 \

Modified: head/devel/subcommander2/Makefile
==============================================================================
--- head/devel/subcommander2/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/devel/subcommander2/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/devel/subversion/Makefile.common	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/devel/subversion16/Makefile.common
==============================================================================
--- head/devel/subversion16/Makefile.common	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/devel/subversion16/Makefile.common	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/emulators/qemu-devel/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/japanese/mutt-devel/Makefile
==============================================================================
--- head/japanese/mutt-devel/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/japanese/mutt-devel/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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
 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

Modified: head/mail/avenger/Makefile
==============================================================================
--- head/mail/avenger/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/avenger/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/cyrus-imapd2/Makefile
==============================================================================
--- head/mail/cyrus-imapd2/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/cyrus-imapd2/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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-2003
 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].*

Modified: head/mail/cyrus-imapd22/Makefile
==============================================================================
--- head/mail/cyrus-imapd22/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/cyrus-imapd22/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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/p
 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].*
 

Modified: head/mail/cyrus-imapd23/Makefile
==============================================================================
--- head/mail/cyrus-imapd23/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/cyrus-imapd23/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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, supporti
 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].*

Modified: head/mail/cyrus-imapd24/Makefile
==============================================================================
--- head/mail/cyrus-imapd24/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/cyrus-imapd24/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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/

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/exim/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/hotwayd/Makefile
==============================================================================
--- head/mail/hotwayd/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/hotwayd/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/libetpan/Makefile
==============================================================================
--- head/mail/libetpan/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/libetpan/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/mail-notification/Makefile
==============================================================================
--- head/mail/mail-notification/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/mail-notification/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/meta1/Makefile
==============================================================================
--- head/mail/meta1/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/meta1/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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/

Modified: head/mail/mutt/Makefile
==============================================================================
--- head/mail/mutt/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/mutt/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/nmh/Makefile
==============================================================================
--- head/mail/nmh/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/nmh/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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-
 .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
 

Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/postfix-current/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/postfix/Makefile
==============================================================================
--- head/mail/postfix/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/postfix/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/postfix26/Makefile
==============================================================================
--- head/mail/postfix26/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/postfix26/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/postfix27/Makefile
==============================================================================
--- head/mail/postfix27/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/postfix27/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/postfix28/Makefile
==============================================================================
--- head/mail/postfix28/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/postfix28/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/mail/sendmail/Makefile
==============================================================================
--- head/mail/sendmail/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/mail/sendmail/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/net-im/jabberd/Makefile
==============================================================================
--- head/net-im/jabberd/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net-im/jabberd/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/net-mgmt/argus-clients/Makefile
==============================================================================
--- head/net-mgmt/argus-clients/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net-mgmt/argus-clients/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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 v
 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

Modified: head/net-mgmt/argus/Makefile
==============================================================================
--- head/net-mgmt/argus/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net-mgmt/argus/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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 v
 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
 

Modified: head/net-mgmt/argus3-clients/Makefile
==============================================================================
--- head/net-mgmt/argus3-clients/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net-mgmt/argus3-clients/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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
 

Modified: head/net-mgmt/argus3/Makefile
==============================================================================
--- head/net-mgmt/argus3/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net-mgmt/argus3/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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
 

Modified: head/net/ekiga3/Makefile
==============================================================================
--- head/net/ekiga3/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net/ekiga3/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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/li
 
 .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

Modified: head/net/gtk-vnc/Makefile
==============================================================================
--- head/net/gtk-vnc/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net/gtk-vnc/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/net/openldap23-server/Makefile
==============================================================================
--- head/net/openldap23-server/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net/openldap23-server/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net/openldap24-server/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/net/samba4-devel/Makefile
==============================================================================
--- head/net/samba4-devel/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/net/samba4-devel/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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}/de
 # 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

Modified: head/security/cyrus-sasl2-ldapdb/Makefile
==============================================================================
--- head/security/cyrus-sasl2-ldapdb/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/cyrus-sasl2-ldapdb/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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-l
 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>
 

Modified: head/security/cyrus-sasl2-saslauthd/Makefile
==============================================================================
--- head/security/cyrus-sasl2-saslauthd/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/cyrus-sasl2-saslauthd/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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 
 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

Modified: head/security/cyrus-sasl2/Makefile
==============================================================================
--- head/security/cyrus-sasl2/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/cyrus-sasl2/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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}/e
 		--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 \

Modified: head/security/cyrus-sasl2/distinfo
==============================================================================
--- head/security/cyrus-sasl2/distinfo	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/cyrus-sasl2/distinfo	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/security/cyrus-sasl2/pkg-plist
==============================================================================
--- head/security/cyrus-sasl2/pkg-plist	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/cyrus-sasl2/pkg-plist	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/security/hydra/Makefile
==============================================================================
--- head/security/hydra/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/hydra/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -8,6 +8,7 @@
 
 PORTNAME=	hydra
 PORTVERSION=	7.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://freeworld.thc.org/releases/ \
 		PACKETSTORM/groups/thc/

Modified: head/security/qca-cyrus-sasl/Makefile
==============================================================================
--- head/security/qca-cyrus-sasl/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/qca-cyrus-sasl/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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/
 

Modified: head/security/sssd/Makefile
==============================================================================
--- head/security/sssd/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/sssd/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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/po
 		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

Modified: head/security/tclsasl/Makefile
==============================================================================
--- head/security/tclsasl/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/security/tclsasl/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

Modified: head/www/cacheboy15-devel/Makefile
==============================================================================
--- head/www/cacheboy15-devel/Makefile	Mon Dec 10 14:48:35 2012	(r308608)
+++ head/www/cacheboy15-devel/Makefile	Mon Dec 10 15:10:02 2012	(r308609)
@@ -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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212101510.qBAFA3AK040933>