45 files changed, 96 insertions, 72 deletions

diff --git a/UPDATING b/UPDATING
index e40a07edf419..e7ddc7757ab2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,16 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20070102:
+  AFFECTS: users of security/gnutls and any port that depends on it
+  AUTHOR: novel@FreeBSD.org
+
+  gnutls has been updated to 1.6.1 and all shared libraries' versions
+  have been bumped. So you need to rebuild all applications that
+  depend on gnutls. Do something like:
+
+        portupgrade -rf gnutls
+
 20061231:
   AFFECTS: users of mail/sylpheed-claws*
   AUTHOR: itetcu@FreeBSD.org
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 4db692b49bfd..ca3d242e1b4f 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.2.98
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -35,7 +35,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 PLIST_SUB=	VERSION="2.2"
 
 .if !defined(WITHOUT_SSL)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=--disable-ssl
 .endif
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 4db692b49bfd..ca3d242e1b4f 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.2.98
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -35,7 +35,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 PLIST_SUB=	VERSION="2.2"
 
 .if !defined(WITHOUT_SSL)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=--disable-ssl
 .endif
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 732bea073e60..848616511f4d 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.16.0
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index e0b8b60747bc..cd1319525859 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lftp
 PORTVERSION=	3.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \
 		ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/ \
diff --git a/ftp/moftpd/Makefile b/ftp/moftpd/Makefile
index 99c89875aee0..b39f9e669eb9 100644
--- a/ftp/moftpd/Makefile
+++ b/ftp/moftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moftpd
 PORTVERSION=	1.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.morth.org/moftpd/ \
 		${MASTER_SITE_LOCAL}
@@ -31,7 +31,7 @@ RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 CONFIGURE_ARGS+=	--without-tls
 .elif defined(WITH_GNUTLS)
 CONFIGURE_ARGS+=	--without-openssl
-LIB_DEPENDS+=		gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		gnutls.15:${PORTSDIR}/security/gnutls
 LIBS=			-L${LOCALBASE}/lib -lgnutls
 CFLAGS+=		-I${LOCALBASE}/include
 .else
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--without-sql
 
 post-patch:
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-                ${FILESDIR}/moftpd.sh > ${WRKDIR}/moftpd.sh
+	${FILESDIR}/moftpd.sh > ${WRKDIR}/moftpd.sh
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/moftpd.sh ${PREFIX}/etc/rc.d/
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 77d7750c8c42..677a3b33eadf 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wzdftpd
 PORTVERSION=	0.7.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	Modular FTP server configurable online using SITE commands
 USE_RC_SUBR=	wzdftpd.sh
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
 CONFIGURE_ARGS+=	--without-pam --disable-pgsql --disable-bonjour --mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="${CPPLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--disable-gnutls
 .endif
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index bdc438aa9f49..19a88604b418 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libggz
 PORTVERSION=	0.0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://mirrors.dotsrc.org/ggzgamingzone/ggz/%SUBDIR%/ \
 		http://ftp.ggzgamingzone.org/pub/ggz/%SUBDIR%/
@@ -22,7 +22,7 @@ USE_GNOME=	gnomehack gnometarget
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN3=	ggz.h.3
 
@@ -30,7 +30,7 @@ CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--with-tls=GnuTLS
 .else
 USE_OPENSSL=	yes
diff --git a/irc/bitlbee-otr/Makefile b/irc/bitlbee-otr/Makefile
index ef24de012494..d33ac2043899 100644
--- a/irc/bitlbee-otr/Makefile
+++ b/irc/bitlbee-otr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bitlbee
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/
 
@@ -39,7 +39,7 @@ PATCHFILES+=	${PORTNAME}-1.0-ldap.diff
 .endif
 
 .if !defined(WITHOUT_MSN)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--msn=1
 .else
 CONFIGURE_ARGS+=--msn=0 --ssl=bogus
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index ef24de012494..d33ac2043899 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bitlbee
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/
 
@@ -39,7 +39,7 @@ PATCHFILES+=	${PORTNAME}-1.0-ldap.diff
 .endif
 
 .if !defined(WITHOUT_MSN)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--msn=1
 .else
 CONFIGURE_ARGS+=--msn=0 --ssl=bogus
diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index e571e2ca422f..c770e9cab5b2 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scrollz
 PORTVERSION=	1.9.98.1
+PORTREVISION=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	ftp://ftp.scrollz.com/pub/ScrollZ/source/ \
 		ftp://ftp.du.se/pub/mirrors/ScrollZ/source/
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 9c9c918d9953..09e83d6d69ed 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://flashcode.free.fr/flashtux/weechat/ \
 		http://weechat.flashtux.org/download/
@@ -58,7 +59,7 @@ PLIST_SUB+=	RUBY="@comment "
 
 .if defined(WITH_GNUTLS)
 CONFIGURE_ARGS+=	--enable-gnutls
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--disable-gnu-tls
 .endif
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 9c9c918d9953..09e83d6d69ed 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://flashcode.free.fr/flashtux/weechat/ \
 		http://weechat.flashtux.org/download/
@@ -58,7 +59,7 @@ PLIST_SUB+=	RUBY="@comment "
 
 .if defined(WITH_GNUTLS)
 CONFIGURE_ARGS+=	--enable-gnutls
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--disable-gnu-tls
 .endif
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 7151c132db29..140bd7b621ce 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -19,7 +19,7 @@
 
 PORTNAME=		anubis
 PORTVERSION=		3.6.2
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 693738db88c0..6320e48005c3 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libetpan
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +26,7 @@ CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--with-gnutls
 .else
 USE_OPENSSL=	yes
diff --git a/mail/libnewmail/Makefile b/mail/libnewmail/Makefile
index 58ab6f5c7c60..fa90f0820bca 100644
--- a/mail/libnewmail/Makefile
+++ b/mail/libnewmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libnewmail
 PORTVERSION=	0.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	mail
 MASTER_SITES=	http://0pointer.de/lennart/projects/libnewmail/ \
 		http://www.stud.uni-hamburg.de/~lennart/projects/libnewmail/
@@ -15,7 +15,7 @@ MASTER_SITES=	http://0pointer.de/lennart/projects/libnewmail/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic mail checking library
 
-LIB_DEPENDS=	gnutls.13:${PORTSDIR}/security/gnutls \
+LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls \
 		oop.4:${PORTSDIR}/devel/liboop
 
 USE_AUTOTOOLS=	libltdl:15
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 832e60877e38..dacaf7d77e17 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	msmtp
 PORTVERSION=	1.4.9
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	msmtp
@@ -26,7 +27,7 @@ MAN1=	msmtp.1
 INFO=	msmtp
 
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--with-ssl=gnutls
 .elif defined(WITH_OPENSSL)
 USE_OPENSSL=	yes
diff --git a/mail/mutt-ng/Makefile b/mail/mutt-ng/Makefile
index 486deb6f75ed..b827ecfd5889 100644
--- a/mail/mutt-ng/Makefile
+++ b/mail/mutt-ng/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mutt-ng
 PORTVERSION=	20060915
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://nion.modprobe.de/mutt-ng/snapshots/		\
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -76,7 +77,7 @@ CONFIGURE_ARGS+=	--enable-imap
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=	--with-gnutls=${LOCALBASE}
-LIB_DEPENDS+=		gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		gnutls.15:${PORTSDIR}/security/gnutls
 .endif
 .endif
 
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 696ec80aaa39..604567ad1f88 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmbiff
 PORTVERSION=	0.4.27
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail windowmaker afterstep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,7 +37,7 @@ PLIST_DIRS=	%%DATADIR%%/skins \
 
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
-		gnutls.13:${PORTSDIR}/security/gnutls
+		gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--with-libgnutls-prefix=${LOCALBASE} \
 			--with-libgcrypt-prefix=${LOCALBASE}
 .else
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index df68130507ba..4766a02f5f8e 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.6
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
@@ -482,7 +482,7 @@ RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
 .endif
 
 .if !defined(WITHOUT_HTTPD)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--enable-gnutls
 .else
 CONFIGURE_ARGS+=--disable-gnutls
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 52497d64c2c8..218bbf7ce3ef 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -431,7 +431,7 @@ RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
 .endif
 
 .if !defined(WITHOUT_HTTPD) && (defined(WITH_SSL) || exists(${LOCALBASE}/lib/libgnutls.a))
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--enable-gnutls
 .else
 CONFIGURE_ARGS+=--disable-gnutls
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 72ebf1f0d840..8ae3b8771787 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim
 PORTVERSION=	1.5.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 WANT_GNOME=	yes
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
@@ -54,7 +54,7 @@ PLIST_SUB+=	EVO="@comment "
 .endif
 
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=		gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		gnutls.15:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--disable-gnutls
 .endif
diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile
index 5d828b15a8b7..f13d74291ef4 100644
--- a/net-im/gloox/Makefile
+++ b/net-im/gloox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gloox
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://camaya.net/download/
 
@@ -15,7 +16,7 @@ COMMENT=	Jabber/XMPP client library
 
 LIB_DEPENDS=	iksemel.3:${PORTSDIR}/textproc/iksemel \
 		idn.16:${PORTSDIR}/dns/libidn \
-		gnutls.13:${PORTSDIR}/security/gnutls
+		gnutls.15:${PORTSDIR}/security/gnutls
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
diff --git a/net-im/libgaim/Makefile b/net-im/libgaim/Makefile
index 05ce7df89410..5ba51378a449 100644
--- a/net-im/libgaim/Makefile
+++ b/net-im/libgaim/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gaim
 PORTVERSION=	2.0.0.b5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 05ce7df89410..5ba51378a449 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gaim
 PORTVERSION=	2.0.0.b5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index 3c91b4f73493..930a78683b65 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	loudmouth
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
@@ -28,7 +29,7 @@ OPTIONS=	GNUTLS "Enable SSL (via GnuTLS) support" on
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GNUTLS)
-LIB_DEPENDS+=		gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		gnutls.15:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index f86fa66ce9d2..b9e6000bee45 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -44,7 +44,7 @@
 
 PORTNAME=	gtk-gnutella
 PORTVERSION=	0.96.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index b7270fe4d0c0..8b11b0176dc1 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liferea
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	liferea
@@ -47,7 +48,7 @@ PLIST_SUB+=	NOTIFY=""
 .ifdef WITHOUT_GNUTLS
 CONFIGURE_ARGS+=--disable-gnutls
 .else
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 .endif
 
 .ifdef WITH_MOZILLA
diff --git a/net/morebalance/Makefile b/net/morebalance/Makefile
index a8f5830ac2bd..c140db4d3e77 100644
--- a/net/morebalance/Makefile
+++ b/net/morebalance/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	morebalance
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://morebalance.coolprojects.org/
 
@@ -14,7 +15,7 @@ MAINTAINER=	clement@FreeBSD.org
 COMMENT=	A modular open source user-space load balancing system
 
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre \
-		gnutls.13:${PORTSDIR}/security/gnutls \
+		gnutls.15:${PORTSDIR}/security/gnutls \
 		ggz.4:${PORTSDIR}/games/libggz
 
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
diff --git a/net/net6/Makefile b/net/net6/Makefile
index ed0e4c369d2f..25ab8bdfa9be 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	net6
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	net devel
 MASTER_SITES=	http://releases.0x539.de/net6/
 
@@ -14,7 +15,7 @@ MAINTAINER=	wxs@atarininja.org
 COMMENT=	Network access framework for IPv4/IPv6
 
 LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
-		gnutls.13:${PORTSDIR}/security/gnutls
+		gnutls.15:${PORTSDIR}/security/gnutls
 
 USE_GCC=	3.4+
 USE_LDCONFIG=	yes
diff --git a/net/vino/Makefile b/net/vino/Makefile
index c4497edc3d71..d378c42d3f95 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	vino
 PORTVERSION=	2.16.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 7fd78c4741ad..c24e2f12e5a7 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	wireshark
 PORTVERSION=	0.99.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/
 DISTNAME=	${DATADIR_NAME}-${PORTVERSION}
@@ -143,7 +143,7 @@ CONFIGURE_ARGS+=	--with-adns=no
 .endif
 
 .if exists(${LOCALBASE}/lib/libgnutls.so) || defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-libgnutls-prefix=${LOCALBASE}
 .endif
 
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 56fbb924397e..7139136e3302 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	cups
 PORTVERSION=	1.2.7
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
 PKGNAMESUFFIX=	-base${PKGNAMESUFFIX2}
@@ -62,7 +62,7 @@ CUPSSYSGRP=	wheel
 
 .if !defined(WITHOUT_GNUTLS)
 CONFIGURE_ARGS+=	--enable-gnutls --disable-openssl
-LIB_DEPENDS+=		gnutls-openssl.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		gnutls-openssl.15:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--disable-gnutls --enable-openssl
 .endif
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 40d03fb9c029..8656248f9714 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	libprelude
 PORTVERSION=	0.9.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 MAINTAINER=	r.gruyters@yirdis.nl
 COMMENT=	Framework library for Prelude NIDS
 
-LIB_DEPENDS=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls
 
 OPTIONS=	PERL "Include Perl bindings" off \
 		PYTHON "Include Python bindings" off
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 76aa03ab0223..19c7b36ff1de 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	prelude-manager
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
@@ -15,7 +15,7 @@ MAINTAINER=	r.gruyters@yirdis.nl
 COMMENT=	Prelude Network Intrusion Detection System central logging point
 
 LIB_DEPENDS+=	prelude.11:${PORTSDIR}/security/libprelude \
-		gnutls.13:${PORTSDIR}/security/gnutls
+		gnutls.15:${PORTSDIR}/security/gnutls
 
 USE_GPG=	yes
 SIG_SUFFIX=	.sig
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 90eb0cf01522..8560215c95e9 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmlsec1
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 		ftp://ftp.aleksey.com/pub/xmlsec/releases/ \
@@ -26,7 +27,7 @@ USE_OPENSSL=	yes
 OPENSSL_CFLAGS+=-DXMLSEC_OPENSSL_097=1 -DXMLSEC_CRYPTO_OPENSSL=1
 USE_GNOME=	gnomehack lthack libxslt gnometarget
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_FILES=	bin/xmlsec1 bin/xmlsec1-config etc/xmlsec1Conf.sh
 
 MAN1=	xmlsec1.1 xmlsec1-config.1
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 73224efb773c..1a7619abcaf8 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -25,7 +25,7 @@ USE_RC_SUBR=	gkrellmd.sh
 WRKSRC=		${WRKDIR}/${DISTNAME:C/[a-z]$//}
 
 .if defined(WITH_GNUTLS) && defined(WITH_OPENSSL)
-BROKEN=		"GnuTLS and OpenSSL is mutually exclusive."
+BROKEN=		GnuTLS and OpenSSL is mutually exclusive.
 .endif
 
 .if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS) && !defined(WITHOUT_GNUTLS)
@@ -45,7 +45,7 @@ USE_GETTEXT=	yes
 .endif
 USE_XLIB=	yes
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls-openssl.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls-openssl.15:${PORTSDIR}/security/gnutls
 MAKE_ENV+=	GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \
 		without-ssl=1
 .elif defined(WITH_OPENSSL)
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index ad574ce84038..cb0cb59206b5 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -7,20 +7,20 @@
 
 PORTNAME=	iksemel
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://jabberstudio.2nw.net/iksemel/
 
 MAINTAINER=	trasz@pin.if.uz.zgora.pl
 COMMENT=	XML parser library mainly designed for Jabber applications
 
-LIB_DEPENDS=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls
 
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 INFO=	iksemel
 
diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile
index c8c01cdbfe5d..819d66185898 100644
--- a/www/cherokee-devel/Makefile
+++ b/www/cherokee-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cherokee
 PORTVERSION=	0.5.6
-PORTREVISION=
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.cherokee-project.com/download/%SUBDIR%/ \
 		http://www.alaskaparadise.com/freebsd/
@@ -44,7 +44,7 @@ LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--enable-tls=gnutls
 .endif
 
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index c8c01cdbfe5d..819d66185898 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cherokee
 PORTVERSION=	0.5.6
-PORTREVISION=
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.cherokee-project.com/download/%SUBDIR%/ \
 		http://www.alaskaparadise.com/freebsd/
@@ -44,7 +44,7 @@ LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--enable-tls=gnutls
 .endif
 
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index b6e37d987a68..58b43b616f1a 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gurlchecker
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
 MASTER_SITE_SUBDIR=	423
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	423
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Gnome program to check a page/website for broken links
 
-LIB_DEPENDS=	gnutls.13:${PORTSDIR}/security/gnutls \
+LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls \
 		gnet-2.0.0:${PORTSDIR}/net/gnet2
 
 USE_X_PREFIX=	yes
diff --git a/www/hydra/Makefile b/www/hydra/Makefile
index fba18b554014..a2bd015271aa 100644
--- a/www/hydra/Makefile
+++ b/www/hydra/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	hydra
 PORTVERSION=	0.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ \
 		ftp://ftp.hellug.gr/pub/software/hydra/
@@ -16,7 +16,7 @@ MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ \
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A high performance multi-threaded web server
 
-LIB_DEPENDS=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls
 
 USE_RC_SUBR=	hydra.sh
 
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 540b0d8adb56..0bb6ac638b8a 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kazehakase
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}/22887
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/22887
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Kazehakase is a browser with gecko engine like Epiphany or Galeon
 
-LIB_DEPENDS=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index 0137de13c463..39fffeb5d45e 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	retawq
 DISTVERSION=	0.2.6c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,7 +34,7 @@ CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--set-tls=1
 .elif defined(WITH_OPENSSL)
 USE_OPENSSL=	yes
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 5f09e1feabe6..baaceaa70a88 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wwwoffle
 PORTVERSION=	2.9a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.gedanken.freeserve.co.uk/download-wwwoffle/
 EXTRACT_SUFX=	.tgz
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	A caching proxy server for HTTP and FTP designed for dial-up hosts
 
-LIB_DEPENDS=	gnutls.13:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls
 
 USE_PERL5=	yes
 USE_GMAKE=	yes