--- audio/ario/Makefile	(revision 410833)
+++ audio/ario/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	ario
 PORTVERSION=	1.5.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
 
--- audio/pianobar/Makefile	(revision 410833)
+++ audio/pianobar/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	pianobar
 PORTVERSION=	2015.11.22
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://6xq.net/projects/${PORTNAME}/
 
--- audio/tomahawk/Makefile	(revision 410833)
+++ audio/tomahawk/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	tomahawk
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
--- benchmarks/postal/Makefile	(revision 410833)
+++ benchmarks/postal/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	postal
 PORTVERSION=	0.73
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	benchmarks mail
 MASTER_SITES=	http://www.coker.com.au/postal/
 
--- databases/freetds/Makefile	(revision 410833)
+++ databases/freetds/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	freetds
 PORTVERSION=	0.95.87
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/stable/
--- databases/freetds-devel/Makefile	(revision 410833)
+++ databases/freetds-devel/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	freetds
 PORTVERSION=	0.99.614
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/current/
--- databases/glom/Makefile	(revision 410833)
+++ databases/glom/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	glom
 PORTVERSION=	1.28.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- deskutils/fusenshi/Makefile	(revision 410833)
+++ deskutils/fusenshi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	fusenshi
 PORTVERSION=	0.9.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.ongs.co.jp/projects/fusenshi/
 
--- deskutils/taskd/Makefile	(revision 410833)
+++ deskutils/taskd/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	taskd
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 
--- deskutils/taskwarrior/Makefile	(revision 410833)
+++ deskutils/taskwarrior/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	taskwarrior
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 DISTNAME=	task-${PORTVERSION}
 
--- devel/anjuta/Makefile	(revision 410833)
+++ devel/anjuta/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	anjuta
 PORTVERSION=	3.18.2
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- devel/gsoap/Makefile	(revision 410833)
+++ devel/gsoap/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	gsoap
 PORTVERSION=	2.8.27
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gSOAP
 DISTNAME=	${PORTNAME}_${PORTVERSION}
--- devel/gwenhywfar/Makefile	(revision 410833)
+++ devel/gwenhywfar/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	gwenhywfar
 PORTVERSION=	4.14.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel net security
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=01&file=01&dummy=/
 
--- devel/hs-git-annex/Makefile	(revision 410833)
+++ devel/hs-git-annex/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	git-annex
 PORTVERSION=	5.20150727
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
--- devel/librelp/Makefile	(revision 410833)
+++ devel/librelp/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	librelp
 PORTVERSION=	1.2.9
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.rsyslog.com/librelp/
 
--- devel/libvirt/Makefile	(revision 410833)
+++ devel/libvirt/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	libvirt
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
--- dns/knot2/Makefile	(revision 410833)
+++ dns/knot2/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	knot
 DISTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
--- editors/abiword/Makefile	(revision 410833)
+++ editors/abiword/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	abiword
 PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
 DIST_SUBDIR=	AbiWord
--- editors/emacs/Makefile	(revision 410833)
+++ editors/emacs/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
--- editors/emacs-devel/Makefile	(revision 410833)
+++ editors/emacs-devel/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU_ALPHA/emacs/pretest
--- editors/vanubi/Makefile	(revision 410833)
+++ editors/vanubi/Makefile	(working copy)
@@ -4,6 +4,7 @@ 
 PORTNAME=	vanubi
 PORTVERSION=	0.0.16
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	olivierd@FreeBSD.org
--- emulators/qemu/Makefile	(revision 410833)
+++ emulators/qemu/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	qemu
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
--- emulators/qemu-devel/Makefile	(revision 410833)
+++ emulators/qemu-devel/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	qemu
 DISTVERSION=	2.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 PKGNAMESUFFIX=	-devel
--- emulators/qemu-sbruno/Makefile	(revision 410833)
+++ emulators/qemu-sbruno/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	qemu
 PORTVERSION=	2.5.50.g20160215
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	GH \
 		LOCAL/nox:dtc \
--- emulators/wine/Makefile	(revision 410833)
+++ emulators/wine/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	wine
 DISTVERSION=	1.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
--- emulators/wine-devel/Makefile	(revision 410833)
+++ emulators/wine-devel/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	wine
 DISTVERSION=	1.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
--- ftp/curl/Makefile	(revision 410833)
+++ ftp/curl/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	curl
 PORTVERSION=	7.47.1
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
--- ftp/filezilla/Makefile	(revision 410833)
+++ ftp/filezilla/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	filezilla
 PORTVERSION=	3.15.0.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
 DISTNAME=	FileZilla_${PORTVERSION}_src
--- ftp/lftp/Makefile	(revision 410833)
+++ ftp/lftp/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	lftp
 PORTVERSION=	4.6.5
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://lftp.yar.ru/ftp/ \
 		http://lftp.yar.ru/ftp/old/ \
--- ftp/wget/Makefile	(revision 410833)
+++ ftp/wget/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	wget
 DISTVERSION=	1.16.3
+PORTREVISION=	1
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	GNU
 
--- ftp/wput/Makefile	(revision 410833)
+++ ftp/wput/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	wput
 PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp
 MASTER_SITES=	SF
 
--- ftp/wzdftpd/Makefile	(revision 410833)
+++ ftp/wzdftpd/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	wzdftpd
 PORTVERSION=	0.8.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R}
 
--- games/libggz/Makefile	(revision 410833)
+++ games/libggz/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libggz
 PORTVERSION=	${GGZ_VERSION}
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
--- games/macopix/Makefile	(revision 410833)
+++ games/macopix/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	macopix
 PORTVERSION=	1.7.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/macopix/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
--- games/pokerth/Makefile	(revision 410833)
+++ games/pokerth/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	pokerth
 PORTVERSION=	1.1.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.1
 DISTNAME=	PokerTH-${PORTVERSION}-src
--- graphics/gnome-color-manager/Makefile	(revision 410833)
+++ graphics/gnome-color-manager/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	gnome-color-manager
 PORTVERSION=	3.18.0
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- irc/anope/Makefile	(revision 410833)
+++ irc/anope/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	anope
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 
 MAINTAINER=	feld@FreeBSD.org
--- irc/bitlbee/Makefile	(revision 410833)
+++ irc/bitlbee/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	bitlbee
 PORTVERSION=	3.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		LOCAL/brix
--- irc/ctrlproxy/Makefile	(revision 410833)
+++ irc/ctrlproxy/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	ctrlproxy
 PORTVERSION=	3.0.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	irc
 MASTER_SITES=	http://launchpadlibrarian.net/50016234/ \
 		LOCAL/ashish/
--- irc/inspircd/Makefile	(revision 410833)
+++ irc/inspircd/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 PORTNAME=	inspircd
 PORTVERSION=	2.0.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	feld@FreeBSD.org
--- irc/minbif/Makefile	(revision 410833)
+++ irc/minbif/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	minbif
 PORTVERSION=	1.0.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	irc net-im
 MASTER_SITES=	https://symlink.me/attachments/download/148/
 
--- irc/ngircd/Makefile	(revision 410833)
+++ irc/ngircd/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	ngircd
 PORTVERSION=	23
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://arthur.barton.de/pub/${PORTNAME}/ \
--- irc/scrollz/Makefile	(revision 410833)
+++ irc/scrollz/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	scrollz
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://www.netraam.net/scrollz/download/ \
 		http://BSDforge.com/projects/source/irc/scrollz/
--- irc/weechat/Makefile	(revision 410833)
+++ irc/weechat/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	weechat
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/
 
--- japanese/jd/Makefile	(revision 410833)
+++ japanese/jd/Makefile	(working copy)
@@ -4,6 +4,7 @@ 
 PORTNAME=	jd
 PORTVERSION=	2.8.9
 DISTVERSIONSUFFIX=	-150226
+PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	SFJP/jd4linux/62877
 
--- lang/gnustep-base/Makefile	(revision 410833)
+++ lang/gnustep-base/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gnustep-base
 PORTVERSION=	1.24.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	GNUSTEP/core
 
@@ -49,10 +49,8 @@ MDNS_DESC=		Zeroconf via mDNSResponder
 ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
 ICU_CONFIGURE_OFF=	--disable-icu
 
-GNUTLS_LIB_DEPENDS=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
-GNUTLS_CONFIGURE_ON=	--with-tls-prefix=${LOCALBASE} \
-			TLS_CONFIG="pkg-config -gnutls"
-GNUTLS_CONFIGURE_OFF=	--disable-tls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_ENABLE=tls
 
 OPENSSL_USE=		OPENSSL=yes
 OPENSSL_CONFIGURE_OFF=	--disable-openssl
--- mail/anubis/Makefile	(revision 410833)
+++ mail/anubis/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	anubis
 PORTVERSION=	4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 
--- mail/courier-imap/Makefile	(revision 410833)
+++ mail/courier-imap/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	courier-imap
 PORTVERSION=	4.16.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
--- mail/exim/Makefile	(revision 410833)
+++ mail/exim/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	EXIM/exim4/:exim
 DISTNAME=	${PORTNAME}-${EXIM_VERSION}
--- mail/libetpan/Makefile	(revision 410833)
+++ mail/libetpan/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libetpan
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 
 MAINTAINER=	pawel@FreeBSD.org
--- mail/libvmime/Makefile	(revision 410833)
+++ mail/libvmime/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libvmime
 PORTVERSION=	0.9.2.s20140721
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 
 MAINTAINER=	delphij@FreeBSD.org
--- mail/mpop/Makefile	(revision 410833)
+++ mail/mpop/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	mpop
 DISTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 
--- mail/msmtp/Makefile	(revision 410833)
+++ mail/msmtp/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	msmtp
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
--- mail/nullmailer/Makefile	(revision 410833)
+++ mail/nullmailer/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	nullmailer
 PORTVERSION=	1.13
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/nullmailer/ \
--- mail/opendkim/Makefile	(revision 410833)
+++ mail/opendkim/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=		opendkim
 PORTVERSION=		2.10.3
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		mail security
 MASTER_SITES=		SF/${PORTNAME} \
 			SF/${PORTNAME}/Previous%20Releases \
--- mail/wmbiff/Makefile	(revision 410833)
+++ mail/wmbiff/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	wmbiff
 PORTVERSION=	0.4.27
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	mail windowmaker afterstep
 MASTER_SITES=	SF
 
--- mail/xfce4-mailwatch-plugin/Makefile	(revision 410833)
+++ mail/xfce4-mailwatch-plugin/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	xfce4-mailwatch-plugin
 PORTVERSION=	1.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail xfce
 MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
--- multimedia/ffmpeg/Makefile	(revision 410833)
+++ multimedia/ffmpeg/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.8.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
--- multimedia/kodi/Makefile	(revision 410833)
+++ multimedia/kodi/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	kodi
 DISTVERSION=	15.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot@gmail.com
--- multimedia/libav/Makefile	(revision 410833)
+++ multimedia/libav/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	libav
 PORTVERSION=	11.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
--- multimedia/mencoder/Makefile	(revision 410833)
+++ multimedia/mencoder/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
--- multimedia/mplayer/Makefile	(revision 410833)
+++ multimedia/mplayer/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
--- multimedia/vlc/Makefile	(revision 410833)
+++ multimedia/vlc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	vlc
 DISTVERSION=	2.2.1
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
--- net/csync2/Makefile	(revision 410833)
+++ net/csync2/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	csync2
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://oss.linbit.com/csync2/
 
--- net/glib-networking/Makefile	(revision 410833)
+++ net/glib-networking/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	glib-networking
 PORTVERSION=	2.46.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- net/gtk-vnc/Makefile	(revision 410833)
+++ net/gtk-vnc/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	gtk-vnc
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
--- net/hs-network-protocol-xmpp/Makefile	(revision 410833)
+++ net/hs-network-protocol-xmpp/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	network-protocol-xmpp
 PORTVERSION=	0.4.8
+PORTREVISION=	1
 CATEGORIES=	net haskell
 
 MAINTAINER=	haskell@FreeBSD.org
--- net/libvncserver/Makefile	(revision 410833)
+++ net/libvncserver/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libvncserver
 PORTVERSION=	0.9.9
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net devel
 MASTER_SITES=	SF
 DISTNAME=	LibVNCServer-${PORTVERSION}
--- net/morebalance/Makefile	(revision 410833)
+++ net/morebalance/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	morebalance
 PORTVERSION=	0.4
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	net
 MASTER_SITES=	http://morebalance.coolprojects.org/
 
--- net/net6/Makefile	(revision 410833)
+++ net/net6/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	net6
 PORTVERSION=	1.3.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net devel
 MASTER_SITES=	http://releases.0x539.de/net6/
 
--- net/ocserv/Makefile	(revision 410833)
+++ net/ocserv/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	ocserv
 PORTVERSION=	0.10.11
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/ocserv/
 
--- net/remmina-plugin-vnc/Makefile	(revision 410833)
+++ net/remmina-plugin-vnc/Makefile	(working copy)
@@ -1,7 +1,7 @@ 
 # Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	5
+PORTREVISION=	6
 PKGNAMESUFFIX=	-vnc
 
 COMMENT=	Remmina plugin for VNC protocol
--- net/samba41/Makefile	(revision 410833)
+++ net/samba41/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME?=		${SAMBA4_BASENAME}41
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		1
+PORTREVISION?=		2
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
--- net/samba42/Makefile	(revision 410833)
+++ net/samba42/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME?=		${SAMBA4_BASENAME}42
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		1
+PORTREVISION?=		2
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
--- net/samba43/Makefile	(revision 410833)
+++ net/samba43/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME?=		${SAMBA4_BASENAME}43
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		1
+PORTREVISION?=		2
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
--- net/sixxs-aiccu/Makefile	(revision 410833)
+++ net/sixxs-aiccu/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	aiccu
 PORTVERSION=	20070115
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.sixxs.net/archive/sixxs/aiccu/unix/
 PKGNAMEPREFIX=	sixxs-
@@ -34,7 +34,7 @@ OPTIONS_DEFAULT+=	GNUTLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 CFLAGS+=	-DAICCU_GNUTLS
 LDFLAGS+=	-lgnutls
 .endif
--- net/tigervnc/Makefile	(revision 410833)
+++ net/tigervnc/Makefile	(working copy)
@@ -4,6 +4,7 @@ 
 PORTNAME=	tigervnc
 PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net x11-servers
 
 MAINTAINER=	meta+ports@vmeta.jp
--- net/uget/Makefile	(revision 410833)
+++ net/uget/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	uget
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
--- net/vinagre/Makefile	(revision 410833)
+++ net/vinagre/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	vinagre
 PORTVERSION=	3.18.2
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- net/vino/Makefile	(revision 410833)
+++ net/vino/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	vino
 PORTVERSION=	3.18.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- net/wireshark/Makefile	(revision 410833)
+++ net/wireshark/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME?=	wireshark
 PORTVERSION=	2.0.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
 		http://ftp.uni-kl.de/pub/wireshark/src/ \
--- net-im/climm/Makefile	(revision 410833)
+++ net-im/climm/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	climm
 PORTVERSION=	0.7.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.climm.org/source/ \
 		http://http.bg.climm.org/source/
--- net-im/empathy/Makefile	(revision 410833)
+++ net-im/empathy/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	empathy
 PORTVERSION=	3.12.11
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
--- net-im/gloox/Makefile	(revision 410833)
+++ net-im/gloox/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	gloox
 PORTVERSION=	1.0.14
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://camaya.net/download/
 
--- net-im/jabber/Makefile	(revision 410833)
+++ net-im/jabber/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	jabber
 PORTVERSION=	1.6.1.1
-PORTREVISION=	18
+PORTREVISION=	19
 PORTEPOCH=	1
 CATEGORIES=	net-im ipv6
 MASTER_SITES=	http://download.jabberd.org/jabberd14/%SUBDIR%/
--- net-im/libpurple/Makefile	(revision 410833)
+++ net-im/libpurple/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME?=	libpurple
 PORTVERSION=	2.10.12
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
--- net-im/licq-jabber/Makefile	(revision 410833)
+++ net-im/licq-jabber/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	jabber
 PORTVERSION=	1.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 
 MAINTAINER=	dinoex@FreeBSD.org
--- net-im/loudmouth/Makefile	(revision 410833)
+++ net-im/loudmouth/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 
 PORTNAME=	loudmouth
 PORTVERSION=	1.4.3
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
--- net-im/telepathy-gabble/Makefile	(revision 410833)
+++ net-im/telepathy-gabble/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	telepathy-gabble
 PORTVERSION=	0.18.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
--- net-im/telepathy-salut/Makefile	(revision 410833)
+++ net-im/telepathy-salut/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 
 PORTNAME=	telepathy-salut
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
--- net-p2p/gnunet/Makefile	(revision 410833)
+++ net-p2p/gnunet/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gnunet
 PORTVERSION=	0.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p ipv6 security
 MASTER_SITES=	GNU
 
--- net-p2p/gtk-gnutella/Makefile	(revision 410833)
+++ net-p2p/gtk-gnutella/Makefile	(working copy)
@@ -36,6 +36,7 @@ 
 
 PORTNAME=	gtk-gnutella
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF
 
--- net-p2p/ncdc/Makefile	(revision 410833)
+++ net-p2p/ncdc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	ncdc
 PORTVERSION=	1.19.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://dev.yorhel.nl/download/
--- news/nzbget/Makefile	(revision 410833)
+++ news/nzbget/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	nzbget
 PORTVERSION=	16.4
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	news
 
--- polish/ekg2/Makefile	(revision 410833)
+++ polish/ekg2/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	ekg2
 PORTVERSION=	0.3.1
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	http://pl.ekg2.org/
--- print/cups/Makefile	(revision 410833)
+++ print/cups/Makefile	(working copy)
@@ -4,6 +4,7 @@ 
 PORTNAME=	cups
 PORTVERSION=	2.1.3
 DISTVERSIONSUFFIX=-source
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups.org/software/${PORTVERSION}/
 
--- print/cups/files/patch-cups-config.in	(nonexistent)
+++ print/cups/files/patch-cups-config.in	(working copy)
@@ -0,0 +1,11 @@ 
+--- cups-config.in.orig	2013-05-29 11:51:34 UTC
++++ cups-config.in
+@@ -105,7 +105,7 @@ while test $# -gt 0; do
+ 	    ;;
+ 	--libs)
+ 	    if test $static = no; then
+-	        libs="@EXTLINKCUPS@ $LIBS";
++	        libs="@EXTLINKCUPS@";
+  	        if test $image = yes; then
+  	            libs="@EXTLINKCUPSIMAGE@ $libs"
+ 		fi
--- print/cups-bjnp/Makefile	(revision 410833)
+++ print/cups-bjnp/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	cups-bjnp
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	SF
 
--- print/cups-filters/Makefile	(revision 410833)
+++ print/cups-filters/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	cups-filters
 PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
 
--- print/ghostscript8-base/Makefile	(revision 410833)
+++ print/ghostscript8-base/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	ghostscript
 PORTVERSION=	8.71
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
--- print/ghostscript9-agpl-base/Makefile	(revision 410833)
+++ print/ghostscript9-agpl-base/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	ghostscript
 PORTVERSION=	9.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
--- print/ghostscript9-base/Makefile	(revision 410833)
+++ print/ghostscript9-base/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	ghostscript
 PORTVERSION=	9.06
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
--- print/gnome-cups-manager/Makefile	(revision 410833)
+++ print/gnome-cups-manager/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 
 PORTNAME=	gnome-cups-manager
 PORTVERSION=	0.31
-PORTREVISION=	15
+PORTREVISION=	16
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
--- print/gtklp/Makefile	(revision 410833)
+++ print/gtklp/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 PORTNAME=	gtklp
 PORTVERSION=	1.3.1
 DISTVERSIONSUFFIX=	.src
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	SF
 
--- print/gutenprint-cups/Makefile	(revision 410833)
+++ print/gutenprint-cups/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 #    $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
 
-PORTEPOCH=	0
+PORTREVISION=	3
 PKGNAMESUFFIX=	-cups
 
 MAINTAINER=	cmt@burggraben.net
--- print/gutenprint-foomatic/Makefile	(revision 410833)
+++ print/gutenprint-foomatic/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 #    $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
 
-PORTEPOCH=	0
+PORTREVISION=	2
 PKGNAMESUFFIX=	-foomatic
 
 MAINTAINER=	cmt@burggraben.net
--- print/gutenprint-ijs/Makefile	(revision 410833)
+++ print/gutenprint-ijs/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 #    $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
 
-PORTEPOCH=	0
+PORTREVISION=	2
 PKGNAMESUFFIX=	-ijs
 
 MAINTAINER=	cmt@burggraben.net
--- print/libgnomecups/Makefile	(revision 410833)
+++ print/libgnomecups/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libgnomecups
 PORTVERSION=	0.2.3
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
--- print/libgnomeprint/Makefile	(revision 410833)
+++ print/libgnomeprint/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 
 PORTNAME=	libgnomeprint
 PORTVERSION=	2.18.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- print/p5-Net-CUPS/Makefile	(revision 410833)
+++ print/p5-Net-CUPS/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	Net-CUPS
 PORTVERSION=	0.61
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- print/qpdfview/Makefile	(revision 410833)
+++ print/qpdfview/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	qpdfview
 PORTVERSION=	0.4.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	https://launchpadlibrarian.net/226592308/ \
 	https://launchpad.net/${PORTVERSION}/trunk/${PORTVERSION}/+download/
--- print/splix/Makefile	(revision 410833)
+++ print/splix/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	splix
 PORTVERSION=	2.0.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES?=	print
 MASTER_SITES=	SF
 
--- security/gnomint/Makefile	(revision 410833)
+++ security/gnomint/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gnomint
 PORTVERSION=	1.2.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	SF
 
--- security/gnupg/Makefile	(revision 410833)
+++ security/gnupg/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	gnupg
 PORTVERSION=	2.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
--- security/gnutls/Makefile	(revision 410833)
+++ security/gnutls/Makefile	(working copy)
@@ -1,12 +1,11 @@ 
 # $FreeBSD$
 
 PORTNAME=	gnutls
-PORTVERSION=	3.3.17.1
-PORTREVISION=	2
+PORTVERSION=	3.4.10
 CATEGORIES=	security net
-MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R:R}
+MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R}
 
-MAINTAINER=	bdrewery@FreeBSD.org
+MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
 LICENSE=	GPLv3 LGPL21
@@ -26,22 +25,26 @@ CONFIGURE_ARGS=	--disable-guile \
 		--disable-silent-rules \
 		--enable-local-libopts
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
+INSTALL_TARGET=	install-strip
 
 CPE_VENDOR=	gnu
 
-OPTIONS_DEFINE=		CRYWRAP EXAMPLES LIBDANE NLS P11KIT TPM ZLIB
-OPTIONS_DEFAULT=	CRYWRAP P11KIT TPM ZLIB
+OPTIONS_DEFINE=		CRYWRAP DANE EXAMPLES IDN NLS P11KIT TPM ZLIB
+OPTIONS_DEFAULT=	CRYWRAP IDN P11KIT TPM ZLIB
 OPTIONS_SUB=		yes
 
 CRYWRAP_DESC=			Enable Crywrap TLS proxy service
-CRYWRAP_LIB_DEPENDS=		libidn.so:${PORTSDIR}/dns/libidn
+CRYWRAP_IMPLIES=		IDN
 CRYWRAP_CONFIGURE_ENABLE=	crywrap
 
-LIBDANE_DESC=			DNSSEC support for DANE (danetool --check)
-LIBDANE_LIB_DEPENDS=		libunbound.so:${PORTSDIR}/dns/unbound
-LIBDANE_CONFIGURE_ENABLE=	libdane
+DANE_DESC=		Certificate verification via DNSSEC
+DANE_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
+DANE_CONFIGURE_ENABLE=	libdane
+
+IDN_CONFIGURE_WITH=	idn
+IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
@@ -60,12 +63,9 @@ INFO=		gnutls gnutls-guile
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/*.info*
-	${SED} -i '' -e 's|^+_NORETURN_H|_NORETURN_H|' \
-	  ${WRKSRC}/src/libopts/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnutls*.so.*
 
 .include <bsd.port.mk>
--- security/gnutls/distinfo	(revision 410833)
+++ security/gnutls/distinfo	(working copy)
@@ -1,2 +1,2 @@ 
-SHA256 (gnutls-3.3.17.1.tar.xz) = b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4
-SIZE (gnutls-3.3.17.1.tar.xz) = 6339588
+SHA256 (gnutls-3.4.10.tar.xz) = 6a32c2b4acbd33ff7eefcbd1357009da04c94c60146ef61320b6c076b1bdf59f
+SIZE (gnutls-3.4.10.tar.xz) = 6645892
--- security/gnutls/files/patch-configure	(nonexistent)
+++ security/gnutls/files/patch-configure	(working copy)
@@ -0,0 +1,18 @@ 
+--- configure.orig	2016-03-03 07:52:15 UTC
++++ configure
+@@ -47228,6 +47228,7 @@ fi
+ $as_echo "$enable_dane" >&6; }
+ 
+ if test "$enable_dane" != "no"; then
++    oldlibs="$LIBS"
+     LIBS="$oldlibs -lunbound"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unbound library" >&5
+ $as_echo_n "checking for unbound library... " >&6; }
+@@ -47444,6 +47445,7 @@ else
+ fi
+ 
+ if test "$with_tpm" != "no"; then
++    oldlibs="$LIBS"
+     LIBS="$oldlibs -ltspi"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5
+ $as_echo_n "checking for tss library... " >&6; }
--- security/gnutls/files/patch-lib__x509__rfc2818_hostname.c	(revision 410833)
+++ security/gnutls/files/patch-lib__x509__rfc2818_hostname.c	(nonexistent)
@@ -1,10 +0,0 @@ 
---- lib/x509/rfc2818_hostname.c.orig	2014-10-02 13:35:09.427374817 -0500
-+++ lib/x509/rfc2818_hostname.c	2014-10-02 13:35:33.657427866 -0500
-@@ -19,6 +19,7 @@
-  *
-  */
- 
-+#include <netinet/in.h>
- #include <gnutls_int.h>
- #include <gnutls_str.h>
- #include <x509_int.h>
--- security/gnutls/pkg-plist	(revision 410833)
+++ security/gnutls/pkg-plist	(working copy)
@@ -1,5 +1,5 @@ 
 bin/certtool
-%%LIBDANE%%bin/danetool
+%%DANE%%bin/danetool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
@@ -11,19 +11,21 @@ bin/srptool
 include/gnutls/abstract.h
 include/gnutls/compat.h
 include/gnutls/crypto.h
-%%LIBDANE%%include/gnutls/dane.h
+%%DANE%%include/gnutls/dane.h
 include/gnutls/dtls.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
 include/gnutls/ocsp.h
 include/gnutls/openpgp.h
-include/gnutls/openssl.h
 include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
+include/gnutls/pkcs7.h
 include/gnutls/self-test.h
+include/gnutls/system-keys.h
 include/gnutls/tpm.h
-include/gnutls/x509.h
+include/gnutls/urls.h
 include/gnutls/x509-ext.h
+include/gnutls/x509.h
 info/gnutls-client-server-use-case.png
 info/gnutls-handshake-sequence.png
 info/gnutls-handshake-state.png
@@ -34,22 +36,19 @@ info/gnutls-modauth.png
 info/gnutls-pgp.png
 info/gnutls-x509.png
 info/pkcs11-vision.png
-%%LIBDANE%%lib/libgnutls-dane.so
-%%LIBDANE%%lib/libgnutls-dane.so.0
-%%LIBDANE%%lib/libgnutls-dane.so.0.5.0
-lib/libgnutls-openssl.so
-lib/libgnutls-openssl.so.27
-lib/libgnutls-openssl.so.27.0.2
+%%DANE%%lib/libgnutls-dane.so
+%%DANE%%lib/libgnutls-dane.so.0
+%%DANE%%lib/libgnutls-dane.so.0.4.1
 lib/libgnutls.so
-lib/libgnutls.so.28
-lib/libgnutls.so.28.41.9
+lib/libgnutls.so.30
+lib/libgnutls.so.30.6.2
 lib/libgnutlsxx.so
 lib/libgnutlsxx.so.28
 lib/libgnutlsxx.so.28.1.0
 libdata/pkgconfig/gnutls.pc
-%%LIBDANE%%libdata/pkgconfig/gnutls-dane.pc
+%%DANE%%libdata/pkgconfig/gnutls-dane.pc
 man/man1/certtool.1.gz
-%%LIBDANE%%man/man1/danetool.1.gz
+%%DANE%%man/man1/danetool.1.gz
 man/man1/gnutls-cli-debug.1.gz
 man/man1/gnutls-cli.1.gz
 man/man1/gnutls-serv.1.gz
@@ -58,6 +57,10 @@ man/man1/p11tool.1.gz
 man/man1/psktool.1.gz
 man/man1/srptool.1.gz
 man/man1/tpmtool.1.gz
+man/man3/gnutls_aead_cipher_decrypt.3.gz
+man/man3/gnutls_aead_cipher_deinit.3.gz
+man/man3/gnutls_aead_cipher_encrypt.3.gz
+man/man3/gnutls_aead_cipher_init.3.gz
 man/man3/gnutls_alert_get.3.gz
 man/man3/gnutls_alert_get_name.3.gz
 man/man3/gnutls_alert_get_strname.3.gz
@@ -75,11 +78,11 @@ man/man3/gnutls_anon_set_server_params_f
 man/man3/gnutls_auth_client_get_type.3.gz
 man/man3/gnutls_auth_get_type.3.gz
 man/man3/gnutls_auth_server_get_type.3.gz
+man/man3/gnutls_buffer_append_data.3.gz
 man/man3/gnutls_bye.3.gz
 man/man3/gnutls_certificate_activation_time_peers.3.gz
 man/man3/gnutls_certificate_allocate_credentials.3.gz
 man/man3/gnutls_certificate_client_get_request_status.3.gz
-man/man3/gnutls_certificate_client_set_retrieve_function.3.gz
 man/man3/gnutls_certificate_expiration_time_peers.3.gz
 man/man3/gnutls_certificate_free_ca_names.3.gz
 man/man3/gnutls_certificate_free_cas.3.gz
@@ -88,13 +91,19 @@ man/man3/gnutls_certificate_free_crls.3.
 man/man3/gnutls_certificate_free_keys.3.gz
 man/man3/gnutls_certificate_get_crt_raw.3.gz
 man/man3/gnutls_certificate_get_issuer.3.gz
+man/man3/gnutls_certificate_get_openpgp_crt.3.gz
+man/man3/gnutls_certificate_get_openpgp_key.3.gz
 man/man3/gnutls_certificate_get_ours.3.gz
 man/man3/gnutls_certificate_get_peers.3.gz
 man/man3/gnutls_certificate_get_peers_subkey_id.3.gz
+man/man3/gnutls_certificate_get_trust_list.3.gz
+man/man3/gnutls_certificate_get_verify_flags.3.gz
+man/man3/gnutls_certificate_get_x509_crt.3.gz
+man/man3/gnutls_certificate_get_x509_key.3.gz
 man/man3/gnutls_certificate_send_x509_rdn_sequence.3.gz
 man/man3/gnutls_certificate_server_set_request.3.gz
-man/man3/gnutls_certificate_server_set_retrieve_function.3.gz
 man/man3/gnutls_certificate_set_dh_params.3.gz
+man/man3/gnutls_certificate_set_flags.3.gz
 man/man3/gnutls_certificate_set_key.3.gz
 man/man3/gnutls_certificate_set_ocsp_status_request_file.3.gz
 man/man3/gnutls_certificate_set_ocsp_status_request_function.3.gz
@@ -109,7 +118,6 @@ man/man3/gnutls_certificate_set_params_f
 man/man3/gnutls_certificate_set_pin_function.3.gz
 man/man3/gnutls_certificate_set_retrieve_function.3.gz
 man/man3/gnutls_certificate_set_retrieve_function2.3.gz
-man/man3/gnutls_certificate_set_rsa_export_params.3.gz
 man/man3/gnutls_certificate_set_trust_list.3.gz
 man/man3/gnutls_certificate_set_verify_flags.3.gz
 man/man3/gnutls_certificate_set_verify_function.3.gz
@@ -133,7 +141,6 @@ man/man3/gnutls_certificate_type_get.3.g
 man/man3/gnutls_certificate_type_get_id.3.gz
 man/man3/gnutls_certificate_type_get_name.3.gz
 man/man3/gnutls_certificate_type_list.3.gz
-man/man3/gnutls_certificate_type_set_priority.3.gz
 man/man3/gnutls_certificate_verification_status_print.3.gz
 man/man3/gnutls_certificate_verify_peers.3.gz
 man/man3/gnutls_certificate_verify_peers2.3.gz
@@ -156,7 +163,6 @@ man/man3/gnutls_cipher_init.3.gz
 man/man3/gnutls_cipher_list.3.gz
 man/man3/gnutls_cipher_self_test.3.gz
 man/man3/gnutls_cipher_set_iv.3.gz
-man/man3/gnutls_cipher_set_priority.3.gz
 man/man3/gnutls_cipher_suite_get_name.3.gz
 man/man3/gnutls_cipher_suite_info.3.gz
 man/man3/gnutls_cipher_tag.3.gz
@@ -164,10 +170,13 @@ man/man3/gnutls_compression_get.3.gz
 man/man3/gnutls_compression_get_id.3.gz
 man/man3/gnutls_compression_get_name.3.gz
 man/man3/gnutls_compression_list.3.gz
-man/man3/gnutls_compression_set_priority.3.gz
 man/man3/gnutls_credentials_clear.3.gz
 man/man3/gnutls_credentials_get.3.gz
 man/man3/gnutls_credentials_set.3.gz
+man/man3/gnutls_crypto_register_aead_cipher.3.gz
+man/man3/gnutls_crypto_register_cipher.3.gz
+man/man3/gnutls_crypto_register_digest.3.gz
+man/man3/gnutls_crypto_register_mac.3.gz
 man/man3/gnutls_db_check_entry.3.gz
 man/man3/gnutls_db_check_entry_time.3.gz
 man/man3/gnutls_db_get_default_cache_expiration.3.gz
@@ -192,10 +201,12 @@ man/man3/gnutls_dh_params_export_raw.3.g
 man/man3/gnutls_dh_params_generate2.3.gz
 man/man3/gnutls_dh_params_import_pkcs3.3.gz
 man/man3/gnutls_dh_params_import_raw.3.gz
+man/man3/gnutls_dh_params_import_raw2.3.gz
 man/man3/gnutls_dh_params_init.3.gz
 man/man3/gnutls_dh_set_prime_bits.3.gz
 man/man3/gnutls_digest_get_id.3.gz
 man/man3/gnutls_digest_get_name.3.gz
+man/man3/gnutls_digest_get_oid.3.gz
 man/man3/gnutls_digest_list.3.gz
 man/man3/gnutls_digest_self_test.3.gz
 man/man3/gnutls_dtls_cookie_send.3.gz
@@ -208,12 +219,17 @@ man/man3/gnutls_dtls_set_data_mtu.3.gz
 man/man3/gnutls_dtls_set_mtu.3.gz
 man/man3/gnutls_dtls_set_timeouts.3.gz
 man/man3/gnutls_ecc_curve_get.3.gz
+man/man3/gnutls_ecc_curve_get_id.3.gz
 man/man3/gnutls_ecc_curve_get_name.3.gz
+man/man3/gnutls_ecc_curve_get_oid.3.gz
 man/man3/gnutls_ecc_curve_get_size.3.gz
 man/man3/gnutls_ecc_curve_list.3.gz
 man/man3/gnutls_error_is_fatal.3.gz
 man/man3/gnutls_error_to_alert.3.gz
 man/man3/gnutls_est_record_overhead_size.3.gz
+man/man3/gnutls_ext_get_data.3.gz
+man/man3/gnutls_ext_register.3.gz
+man/man3/gnutls_ext_set_data.3.gz
 man/man3/gnutls_fingerprint.3.gz
 man/man3/gnutls_fips140_mode_enabled.3.gz
 man/man3/gnutls_global_deinit.3.gz
@@ -248,7 +264,9 @@ man/man3/gnutls_heartbeat_pong.3.gz
 man/man3/gnutls_heartbeat_set_timeouts.3.gz
 man/man3/gnutls_hex2bin.3.gz
 man/man3/gnutls_hex_decode.3.gz
+man/man3/gnutls_hex_decode2.3.gz
 man/man3/gnutls_hex_encode.3.gz
+man/man3/gnutls_hex_encode2.3.gz
 man/man3/gnutls_hmac.3.gz
 man/man3/gnutls_hmac_deinit.3.gz
 man/man3/gnutls_hmac_fast.3.gz
@@ -262,7 +280,6 @@ man/man3/gnutls_kx_get.3.gz
 man/man3/gnutls_kx_get_id.3.gz
 man/man3/gnutls_kx_get_name.3.gz
 man/man3/gnutls_kx_list.3.gz
-man/man3/gnutls_kx_set_priority.3.gz
 man/man3/gnutls_load_file.3.gz
 man/man3/gnutls_mac_get.3.gz
 man/man3/gnutls_mac_get_id.3.gz
@@ -271,7 +288,8 @@ man/man3/gnutls_mac_get_name.3.gz
 man/man3/gnutls_mac_get_nonce_size.3.gz
 man/man3/gnutls_mac_list.3.gz
 man/man3/gnutls_mac_self_test.3.gz
-man/man3/gnutls_mac_set_priority.3.gz
+man/man3/gnutls_memcmp.3.gz
+man/man3/gnutls_memset.3.gz
 man/man3/gnutls_ocsp_req_add_cert.3.gz
 man/man3/gnutls_ocsp_req_add_cert_id.3.gz
 man/man3/gnutls_ocsp_req_deinit.3.gz
@@ -294,6 +312,7 @@ man/man3/gnutls_ocsp_resp_get_extension.
 man/man3/gnutls_ocsp_resp_get_nonce.3.gz
 man/man3/gnutls_ocsp_resp_get_produced.3.gz
 man/man3/gnutls_ocsp_resp_get_responder.3.gz
+man/man3/gnutls_ocsp_resp_get_responder_raw_id.3.gz
 man/man3/gnutls_ocsp_resp_get_response.3.gz
 man/man3/gnutls_ocsp_resp_get_signature.3.gz
 man/man3/gnutls_ocsp_resp_get_signature_algorithm.3.gz
@@ -308,6 +327,11 @@ man/man3/gnutls_ocsp_resp_verify_direct.
 man/man3/gnutls_ocsp_status_request_enable_client.3.gz
 man/man3/gnutls_ocsp_status_request_get.3.gz
 man/man3/gnutls_ocsp_status_request_is_checked.3.gz
+man/man3/gnutls_oid_to_digest.3.gz
+man/man3/gnutls_oid_to_ecc_curve.3.gz
+man/man3/gnutls_oid_to_pk.3.gz
+man/man3/gnutls_oid_to_sign.3.gz
+man/man3/gnutls_openpgp_crt_check_email.3.gz
 man/man3/gnutls_openpgp_crt_check_hostname.3.gz
 man/man3/gnutls_openpgp_crt_check_hostname2.3.gz
 man/man3/gnutls_openpgp_crt_deinit.3.gz
@@ -379,32 +403,42 @@ man/man3/gnutls_openpgp_set_recv_key_fun
 man/man3/gnutls_packet_deinit.3.gz
 man/man3/gnutls_packet_get.3.gz
 man/man3/gnutls_pcert_deinit.3.gz
+man/man3/gnutls_pcert_export_openpgp.3.gz
+man/man3/gnutls_pcert_export_x509.3.gz
 man/man3/gnutls_pcert_import_openpgp.3.gz
 man/man3/gnutls_pcert_import_openpgp_raw.3.gz
 man/man3/gnutls_pcert_import_x509.3.gz
+man/man3/gnutls_pcert_import_x509_list.3.gz
 man/man3/gnutls_pcert_import_x509_raw.3.gz
 man/man3/gnutls_pcert_list_import_x509_raw.3.gz
 man/man3/gnutls_pem_base64_decode.3.gz
-man/man3/gnutls_pem_base64_decode_alloc.3.gz
+man/man3/gnutls_pem_base64_decode2.3.gz
 man/man3/gnutls_pem_base64_encode.3.gz
-man/man3/gnutls_pem_base64_encode_alloc.3.gz
+man/man3/gnutls_pem_base64_encode2.3.gz
 man/man3/gnutls_perror.3.gz
 man/man3/gnutls_pk_algorithm_get_name.3.gz
 man/man3/gnutls_pk_bits_to_sec_param.3.gz
 man/man3/gnutls_pk_get_id.3.gz
 man/man3/gnutls_pk_get_name.3.gz
+man/man3/gnutls_pk_get_oid.3.gz
 man/man3/gnutls_pk_list.3.gz
 man/man3/gnutls_pk_self_test.3.gz
 man/man3/gnutls_pk_to_sign.3.gz
 man/man3/gnutls_pkcs11_add_provider.3.gz
+man/man3/gnutls_pkcs11_copy_attached_extension.3.gz
+man/man3/gnutls_pkcs11_copy_pubkey.3.gz
 man/man3/gnutls_pkcs11_copy_secret_key.3.gz
 man/man3/gnutls_pkcs11_copy_x509_crt.3.gz
+man/man3/gnutls_pkcs11_copy_x509_crt2.3.gz
 man/man3/gnutls_pkcs11_copy_x509_privkey.3.gz
+man/man3/gnutls_pkcs11_copy_x509_privkey2.3.gz
 man/man3/gnutls_pkcs11_crt_is_known.3.gz
 man/man3/gnutls_pkcs11_deinit.3.gz
 man/man3/gnutls_pkcs11_delete_url.3.gz
 man/man3/gnutls_pkcs11_get_pin_function.3.gz
 man/man3/gnutls_pkcs11_get_raw_issuer.3.gz
+man/man3/gnutls_pkcs11_get_raw_issuer_by_dn.3.gz
+man/man3/gnutls_pkcs11_get_raw_issuer_by_subject_key_id.3.gz
 man/man3/gnutls_pkcs11_init.3.gz
 man/man3/gnutls_pkcs11_obj_deinit.3.gz
 man/man3/gnutls_pkcs11_obj_export.3.gz
@@ -418,14 +452,17 @@ man/man3/gnutls_pkcs11_obj_get_info.3.gz
 man/man3/gnutls_pkcs11_obj_get_type.3.gz
 man/man3/gnutls_pkcs11_obj_import_url.3.gz
 man/man3/gnutls_pkcs11_obj_init.3.gz
-man/man3/gnutls_pkcs11_obj_list_import_url.3.gz
-man/man3/gnutls_pkcs11_obj_list_import_url2.3.gz
+man/man3/gnutls_pkcs11_obj_list_import_url3.3.gz
+man/man3/gnutls_pkcs11_obj_list_import_url4.3.gz
+man/man3/gnutls_pkcs11_obj_set_info.3.gz
 man/man3/gnutls_pkcs11_obj_set_pin_function.3.gz
+man/man3/gnutls_pkcs11_privkey_cpy.3.gz
 man/man3/gnutls_pkcs11_privkey_deinit.3.gz
 man/man3/gnutls_pkcs11_privkey_export_pubkey.3.gz
 man/man3/gnutls_pkcs11_privkey_export_url.3.gz
 man/man3/gnutls_pkcs11_privkey_generate.3.gz
 man/man3/gnutls_pkcs11_privkey_generate2.3.gz
+man/man3/gnutls_pkcs11_privkey_generate3.3.gz
 man/man3/gnutls_pkcs11_privkey_get_info.3.gz
 man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3.gz
 man/man3/gnutls_pkcs11_privkey_import_url.3.gz
@@ -445,6 +482,7 @@ man/man3/gnutls_pkcs11_token_set_pin.3.g
 man/man3/gnutls_pkcs11_type_get_name.3.gz
 man/man3/gnutls_pkcs12_bag_decrypt.3.gz
 man/man3/gnutls_pkcs12_bag_deinit.3.gz
+man/man3/gnutls_pkcs12_bag_enc_info.3.gz
 man/man3/gnutls_pkcs12_bag_encrypt.3.gz
 man/man3/gnutls_pkcs12_bag_get_count.3.gz
 man/man3/gnutls_pkcs12_bag_get_data.3.gz
@@ -457,33 +495,53 @@ man/man3/gnutls_pkcs12_bag_set_crt.3.gz
 man/man3/gnutls_pkcs12_bag_set_data.3.gz
 man/man3/gnutls_pkcs12_bag_set_friendly_name.3.gz
 man/man3/gnutls_pkcs12_bag_set_key_id.3.gz
+man/man3/gnutls_pkcs12_bag_set_privkey.3.gz
 man/man3/gnutls_pkcs12_deinit.3.gz
 man/man3/gnutls_pkcs12_export.3.gz
 man/man3/gnutls_pkcs12_export2.3.gz
 man/man3/gnutls_pkcs12_generate_mac.3.gz
+man/man3/gnutls_pkcs12_generate_mac2.3.gz
 man/man3/gnutls_pkcs12_get_bag.3.gz
 man/man3/gnutls_pkcs12_import.3.gz
 man/man3/gnutls_pkcs12_init.3.gz
+man/man3/gnutls_pkcs12_mac_info.3.gz
 man/man3/gnutls_pkcs12_set_bag.3.gz
 man/man3/gnutls_pkcs12_simple_parse.3.gz
 man/man3/gnutls_pkcs12_verify_mac.3.gz
+man/man3/gnutls_pkcs7_add_attr.3.gz
+man/man3/gnutls_pkcs7_attrs_deinit.3.gz
 man/man3/gnutls_pkcs7_deinit.3.gz
 man/man3/gnutls_pkcs7_delete_crl.3.gz
 man/man3/gnutls_pkcs7_delete_crt.3.gz
 man/man3/gnutls_pkcs7_export.3.gz
 man/man3/gnutls_pkcs7_export2.3.gz
+man/man3/gnutls_pkcs7_get_attr.3.gz
 man/man3/gnutls_pkcs7_get_crl_count.3.gz
 man/man3/gnutls_pkcs7_get_crl_raw.3.gz
+man/man3/gnutls_pkcs7_get_crl_raw2.3.gz
 man/man3/gnutls_pkcs7_get_crt_count.3.gz
 man/man3/gnutls_pkcs7_get_crt_raw.3.gz
+man/man3/gnutls_pkcs7_get_crt_raw2.3.gz
+man/man3/gnutls_pkcs7_get_embedded_data.3.gz
+man/man3/gnutls_pkcs7_get_signature_count.3.gz
+man/man3/gnutls_pkcs7_get_signature_info.3.gz
 man/man3/gnutls_pkcs7_import.3.gz
 man/man3/gnutls_pkcs7_init.3.gz
+man/man3/gnutls_pkcs7_print.3.gz
 man/man3/gnutls_pkcs7_set_crl.3.gz
 man/man3/gnutls_pkcs7_set_crl_raw.3.gz
 man/man3/gnutls_pkcs7_set_crt.3.gz
 man/man3/gnutls_pkcs7_set_crt_raw.3.gz
+man/man3/gnutls_pkcs7_sign.3.gz
+man/man3/gnutls_pkcs7_signature_info_deinit.3.gz
+man/man3/gnutls_pkcs7_verify.3.gz
+man/man3/gnutls_pkcs7_verify_direct.3.gz
+man/man3/gnutls_pkcs8_info.3.gz
+man/man3/gnutls_pkcs_schema_get_name.3.gz
+man/man3/gnutls_pkcs_schema_get_oid.3.gz
 man/man3/gnutls_prf.3.gz
 man/man3/gnutls_prf_raw.3.gz
+man/man3/gnutls_prf_rfc5705.3.gz
 man/man3/gnutls_priority_certificate_type_list.3.gz
 man/man3/gnutls_priority_cipher_list.3.gz
 man/man3/gnutls_priority_compression_list.3.gz
@@ -497,11 +555,15 @@ man/man3/gnutls_priority_protocol_list.3
 man/man3/gnutls_priority_set.3.gz
 man/man3/gnutls_priority_set_direct.3.gz
 man/man3/gnutls_priority_sign_list.3.gz
+man/man3/gnutls_priority_string_list.3.gz
 man/man3/gnutls_privkey_decrypt_data.3.gz
 man/man3/gnutls_privkey_deinit.3.gz
 man/man3/gnutls_privkey_export_dsa_raw.3.gz
 man/man3/gnutls_privkey_export_ecc_raw.3.gz
+man/man3/gnutls_privkey_export_openpgp.3.gz
+man/man3/gnutls_privkey_export_pkcs11.3.gz
 man/man3/gnutls_privkey_export_rsa_raw.3.gz
+man/man3/gnutls_privkey_export_x509.3.gz
 man/man3/gnutls_privkey_generate.3.gz
 man/man3/gnutls_privkey_get_pk_algorithm.3.gz
 man/man3/gnutls_privkey_get_type.3.gz
@@ -509,6 +571,7 @@ man/man3/gnutls_privkey_import_dsa_raw.3
 man/man3/gnutls_privkey_import_ecc_raw.3.gz
 man/man3/gnutls_privkey_import_ext.3.gz
 man/man3/gnutls_privkey_import_ext2.3.gz
+man/man3/gnutls_privkey_import_ext3.3.gz
 man/man3/gnutls_privkey_import_openpgp.3.gz
 man/man3/gnutls_privkey_import_openpgp_raw.3.gz
 man/man3/gnutls_privkey_import_pkcs11.3.gz
@@ -523,14 +586,12 @@ man/man3/gnutls_privkey_init.3.gz
 man/man3/gnutls_privkey_set_pin_function.3.gz
 man/man3/gnutls_privkey_sign_data.3.gz
 man/man3/gnutls_privkey_sign_hash.3.gz
-man/man3/gnutls_privkey_sign_raw_data.3.gz
 man/man3/gnutls_privkey_status.3.gz
 man/man3/gnutls_privkey_verify_params.3.gz
 man/man3/gnutls_protocol_get_id.3.gz
 man/man3/gnutls_protocol_get_name.3.gz
 man/man3/gnutls_protocol_get_version.3.gz
 man/man3/gnutls_protocol_list.3.gz
-man/man3/gnutls_protocol_set_priority.3.gz
 man/man3/gnutls_psk_allocate_client_credentials.3.gz
 man/man3/gnutls_psk_allocate_server_credentials.3.gz
 man/man3/gnutls_psk_client_get_hint.3.gz
@@ -558,7 +619,6 @@ man/man3/gnutls_pubkey_get_key_usage.3.g
 man/man3/gnutls_pubkey_get_openpgp_key_id.3.gz
 man/man3/gnutls_pubkey_get_pk_algorithm.3.gz
 man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3.gz
-man/man3/gnutls_pubkey_get_verify_algorithm.3.gz
 man/man3/gnutls_pubkey_import.3.gz
 man/man3/gnutls_pubkey_import_dsa_raw.3.gz
 man/man3/gnutls_pubkey_import_ecc_raw.3.gz
@@ -566,7 +626,6 @@ man/man3/gnutls_pubkey_import_ecc_x962.3
 man/man3/gnutls_pubkey_import_openpgp.3.gz
 man/man3/gnutls_pubkey_import_openpgp_raw.3.gz
 man/man3/gnutls_pubkey_import_pkcs11.3.gz
-man/man3/gnutls_pubkey_import_pkcs11_url.3.gz
 man/man3/gnutls_pubkey_import_privkey.3.gz
 man/man3/gnutls_pubkey_import_rsa_raw.3.gz
 man/man3/gnutls_pubkey_import_tpm_raw.3.gz
@@ -579,9 +638,7 @@ man/man3/gnutls_pubkey_init.3.gz
 man/man3/gnutls_pubkey_print.3.gz
 man/man3/gnutls_pubkey_set_key_usage.3.gz
 man/man3/gnutls_pubkey_set_pin_function.3.gz
-man/man3/gnutls_pubkey_verify_data.3.gz
 man/man3/gnutls_pubkey_verify_data2.3.gz
-man/man3/gnutls_pubkey_verify_hash.3.gz
 man/man3/gnutls_pubkey_verify_hash2.3.gz
 man/man3/gnutls_pubkey_verify_params.3.gz
 man/man3/gnutls_random_art.3.gz
@@ -591,32 +648,25 @@ man/man3/gnutls_record_check_corked.3.gz
 man/man3/gnutls_record_check_pending.3.gz
 man/man3/gnutls_record_cork.3.gz
 man/man3/gnutls_record_disable_padding.3.gz
+man/man3/gnutls_record_discard_queued.3.gz
 man/man3/gnutls_record_get_direction.3.gz
 man/man3/gnutls_record_get_discarded.3.gz
 man/man3/gnutls_record_get_max_size.3.gz
+man/man3/gnutls_record_get_state.3.gz
 man/man3/gnutls_record_overhead_size.3.gz
 man/man3/gnutls_record_recv.3.gz
 man/man3/gnutls_record_recv_packet.3.gz
 man/man3/gnutls_record_recv_seq.3.gz
 man/man3/gnutls_record_send.3.gz
 man/man3/gnutls_record_send_range.3.gz
-man/man3/gnutls_record_set_max_empty_records.3.gz
 man/man3/gnutls_record_set_max_size.3.gz
+man/man3/gnutls_record_set_state.3.gz
 man/man3/gnutls_record_set_timeout.3.gz
 man/man3/gnutls_record_uncork.3.gz
+man/man3/gnutls_register_custom_url.3.gz
 man/man3/gnutls_rehandshake.3.gz
 man/man3/gnutls_rnd.3.gz
 man/man3/gnutls_rnd_refresh.3.gz
-man/man3/gnutls_rsa_export_get_modulus_bits.3.gz
-man/man3/gnutls_rsa_export_get_pubkey.3.gz
-man/man3/gnutls_rsa_params_cpy.3.gz
-man/man3/gnutls_rsa_params_deinit.3.gz
-man/man3/gnutls_rsa_params_export_pkcs1.3.gz
-man/man3/gnutls_rsa_params_export_raw.3.gz
-man/man3/gnutls_rsa_params_generate2.3.gz
-man/man3/gnutls_rsa_params_import_pkcs1.3.gz
-man/man3/gnutls_rsa_params_import_raw.3.gz
-man/man3/gnutls_rsa_params_init.3.gz
 man/man3/gnutls_safe_renegotiation_status.3.gz
 man/man3/gnutls_sec_param_get_name.3.gz
 man/man3/gnutls_sec_param_to_pk_bits.3.gz
@@ -625,6 +675,8 @@ man/man3/gnutls_server_name_get.3.gz
 man/man3/gnutls_server_name_set.3.gz
 man/man3/gnutls_session_channel_binding.3.gz
 man/man3/gnutls_session_enable_compatibility_mode.3.gz
+man/man3/gnutls_session_etm_status.3.gz
+man/man3/gnutls_session_ext_master_secret_status.3.gz
 man/man3/gnutls_session_force_valid.3.gz
 man/man3/gnutls_session_get_data.3.gz
 man/man3/gnutls_session_get_data2.3.gz
@@ -633,34 +685,36 @@ man/man3/gnutls_session_get_id.3.gz
 man/man3/gnutls_session_get_id2.3.gz
 man/man3/gnutls_session_get_ptr.3.gz
 man/man3/gnutls_session_get_random.3.gz
+man/man3/gnutls_session_get_verify_cert_status.3.gz
 man/man3/gnutls_session_is_resumed.3.gz
 man/man3/gnutls_session_resumption_requested.3.gz
 man/man3/gnutls_session_set_data.3.gz
 man/man3/gnutls_session_set_id.3.gz
 man/man3/gnutls_session_set_premaster.3.gz
 man/man3/gnutls_session_set_ptr.3.gz
+man/man3/gnutls_session_set_verify_cert.3.gz
+man/man3/gnutls_session_set_verify_cert2.3.gz
+man/man3/gnutls_session_set_verify_function.3.gz
 man/man3/gnutls_session_ticket_enable_client.3.gz
 man/man3/gnutls_session_ticket_enable_server.3.gz
 man/man3/gnutls_session_ticket_key_generate.3.gz
-man/man3/gnutls_set_default_export_priority.3.gz
 man/man3/gnutls_set_default_priority.3.gz
 man/man3/gnutls_sign_algorithm_get.3.gz
 man/man3/gnutls_sign_algorithm_get_client.3.gz
 man/man3/gnutls_sign_algorithm_get_requested.3.gz
-man/man3/gnutls_sign_callback_get.3.gz
-man/man3/gnutls_sign_callback_set.3.gz
 man/man3/gnutls_sign_get_hash_algorithm.3.gz
 man/man3/gnutls_sign_get_id.3.gz
 man/man3/gnutls_sign_get_name.3.gz
+man/man3/gnutls_sign_get_oid.3.gz
 man/man3/gnutls_sign_get_pk_algorithm.3.gz
 man/man3/gnutls_sign_is_secure.3.gz
 man/man3/gnutls_sign_list.3.gz
 man/man3/gnutls_srp_allocate_client_credentials.3.gz
 man/man3/gnutls_srp_allocate_server_credentials.3.gz
 man/man3/gnutls_srp_base64_decode.3.gz
-man/man3/gnutls_srp_base64_decode_alloc.3.gz
+man/man3/gnutls_srp_base64_decode2.3.gz
 man/man3/gnutls_srp_base64_encode.3.gz
-man/man3/gnutls_srp_base64_encode_alloc.3.gz
+man/man3/gnutls_srp_base64_encode2.3.gz
 man/man3/gnutls_srp_free_client_credentials.3.gz
 man/man3/gnutls_srp_free_server_credentials.3.gz
 man/man3/gnutls_srp_server_get_username.3.gz
@@ -688,6 +742,14 @@ man/man3/gnutls_subject_alt_names_get.3.
 man/man3/gnutls_subject_alt_names_init.3.gz
 man/man3/gnutls_subject_alt_names_set.3.gz
 man/man3/gnutls_supplemental_get_name.3.gz
+man/man3/gnutls_supplemental_recv.3.gz
+man/man3/gnutls_supplemental_register.3.gz
+man/man3/gnutls_supplemental_send.3.gz
+man/man3/gnutls_system_key_add_x509.3.gz
+man/man3/gnutls_system_key_delete.3.gz
+man/man3/gnutls_system_key_iter_deinit.3.gz
+man/man3/gnutls_system_key_iter_get_info.3.gz
+man/man3/gnutls_system_recv_timeout.3.gz
 man/man3/gnutls_tdb_deinit.3.gz
 man/man3/gnutls_tdb_init.3.gz
 man/man3/gnutls_tdb_set_store_commitment_func.3.gz
@@ -792,6 +854,7 @@ man/man3/gnutls_x509_crq_get_key_rsa_raw
 man/man3/gnutls_x509_crq_get_key_usage.3.gz
 man/man3/gnutls_x509_crq_get_pk_algorithm.3.gz
 man/man3/gnutls_x509_crq_get_private_key_usage_period.3.gz
+man/man3/gnutls_x509_crq_get_signature_algorithm.3.gz
 man/man3/gnutls_x509_crq_get_subject_alt_name.3.gz
 man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3.gz
 man/man3/gnutls_x509_crq_get_version.3.gz
@@ -815,6 +878,7 @@ man/man3/gnutls_x509_crq_set_version.3.g
 man/man3/gnutls_x509_crq_sign.3.gz
 man/man3/gnutls_x509_crq_sign2.3.gz
 man/man3/gnutls_x509_crq_verify.3.gz
+man/man3/gnutls_x509_crt_check_email.3.gz
 man/man3/gnutls_x509_crt_check_hostname.3.gz
 man/man3/gnutls_x509_crt_check_hostname2.3.gz
 man/man3/gnutls_x509_crt_check_issuer.3.gz
@@ -857,6 +921,7 @@ man/man3/gnutls_x509_crt_get_key_usage.3
 man/man3/gnutls_x509_crt_get_name_constraints.3.gz
 man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz
 man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz
+man/man3/gnutls_x509_crt_get_pk_ecc_raw.3.gz
 man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz
 man/man3/gnutls_x509_crt_get_policy.3.gz
 man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3.gz
@@ -873,11 +938,10 @@ man/man3/gnutls_x509_crt_get_subject_alt
 man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3.gz
 man/man3/gnutls_x509_crt_get_subject_key_id.3.gz
 man/man3/gnutls_x509_crt_get_subject_unique_id.3.gz
-man/man3/gnutls_x509_crt_get_verify_algorithm.3.gz
 man/man3/gnutls_x509_crt_get_version.3.gz
 man/man3/gnutls_x509_crt_import.3.gz
 man/man3/gnutls_x509_crt_import_pkcs11.3.gz
-man/man3/gnutls_x509_crt_import_pkcs11_url.3.gz
+man/man3/gnutls_x509_crt_import_url.3.gz
 man/man3/gnutls_x509_crt_init.3.gz
 man/man3/gnutls_x509_crt_list_import.3.gz
 man/man3/gnutls_x509_crt_list_import2.3.gz
@@ -901,6 +965,7 @@ man/man3/gnutls_x509_crt_set_extension_b
 man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz
 man/man3/gnutls_x509_crt_set_issuer_dn.3.gz
 man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3.gz
+man/man3/gnutls_x509_crt_set_issuer_unique_id.3.gz
 man/man3/gnutls_x509_crt_set_key.3.gz
 man/man3/gnutls_x509_crt_set_key_purpose_oid.3.gz
 man/man3/gnutls_x509_crt_set_key_usage.3.gz
@@ -915,16 +980,17 @@ man/man3/gnutls_x509_crt_set_serial.3.gz
 man/man3/gnutls_x509_crt_set_subject_alt_name.3.gz
 man/man3/gnutls_x509_crt_set_subject_alternative_name.3.gz
 man/man3/gnutls_x509_crt_set_subject_key_id.3.gz
+man/man3/gnutls_x509_crt_set_subject_unique_id.3.gz
 man/man3/gnutls_x509_crt_set_version.3.gz
 man/man3/gnutls_x509_crt_sign.3.gz
 man/man3/gnutls_x509_crt_sign2.3.gz
 man/man3/gnutls_x509_crt_verify.3.gz
-man/man3/gnutls_x509_crt_verify_data.3.gz
-man/man3/gnutls_x509_crt_verify_hash.3.gz
+man/man3/gnutls_x509_crt_verify_data2.3.gz
 man/man3/gnutls_x509_dn_deinit.3.gz
 man/man3/gnutls_x509_dn_export.3.gz
 man/man3/gnutls_x509_dn_export2.3.gz
 man/man3/gnutls_x509_dn_get_rdn_ava.3.gz
+man/man3/gnutls_x509_dn_get_str.3.gz
 man/man3/gnutls_x509_dn_import.3.gz
 man/man3/gnutls_x509_dn_init.3.gz
 man/man3/gnutls_x509_dn_oid_known.3.gz
@@ -998,6 +1064,7 @@ man/man3/gnutls_x509_privkey_import_rsa_
 man/man3/gnutls_x509_privkey_import_rsa_raw2.3.gz
 man/man3/gnutls_x509_privkey_init.3.gz
 man/man3/gnutls_x509_privkey_sec_param.3.gz
+man/man3/gnutls_x509_privkey_set_pin_function.3.gz
 man/man3/gnutls_x509_privkey_sign_data.3.gz
 man/man3/gnutls_x509_privkey_sign_hash.3.gz
 man/man3/gnutls_x509_privkey_verify_params.3.gz
@@ -1013,7 +1080,11 @@ man/man3/gnutls_x509_trust_list_add_trus
 man/man3/gnutls_x509_trust_list_add_trust_mem.3.gz
 man/man3/gnutls_x509_trust_list_deinit.3.gz
 man/man3/gnutls_x509_trust_list_get_issuer.3.gz
+man/man3/gnutls_x509_trust_list_get_issuer_by_dn.3.gz
+man/man3/gnutls_x509_trust_list_get_issuer_by_subject_key_id.3.gz
 man/man3/gnutls_x509_trust_list_init.3.gz
+man/man3/gnutls_x509_trust_list_iter_deinit.3.gz
+man/man3/gnutls_x509_trust_list_iter_get_ca.3.gz
 man/man3/gnutls_x509_trust_list_remove_cas.3.gz
 man/man3/gnutls_x509_trust_list_remove_trust_file.3.gz
 man/man3/gnutls_x509_trust_list_remove_trust_mem.3.gz
--- security/gsasl/Makefile	(revision 410833)
+++ security/gsasl/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gsasl
 PORTVERSION=	1.8.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	GNU
 
--- security/hs-gnutls/Makefile	(revision 410833)
+++ security/hs-gnutls/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	gnutls
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	security haskell
 
 MAINTAINER=	haskell@FreeBSD.org
--- security/libprelude/Makefile	(revision 410833)
+++ security/libprelude/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libprelude
 PORTVERSION=	1.0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/attachments/download/241/
 
--- security/libpreludedb/Makefile	(revision 410833)
+++ security/libpreludedb/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libpreludedb
 PORTVERSION=	1.0.1p1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	security
 MASTER_SITES=	https://www.prelude-ids.org/attachments/download/287/
 
--- security/openconnect/Makefile	(revision 410833)
+++ security/openconnect/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	openconnect
 PORTVERSION=	7.06
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/ \
 		http://mirrors.rit.edu/zi/
--- security/openvas-libnasl/Makefile	(revision 410833)
+++ security/openvas-libnasl/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	openvas-libnasl
 PORTVERSION=	2.0.1
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/561/
 
--- security/openvas-libraries/Makefile	(revision 410833)
+++ security/openvas-libraries/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	openvas-libraries
 PORTVERSION=	2.0.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/600/
 
--- security/openvas-plugins/Makefile	(revision 410833)
+++ security/openvas-plugins/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	openvas-plugins
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/588/
 
--- security/openvas-server/Makefile	(revision 410833)
+++ security/openvas-server/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	openvas-server
 PORTVERSION=	2.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/593/
 
--- security/py-gnutls/Makefile	(revision 410833)
+++ security/py-gnutls/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	gnutls
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- security/shishi/Makefile	(revision 410833)
+++ security/shishi/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	shishi
 PORTVERSION=	1.0.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	GNU
 
--- security/suricata/Makefile	(revision 410833)
+++ security/suricata/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	suricata
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.openinfosecfoundation.org/download/
 
--- security/xmlsec1/Makefile	(revision 410833)
+++ security/xmlsec1/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	xmlsec1
 PORTVERSION=	1.2.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 		ftp://ftp.aleksey.com/pub/xmlsec/releases/ \
--- sysutils/cinnamon-settings-daemon/Makefile	(revision 410833)
+++ sysutils/cinnamon-settings-daemon/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	cinnamon-settings-daemon
 PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome3
 
--- sysutils/gkrellm2/Makefile	(revision 410833)
+++ sysutils/gkrellm2/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.3.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		LOCAL/ume
@@ -17,9 +17,7 @@ USES=		gmake pkgconfig tar:bzip2
 USE_RC_SUBR=	gkrellmd
 WANT_GNOME=	yes
 
-OPTIONS_DEFINE=		DOCS CLIENT NLS NTLM
-OPTIONS_RADIO=		SSL
-OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
+OPTIONS_DEFINE=		DOCS CLIENT NLS NTLM OPENSSL
 OPTIONS_DEFAULT=	CLIENT NTLM OPENSSL
 OPTIONS_SUB=		yes
 
@@ -40,11 +38,7 @@ USES+=		gettext
 .else
 MAKE_ENV+=	enable_nls=0
 .endif
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
-MAKE_ENV+=	GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \
-		without-ssl=1
-.elif ${PORT_OPTIONS:MOPENSSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
 MAKE_ENV+=	without-gnutls=1
 .else
--- sysutils/gnome-control-center/Makefile	(revision 410833)
+++ sysutils/gnome-control-center/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.18.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- sysutils/gnome-settings-daemon/Makefile	(revision 410833)
+++ sysutils/gnome-settings-daemon/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gnome-settings-daemon
 PORTVERSION=	3.18.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- sysutils/heartbeat/Makefile	(revision 410833)
+++ sysutils/heartbeat/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	heartbeat
 PORTVERSION=	2.1.4
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	sysutils
 #MASTER_SITES=	http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
 MASTER_SITES=	LOCAL/kuriyama/heartbeat
--- sysutils/rsyslog7/Makefile	(revision 410833)
+++ sysutils/rsyslog7/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	rsyslog
 PORTVERSION=	7.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
--- sysutils/rsyslog8/Makefile	(revision 410833)
+++ sysutils/rsyslog8/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	rsyslog
 PORTVERSION=	8.11.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
--- textproc/iksemel/Makefile	(revision 410833)
+++ textproc/iksemel/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	iksemel
 PORTVERSION=	1.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	GOOGLE_CODE
 
--- www/aws/Makefile	(revision 410833)
+++ www/aws/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	aws
 PORTVERSION=	3.3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
--- www/gurlchecker/Makefile	(revision 410833)
+++ www/gurlchecker/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gurlchecker
 PORTVERSION=	0.10.1
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	www gnome
 MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/547/
 
--- www/hydra/Makefile	(revision 410833)
+++ www/hydra/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	hydra
 PORTVERSION=	0.1.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	http://hydra.hellug.gr/download/
 PKGNAMESUFFIX=	-web
--- www/libepc/Makefile	(revision 410833)
+++ www/libepc/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 
 PORTNAME=	libepc
 PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	GNOME
 
--- www/libmicrohttpd/Makefile	(revision 410833)
+++ www/libmicrohttpd/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libmicrohttpd
 PORTVERSION=	0.9.37
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	GNU
 
--- www/ocaml-net/Makefile	(revision 410833)
+++ www/ocaml-net/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	net
 PORTVERSION=	4.0.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
--- www/retawq/Makefile	(revision 410833)
+++ www/retawq/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	retawq
 DISTVERSION=	0.2.6c
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	www ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c
 
--- www/tntnet/Makefile	(revision 410833)
+++ www/tntnet/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	tntnet
 PORTVERSION=	2.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
--- www/webkit2-gtk3/Makefile	(revision 410833)
+++ www/webkit2-gtk3/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	webkit
 PORTVERSION=	2.8.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
--- www/wwwoffle/Makefile	(revision 410833)
+++ www/wwwoffle/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	wwwoffle
 PORTVERSION=	2.9i
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.gedanken.org.uk/software/wwwoffle/download/
 
--- www/xombrero/Makefile	(revision 410833)
+++ www/xombrero/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	xombrero
 PORTVERSION=	1.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://opensource.conformal.com/snapshots/xombrero/
 
--- x11/gnome-terminal/Makefile	(revision 410833)
+++ x11/gnome-terminal/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	3.18.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- x11/sakura/Makefile	(revision 410833)
+++ x11/sakura/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	sakura
 PORTVERSION=	3.3.4
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://launchpadlibrarian.net/235602098/
 
--- x11-toolkits/gnustep-gui/Makefile	(revision 410833)
+++ x11-toolkits/gnustep-gui/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gnustep-gui
 PORTVERSION=	0.24.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	GNUSTEP/core
 
--- x11-toolkits/gtk20/Makefile	(revision 410833)
+++ x11-toolkits/gtk20/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	gtk
 PORTVERSION=	2.24.29
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	2
--- x11-toolkits/gtk30/Makefile	(revision 410833)
+++ x11-toolkits/gtk30/Makefile	(working copy)
@@ -5,7 +5,7 @@ 
 
 PORTNAME=	gtk
 PORTVERSION=	3.18.8
-PORTREVISION?=	1
+PORTREVISION?=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	3
--- x11-toolkits/nucleo/Makefile	(revision 410833)
+++ x11-toolkits/nucleo/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	nucleo
 PORTVERSION=	0.7.6
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/
 
--- x11-toolkits/vte3/Makefile	(revision 410833)
+++ x11-toolkits/vte3/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	vte
 PORTVERSION=	0.42.4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3