Chase security/libgcrypt update

95 files changed, 149 insertions, 201 deletions

diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 131efdedac37..5f2963d6fe95 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ario
 PORTVERSION=	1.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
 
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index d9971d849319..589a5f1ef0a3 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gogglesmm
 PORTVERSION=	0.12.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
@@ -49,7 +49,7 @@ LIB_DEPENDS+=	FOX-1.7:${PORTSDIR}/x11-toolkits/fox17
 .endif
 
 .if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=	--with-md5=gcrypt
 .else
 CONFIGURE_ARGS+=	--with-md5=internal
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index 7fa3a0aaba79..757a8d0a4a93 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmtp
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
index a3a8e75b7a93..7255085843d7 100644
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pianobar
 PORTVERSION=	2012.12.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://6xq.net/projects/${PORTNAME}/
 
diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile
index 7f029ccb0a90..ced2dc073d76 100644
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	libimobiledevice
-# Date created:				10 June 2010
-# Whom:					Alberto Villa <avilla@FreeBSD.org>
-#
 # $FreeBSD$
 
 PORTNAME=	libimobiledevice
 PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	http://www.${PORTNAME}.org/downloads/
 
@@ -18,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls \
 		tasn1.5:${PORTSDIR}/security/libtasn1 \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
 		plist.1:${PORTSDIR}/devel/libplist \
 		usbmuxd.1:${PORTSDIR}/comms/usbmuxd
 
diff --git a/comms/qtel/Makefile b/comms/qtel/Makefile
index bb757cc38bf4..f1ff614a58e6 100644
--- a/comms/qtel/Makefile
+++ b/comms/qtel/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	qtel
-# Date Created:		2012-05-22
-# Whome:		Stephen Hurd <shurd@sasktel.net>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	qtel
 PORTVERSION=	11.05
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	svxlink/svxlink/${PORTVERSION}
diff --git a/databases/drizzle/Makefile b/databases/drizzle/Makefile
index fe5c6d27a832..1f77b25fe216 100644
--- a/databases/drizzle/Makefile
+++ b/databases/drizzle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	drizzle
 PORTVERSION=	2010.05.1561
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpadlibrarian.net/49101349/ \
 		LOCAL/glarkin
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 1c2e36fbaa2f..7fe7dabf181b 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgda
 PORTVERSION=	4.2.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX?=	4
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index 671a6a349cfb..7906306a46e8 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	chmsee
-# Date created:                		10 June 2006
-# Whom:                    		Yinghong Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong Liu <relaxbsd@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	chmsee
 PORTVERSION=	1.3.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -15,7 +11,7 @@ MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	A viewer for Microsoft Help "CHM" files
 
 LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 LICENSE=	GPLv2
 
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index 9ab2bd24b91a..765bd55bb4a1 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	gsoap
-# Date created:				8 March 2004
-# Whom:					Sergey Matveychuk <sem@ciam.ru>
-#
+# Created by: Sergey Matveychuk <sem@ciam.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	gsoap
 PORTVERSION=	2.8.10
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gSOAP 
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -40,7 +37,7 @@ CONFIGURE_ARGS+=--disable-ssl
 
 .if defined(WITH_GNUTLS) 
 LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls \
-   		gcrypt.18:${PORTSDIR}/security/libgcrypt \
+   		gcrypt:${PORTSDIR}/security/libgcrypt \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error
 CONFIGURE_ARGS+=--enable-gnutls
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index ef868257944f..2fa6b4cf938a 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gvfs
 PORTVERSION=	1.12.3
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index eaf22f7dc253..5e921bf24786 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gwenhywfar
 PORTVERSION=	4.3.3
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	devel net security
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
 
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index a06b091b7fa1..d78e270af1f1 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.40.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 3ac692891615..fd8dd2eb8a1a 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile
index 0b7e4a04debe..cf602da24754 100644
--- a/devel/libzrtpcpp/Makefile
+++ b/devel/libzrtpcpp/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	libzrtpcpp
-# Date created:		2006-10-04
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libzrtpcpp
 PORTVERSION=	2.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=ccrtp
@@ -16,7 +12,7 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	ZRTP extension for GNU ccRTP
 
 LIB_DEPENDS=	ccrtp:${PORTSDIR}/devel/ccrtp \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USES=		cmake
 USE_OPENSSL=	yes
diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile
index 3d196307bb19..e3334730c32b 100644
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@@ -1,13 +1,9 @@
-# ex:ts=8
-# Ports collection makefile for:	srecord
-# Date Created:			Aug 13, 2007
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	srecord
 PORTVERSION=	1.59
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -15,7 +11,7 @@ MAINTAINER=	abwang@gmail.com
 COMMENT=	A collection of powerful tools for manipulating EPROM load files
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 1ecac2750648..58aa4cacfbc7 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fuse
 PORTVERSION=	1.0.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION}
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	spectrum.8:${PORTSDIR}/emulators/libspectrum \
 		png15:${PORTSDIR}/graphics/png \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2 glib20 gtk20
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index 48ed2f2bc917..6736fec9665b 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libspectrum
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators devel
 MASTER_SITES=	SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
 
@@ -12,7 +12,7 @@ COMMENT=	Handling of ZX-Spectrum emulator files formats
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 03cb93cecb5a..0f322ffb2f14 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	filezilla
 PORTVERSION=	3.6.0.2
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
 DISTNAME=	FileZilla_${PORTVERSION}_src
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index 72324a07823b..292d51e83d44 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -1,20 +1,15 @@
-# ex:ts=8
-# Ports collection makefile for:	libggz
-# Date created:			Oct 8, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	libggz
 PORTVERSION=	${GGZ_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	The GGZ Gaming Zone - Base Library
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_AUTOTOOLS=	libtool
 USES=	pathfix
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 2ea035322442..7d27d6e718b5 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	telak
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://julien.danjou.info/telak/ \
 		CRITICAL
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 2a00d48ba94d..36ec7b76159d 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bitlbee
 PORTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		${MASTER_SITE_LOCAL}
diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index 1edb1cb468a7..f41f7d433c38 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	inspircd
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	feld@feld.me
diff --git a/irc/irssi-otr/Makefile b/irc/irssi-otr/Makefile
index 54945e4b7dd6..2bd85d4c5658 100644
--- a/irc/irssi-otr/Makefile
+++ b/irc/irssi-otr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	irssi-otr
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	irc
 MASTER_SITES=	ftp://download.tuxfamily.org/${MASTER_SITE_SUBDIR}/
 MASTER_SITE_SUBDIR=	irssiotr
@@ -14,7 +14,7 @@ COMMENT=	A plugin for irssi for Off-the-Record (OTR) messaging
 BUILD_DEPENDS=	${LOCALBASE}/include/irssi/src/common.h:${PORTSDIR}/irc/irssi \
 		${LOCALBASE}/bin/libgcrypt-config:${PORTSDIR}/security/libgcrypt
 LIB_DEPENDS=	otr.4:${PORTSDIR}/security/libotr3 \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
 
 LICENSE=	GPLv2
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 1c42003246bc..0dee0ac8bd01 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	20130301
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/ \
 		${MASTER_SITE_LOCAL}
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index f14cac4b063e..f826f289ca19 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/
 
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index 164b98066e18..03c277946e99 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	jd
-# Date created:     			10 May 2009
-# Whom:             			Takashi Kato <townwear@gmail.com>
-#
+# Created by: Takashi Kato <townwear@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=		jd
 PORTVERSION=		2.8.5
-PORTREVISION=		1
+PORTREVISION=	2
 CATEGORIES=		japanese www
 MASTER_SITES=		SFJP
 MASTER_SITE_SUBDIR=	jd4linux/56721
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 8db58cc0a84f..31856ca9cbe1 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	claws-mail
 PORTVERSION=	3.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
 
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index c583da57183e..a3eed9098c55 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libetpan
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index cfeb94ac39ed..e40d4ec1e767 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wmbiff
 PORTVERSION=	0.4.27
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	mail windowmaker afterstep
 MASTER_SITES=	SF
 
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 76b8b44c1371..539f192821cf 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	mailwatch plugin for xfce4
-# Date created:				23 Januar 2007
-# Whom:					Martin Wilke (miwi@FreeBSD.org)
-#
+# Created by: Martin Wilke (miwi@FreeBSD.org)
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-mailwatch-plugin
 PORTVERSION=	1.1.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	mail xfce
 MASTER_SITES=	http://spuriousinterrupt.org/files/mailwatch/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -17,7 +13,7 @@ MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	A mailwatch plugin for Xfce
 
 LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index 1a9257b4ed04..9804a4591484 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	metalink
 PORTVERSION=	0.3.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	SF/metalinks/Metalink%20commandline/${PORTVERSION}
 PKGNAMESUFFIX?=	-tools
@@ -11,7 +11,7 @@ PKGNAMESUFFIX?=	-tools
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Metalink generation tool
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error \
 		sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
diff --git a/multimedia/libaacs/Makefile b/multimedia/libaacs/Makefile
index 949198cddfef..291498987e75 100644
--- a/multimedia/libaacs/Makefile
+++ b/multimedia/libaacs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libaacs
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
 		http://blu.opsec.eu/
@@ -11,7 +12,7 @@ MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Advanced Access Content System implementation
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error
 
 USE_BZIP2=	yes
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index f7c98bbe0509..1490dff0665e 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.0.6
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/p/-pre/}/ \
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index 4a93d000c6f4..835a3fe898d7 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	climm
 PORTVERSION=	0.7.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.climm.org/source/ \
 		http://http.bg.climm.org/source/
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 446a2143d33d..166d8979fb80 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	jabber
-# Date created:			5 February 2001
-# Whom:				joe
-#
+# Created by: joe
 # $FreeBSD$
-#
 
 PORTNAME=	jabber
 PORTVERSION=	1.6.1.1
-PORTREVISION=	12
+PORTREVISION=	13
 PORTEPOCH=	1
 CATEGORIES=	net-im ipv6
 MASTER_SITES=	http://download.jabberd.org/jabberd14/ \
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 7adaa4574907..48587b940e09 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mcabber
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/ CENKES
 
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--disable-enchant
 
 .if ${PORT_OPTIONS:MOTR}
 LIB_DEPENDS+=	otr.4:${PORTSDIR}/security/libotr3 \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=--enable-otr
 PLIST_SUB+=	OTR=""
 .else
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index f886e712cbc1..b752fa3ff1fa 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	4.10.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index f0d73fdf7d5d..0a52d7a190aa 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 PORTNAME=	collectd
 PORTVERSION=	5.2.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index d2169b06fbc8..e9cc99a13953 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnunet
 DISTVERSION=	0.9.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p ipv6 security
 MASTER_SITES=	GNU
 
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index 23141410a80f..094d149c0b0a 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libktorrent
 DISTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION:C,^1,4,:C,-.*,,}/
 
diff --git a/net-p2p/ncdc/Makefile b/net-p2p/ncdc/Makefile
index 481024bba392..b4404dd7168d 100644
--- a/net-p2p/ncdc/Makefile
+++ b/net-p2p/ncdc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ncdc
 PORTVERSION=	1.16.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF \
 		http://dev.yorhel.nl/download/
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index da3828fcf542..9af38e2caa79 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	retroshare
 PORTVERSION=	0.5.4d
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
diff --git a/net/afpfs-ng/Makefile b/net/afpfs-ng/Makefile
index fffee60ec6d4..c4889d2709cf 100644
--- a/net/afpfs-ng/Makefile
+++ b/net/afpfs-ng/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	afpfs-ng
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
 
diff --git a/net/clamz/Makefile b/net/clamz/Makefile
index 1da9be4826d5..04b45fa569e2 100644
--- a/net/clamz/Makefile
+++ b/net/clamz/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: clamz
-# Date created:		2009-06-08
-# Whom:			Helko Glathe <glathe.helko@googlemail.com>
-#
+# Created by: Helko Glathe <glathe.helko@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	clamz
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	net audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -15,7 +12,7 @@ COMMENT=	Command-line program to download MP3 files from Amazon's music store
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		expat.6:${PORTSDIR}/textproc/expat2 \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/csync2/Makefile b/net/csync2/Makefile
index 2b063ff1d485..e990d2d6191d 100644
--- a/net/csync2/Makefile
+++ b/net/csync2/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	net/csync2
-# Date created:				16 May 2007
-# Whom:					Aaron Dalton <aaron@FreeBSD.org>
-#
+# Created by: Aaron Dalton <aaron@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	csync2
 PORTVERSION=	1.34
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	net
 MASTER_SITES=	http://oss.linbit.com/csync2/ \
 		http://people.freebsd.org/~aaron/distfiles/
@@ -19,7 +15,7 @@ LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync \
 		tasn1.5:${PORTSDIR}/security/libtasn1 \
 		gnutls.26:${PORTSDIR}/security/gnutls \
 		sqlite.2:${PORTSDIR}/databases/sqlite2 \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error
 
 OPTIONS=	CSYNC2_COMPARE "Install csync2-compare script" off
diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index 3cec10fbf2ff..394816281134 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cyphesis
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION}
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
 		wfmath-1.0.1:${PORTSDIR}/math/wfmath \
 		mercator-0.3.3:${PORTSDIR}/devel/mercator \
 		skstream-0.3.7:${PORTSDIR}/net/skstream \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
 		boost_regex:${PORTSDIR}/devel/boost-libs
 
 CONFIGURE_ARGS=	--with-python=${LOCALBASE}
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index efdaed5f42bc..233d17e9d334 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	glib-networking
 PORTVERSION=	2.34.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 2c1da2993ddc..51af77dc388a 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtk-vnc
 PORTVERSION=	0.3.10
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
diff --git a/net/librouteros/Makefile b/net/librouteros/Makefile
index 0f4622810adb..da302f1e27ed 100644
--- a/net/librouteros/Makefile
+++ b/net/librouteros/Makefile
@@ -1,12 +1,9 @@
-# Ports collection Makefile for:	librouteros
-# Date created:				April 6 2012
-# Whom:					Mark Felder <feld@feld.me>
-#
+# Created by: Mark Felder <feld@feld.me>
 # $FreeBSD$
-#
 
 PORTNAME=	librouteros
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://verplant.org/librouteros/files/
 
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index 3b2b46d7191e..862be362374e 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvncserver
 PORTVERSION=	0.9.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net devel
 MASTER_SITES=	SF
 DISTNAME=	LibVNCServer-${PORTVERSION}
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a71dad7f96a9..60acda7f2170 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,12 +1,9 @@
-# Ports collection makefile for:    netatalk
-# Date created:         23 Jul 1997
-# Whom:                 stb
-#
+# Created by: stb
 # $FreeBSD$
-#
 
 PORTNAME=	netatalk
 PORTVERSION=	2.2.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	SF
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 7d19ef4f71a9..25e9a654f2c6 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -1,12 +1,9 @@
-# Ports collection makefile for:    netatalk
-# Date created:         23 Jul 1997
-# Whom:                 stb
-#
+# Created by: stb
 # $FreeBSD$
-#
 
 PORTNAME=	netatalk
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
diff --git a/net/quagga-re/Makefile b/net/quagga-re/Makefile
index d9c3571c557c..4d4e6611efcf 100644
--- a/net/quagga-re/Makefile
+++ b/net/quagga-re/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	quagga
 PORTVERSION=	0.99.17.12
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	quagga-re
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index b7f3e44d5c7e..8e0a29654521 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	grdc
-# Date created:				12 April 2009
-# Whom:					Alexander Logvinov <ports@logvinov.com>
-#
+# Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	remmina
 PORTVERSION=	0.9.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	SF/${PORTNAME}/0.9
 
@@ -52,7 +48,7 @@ CONFIGURE_ARGS+=--disable-ssh
 .endif
 
 .if !defined(WITHOUT_GCRYPT)
-LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 .else
 CONFIGURE_ARGS+=--disable-gcrypt
 .endif
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index b52a5408976d..57e979a8f29d 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_PORTNAME}
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		0
+PORTREVISION?=	1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba/stable samba/rc
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 08e4be327768..1f7036de2ab2 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tigervnc
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	net x11-servers
 MASTER_SITES=	SF:tigervnc
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 0f30345cef5f..29a1f9fe8806 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=	wireshark
 PORTVERSION=	1.8.6
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
 		http://ftp.uni-kl.de/pub/wireshark/src/ \
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index 6250806ef4d6..e5ff63aabafd 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nzbget
 PORTVERSION=	9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 232e340d3f72..855c8f508566 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	cups
 PORTVERSION=	1.5.4
 DISTVERSIONSUFFIX=	-source
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
 PKGNAMESUFFIX=	${CUPS_SUFFIX}${PKGNAMESUFFIX2}
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 150aab194bf5..edb32b60e480 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dirmngr
 PORTVERSION=	1.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	dirmngr
@@ -14,7 +14,7 @@ MAINTAINER=	umq@ueo.co.jp
 COMMENT=	Client for managing and downloading certificate revocation lists
 
 LIB_DEPENDS=	assuan.0:${PORTSDIR}/security/libassuan \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error \
 		ksba.19:${PORTSDIR}/security/libksba \
 		pth:${PORTSDIR}/devel/pth
diff --git a/security/fiked/Makefile b/security/fiked/Makefile
index 238f15dc6912..ed18890d8d5e 100644
--- a/security/fiked/Makefile
+++ b/security/fiked/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	fiked
 PORTVERSION=	0.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://mirror.roe.ch/dist/fiked/
 
diff --git a/security/gnomint/Makefile b/security/gnomint/Makefile
index d779a9528118..eef38858be4b 100644
--- a/security/gnomint/Makefile
+++ b/security/gnomint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnomint
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF
 
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index b156fdc713b1..cabb7fd64ae5 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	2.0.19
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index f69f14d9e809..941283a69581 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gsasl
 PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -12,7 +12,7 @@ MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU SASL Library
 
 LIB_DEPENDS=	idn.17:${PORTSDIR}/dns/libidn \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
 		gnutls.26:${PORTSDIR}/security/gnutls \
 		ntlm.0:${PORTSDIR}/security/libntlm
 
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index b591f55ffc59..99cb610e7175 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgnome-keyring
 PORTVERSION=	2.32.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 
@@ -11,7 +11,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Program that keeps passwords and other secrets
 
 LIB_DEPENDS=    tasn1.5:${PORTSDIR}/security/libtasn1 \
-                gcrypt.18:${PORTSDIR}/security/libgcrypt
+                gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix ltverhack intlhack gconf2
diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index a47b295d0135..c88cffd239ea 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	libotr
 PORTVERSION=	4.0.0
 # Please do not bump PORTREVISION for this port unless you have
 # confirmed via testing that it is necessary
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net-im net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
diff --git a/security/libotr3/Makefile b/security/libotr3/Makefile
index 990ee9d40079..e89004e54a64 100644
--- a/security/libotr3/Makefile
+++ b/security/libotr3/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	libotr
 PORTVERSION=	3.2.1
 # Please do not bump PORTREVISION for this port unless you have
 # confirmed via testing that it is necessary
+PORTREVISION=	1
 CATEGORIES=	security net-im net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index f234b0d96d0e..24c58503f172 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libprelude
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	https://www.prelude-ids.org/attachments/download/241/
 
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index a8437fef1cc9..b92f91e702e8 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libpreludedb
 PORTVERSION=	1.0.1p1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	https://www.prelude-ids.org/attachments/download/287/
 
diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index f71e874966c4..190b8c33de83 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libssh
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.libssh.org/files/0.5/ \
 		LOCAL/avl
@@ -29,7 +30,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 CMAKE_ARGS+=	-DWITH_GCRYPT:BOOL=ON
 .else
 USE_OPENSSL=	yes
diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index 017ea62835b2..a92ccebd9696 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libssh2
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.libssh2.org/download/ \
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index ba9b854d8b68..01f0151e2956 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	opencdk
-# Date created:		15 Jan 2003
-# Whom:			Sergei Kolobov <sergei@kolobov.com>
-#
+# Created by: Sergei Kolobov <sergei@kolobov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	opencdk
 PORTVERSION=	0.6.6
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/gnutls/releases/opencdk/
@@ -16,7 +12,7 @@ MASTER_SITE_SUBDIR=	alpha/gnutls/opencdk
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Open Crypto Development Kit
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile
index c3a40c9a67e9..9f26940afce5 100644
--- a/security/openvas-libnasl/Makefile
+++ b/security/openvas-libnasl/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	openvas-libnasl
 PORTVERSION=	2.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/561/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NASL libraries for OpenVAS
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		gnutls.26:${PORTSDIR}/security/gnutls \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error \
 		gpgme.19:${PORTSDIR}/security/gpgme \
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index 355caa9d4ffc..28e43c692e5e 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openvas-libraries
 PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/600/
 
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libraries for OpenVAS
 
 LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/security/openvpn-auth-radius/Makefile b/security/openvpn-auth-radius/Makefile
index 69828d1e0a10..0d773a270aec 100644
--- a/security/openvpn-auth-radius/Makefile
+++ b/security/openvpn-auth-radius/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	security/openvpn-auth-radius
-# Date created:		2011-03-04
-# Whom:			Mikhail T. <m.tsatsenko@gmail.com>
-#
+# Created by: Mikhail T. <m.tsatsenko@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	openvpn-auth-radius
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.nongnu.org/radiusplugin/ \
 		http://svn-cache.ipcopaddons.org/
@@ -16,7 +13,7 @@ MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	RADIUS authentication plugin for OpenVPN
 
 RUN_DEPENDS=	openvpn:${PORTSDIR}/security/openvpn
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 LICENSE=	GPLv2
 
diff --git a/security/p5-Crypt-GCrypt/Makefile b/security/p5-Crypt-GCrypt/Makefile
index 1518a3f1493e..04c250775d2a 100644
--- a/security/p5-Crypt-GCrypt/Makefile
+++ b/security/p5-Crypt-GCrypt/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	p5-Crypt-GCrypt
-# Date created:		2006-09-28
-# Whom:			TAKAHASHI Kaoru <kaoru@kaisei.org>
-#
+# Created by: TAKAHASHI Kaoru <kaoru@kaisei.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Crypt-GCrypt
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,7 +14,7 @@ COMMENT=	Perl interface to the GNU Cryptographic library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS+=	GCRYPTLIBPATH=${LOCALBASE}/lib \
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 85197850f510..d4fcec303613 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	otr
 PORTVERSION=	4.0.0
 # Please do not bump PORTREVISION for this port unless you have
 # confirmed via testing that it is necessary
+PORTREVISION=	1
 CATEGORIES=	security net-im net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 PKGNAMEPREFIX=	pidgin-
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index dc43dc04f088..bc4880f9a9bb 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinentry
 PORTVERSION=	0.8.1
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	pinentry
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	pinentry
 MAINTAINER=	makc@FreeBSD.org
 COMMENT?=	Collection of simple PIN or passphrase entry dialogs
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		ksba.19:${PORTSDIR}/security/libksba
 
 CONFLICTS_INSTALL?=	pinentry-[a-z]*-[0.9]*
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 5e3bbe6b9cf8..e0b9108f6e27 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	prelude-lml
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	https://www.prelude-ids.org/attachments/download/242/
 
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index b459a071e4eb..8c8d3a377779 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	prelude-manager
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	https://www.prelude-ids.org/attachments/download/243/
 
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index b5ff52f92faf..9f50b7134739 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	seahorse-plugins
 PORTVERSION=	2.30.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index c14661aa6d5a..907b938c9cca 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	seahorse
 PORTVERSION=	2.32.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/seccure/Makefile b/security/seccure/Makefile
index ff61e995752c..e45090c452c8 100644
--- a/security/seccure/Makefile
+++ b/security/seccure/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: seccure
-# Date created:        30 August 2007
-# Whom:                Lukasz Komsta
-#
+# Created by: Lukasz Komsta
 # $FreeBSD$
-#
 
 PORTNAME=	seccure
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://point-at-infinity.org/seccure/ \
 		${MASTER_SITE_NETBSD}
@@ -15,7 +11,7 @@ MASTER_SITES=	http://point-at-infinity.org/seccure/ \
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Elliptic Curve Crypto Utility for Reliable Encryption
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 MAN1=		seccure.1
 
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 57eb9895d4b3..2ad322746ba4 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	shishi
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNU
 
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index dc7b58d07d6b..aa6ce68350c9 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vpnc
 PORTVERSION=	0.5.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
 		CRITICAL
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 RUN_DEPENDS=	vpnc-script:${PORTSDIR}/sysutils/vpnc-scripts
 
 USE_GMAKE=	yes
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 8471c2c2a0fb..f04faeac9543 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	freeipmi
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU/${PORTNAME}/ \
 		http://ftp.gluster.com/pub/${PORTNAME}/${PORTVERSION}/
diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile
index 6731d95bc0d9..58f531da09a7 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/sysutils/fusefs-cryptofs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cryptofs
 PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://reboot78.re.funpic.de/cryptofs/
 PKGNAMEPREFIX=	fusefs-
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A encrypted filesystem for FUSE
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		glib-2.0:${PORTSDIR}/devel/glib20
 
 USE_BZIP2=	yes
diff --git a/sysutils/rsyslog5-gnutls/Makefile b/sysutils/rsyslog5-gnutls/Makefile
index b33f58dc60de..3d8cfa70b96f 100644
--- a/sysutils/rsyslog5-gnutls/Makefile
+++ b/sysutils/rsyslog5-gnutls/Makefile
@@ -1,18 +1,14 @@
-#New ports collection makefile for: rsyslog4-gnutls
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	GNUTLS module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 CONFIGURE_ARGS+=--enable-gnutls
 
diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile
index 92e98189c8cb..7c632be3c5ed 100644
--- a/sysutils/rsyslog6-devel-gnutls/Makefile
+++ b/sysutils/rsyslog6-devel-gnutls/Makefile
@@ -1,14 +1,14 @@
 # Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	GNUTLS module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USES=		pkgconfig
 
diff --git a/sysutils/rsyslog6-gnutls/Makefile b/sysutils/rsyslog6-gnutls/Makefile
index 57657e524a5c..151b804d6bee 100644
--- a/sysutils/rsyslog6-gnutls/Makefile
+++ b/sysutils/rsyslog6-gnutls/Makefile
@@ -1,14 +1,14 @@
 # Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	GNUTLS module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USES=		pkgconfig
 
diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index bff8566994ca..0bd6a39195a1 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rsyslog
 PORTVERSION=	7.2.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
@@ -42,7 +42,7 @@ PLIST_FILES+=	lib/rsyslog/omlibdbi.la \
 
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt
 USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-gnutls
 PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.la \
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 720f5b0f2385..f6ad13a22173 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxslt
 PORTVERSION=	1.1.28
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://gd.tuwien.ac.at/pub/libxml/ \
 		ftp://xmlsoft.org/libxml2/
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index fe55a5a596e8..34ffc3ce5e30 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	chromium
 DISTVERSIONPREFIX=	courgette-redacted-
 DISTVERSION=	25.0.1364.172
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.goodking.org/downloads/ \
 		ftp://rene-ladan.nl/pub/distfiles/ \
diff --git a/www/libmicrohttpd/Makefile b/www/libmicrohttpd/Makefile
index 26a43e7bb6b1..811e9abd5615 100644
--- a/www/libmicrohttpd/Makefile
+++ b/www/libmicrohttpd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmicrohttpd
 PORTVERSION=	0.9.26
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}