10 files changed, 19 insertions, 10 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index f1994f4cf191..624e35ea2e3f 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -54,7 +54,7 @@ USE_GETTEXT=	yes
 .endif
 USE_XORG=	x11 sm
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls-openssl.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls-openssl.27:${PORTSDIR}/security/gnutls
 MAKE_ENV+=	GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \
 		without-ssl=1
 .elif defined(WITH_OPENSSL)
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index e69aafcb1569..1b9df81cc980 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	heartbeat
 PORTVERSION=	2.1.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	sysutils
 #MASTER_SITES=	http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/sysutils/rsyslog3/Makefile b/sysutils/rsyslog3/Makefile
index 20f19bfa298d..2f0337f51eba 100644
--- a/sysutils/rsyslog3/Makefile
+++ b/sysutils/rsyslog3/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	rsyslog
 
 COMMENT=	Enhanced syslog daemon
 
-LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls
 
 USE_RC_SUBR=	${PORTNAME}d
 SUB_FILES=	pkg-message
diff --git a/sysutils/rsyslog3/bsd.rsyslog.mk b/sysutils/rsyslog3/bsd.rsyslog.mk
index 5c90bb8af869..956180070e9d 100644
--- a/sysutils/rsyslog3/bsd.rsyslog.mk
+++ b/sysutils/rsyslog3/bsd.rsyslog.mk
@@ -1,5 +1,6 @@
 PORTNAME?=	rsyslog
 PORTVERSION?=	3.22.3
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 MASTER_SITES?=	http://www.rsyslog.com/files/download/rsyslog/
 MAINTAINER?=	pgollucci@FreeBSD.org
diff --git a/sysutils/rsyslog4-devel-gnutls/Makefile b/sysutils/rsyslog4-devel-gnutls/Makefile
index 544485c35550..847ccc5baed5 100644
--- a/sysutils/rsyslog4-devel-gnutls/Makefile
+++ b/sysutils/rsyslog4-devel-gnutls/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	2
+
 COMMENT=	GNUTLS module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog4-devel
 
 MNAME=	gnutls
-LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
 
 CONFIGURE_ARGS+=--enable-gnutls
 
diff --git a/sysutils/rsyslog4-gnutls/Makefile b/sysutils/rsyslog4-gnutls/Makefile
index 19e27861a99f..a476739b414a 100644
--- a/sysutils/rsyslog4-gnutls/Makefile
+++ b/sysutils/rsyslog4-gnutls/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	2
+
 COMMENT=	GNUTLS module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog4
 
 MNAME=	gnutls
-LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
 
 CONFIGURE_ARGS+=--enable-gnutls
 
diff --git a/sysutils/rsyslog4/Makefile b/sysutils/rsyslog4/Makefile
index 1bcfab6111fd..a284e3e71009 100644
--- a/sysutils/rsyslog4/Makefile
+++ b/sysutils/rsyslog4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rsyslog
 PORTVERSION=	4.6.5
-PORTREVISION=	1
+PORTREVISION?=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 .ifdef MNAME
diff --git a/sysutils/rsyslog5-gnutls/Makefile b/sysutils/rsyslog5-gnutls/Makefile
index 80c35be7d839..e14f887553cb 100644
--- a/sysutils/rsyslog5-gnutls/Makefile
+++ b/sysutils/rsyslog5-gnutls/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
+
 COMMENT=	GNUTLS module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gnutls
-LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
 
 CONFIGURE_ARGS+=--enable-gnutls
 
diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile
index d7e37481e09a..de20e9d4f890 100644
--- a/sysutils/rsyslog6-devel-gnutls/Makefile
+++ b/sysutils/rsyslog6-devel-gnutls/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	2
+
 COMMENT=	GNUTLS module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	gnutls
-LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
 
 CONFIGURE_ARGS+=--enable-gnutls
 
diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile
index a9d57f71b6dd..20b80bf3c14b 100644
--- a/sysutils/rsyslog6-devel/Makefile
+++ b/sysutils/rsyslog6-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rsyslog
 PORTVERSION=	6.1.1
-PORTREVISION=	1
+PORTREVISION?=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 .ifdef MNAME