- Update to 5.3.3

- Connect to build

PR:		139382
Submitted by:	Cristiano Rolim Pereira <cristianorolim@hotmail.com> (maintainer)

57 files changed, 175 insertions, 98 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 00e0c2916ec4..de2cbafb8732 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -686,6 +686,15 @@
     SUBDIR += rsyslog4-relp
     SUBDIR += rsyslog4-rfc3195
     SUBDIR += rsyslog4-snmp
+    SUBDIR += rsyslog5
+    SUBDIR += rsyslog5-dbi
+    SUBDIR += rsyslog5-gnutls
+    SUBDIR += rsyslog5-gssapi
+    SUBDIR += rsyslog5-mysql
+    SUBDIR += rsyslog5-pgsql
+    SUBDIR += rsyslog5-relp
+    SUBDIR += rsyslog5-rfc3195
+    SUBDIR += rsyslog5-snmp
     SUBDIR += rtty
     SUBDIR += ruby-log4r
     SUBDIR += ruby-quota
diff --git a/sysutils/rsyslog5-dbi/Makefile b/sysutils/rsyslog5-dbi/Makefile
index d2df260c5123..7105b210b8a3 100644
--- a/sysutils/rsyslog5-dbi/Makefile
+++ b/sysutils/rsyslog5-dbi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 COMMENT=	LibDBI output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	libdbi
 LIB_DEPENDS=	dbi.0:${PORTSDIR}/databases/libdbi
diff --git a/sysutils/rsyslog5-devel-dbi/Makefile b/sysutils/rsyslog5-devel-dbi/Makefile
index d2df260c5123..7105b210b8a3 100644
--- a/sysutils/rsyslog5-devel-dbi/Makefile
+++ b/sysutils/rsyslog5-devel-dbi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 COMMENT=	LibDBI output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	libdbi
 LIB_DEPENDS=	dbi.0:${PORTSDIR}/databases/libdbi
diff --git a/sysutils/rsyslog5-devel-gnutls/Makefile b/sysutils/rsyslog5-devel-gnutls/Makefile
index 19e27861a99f..80c35be7d839 100644
--- a/sysutils/rsyslog5-devel-gnutls/Makefile
+++ b/sysutils/rsyslog5-devel-gnutls/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GNUTLS module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
diff --git a/sysutils/rsyslog5-devel-gssapi/Makefile b/sysutils/rsyslog5-devel-gssapi/Makefile
index e7a883f4f57b..2e90c606d787 100644
--- a/sysutils/rsyslog5-devel-gssapi/Makefile
+++ b/sysutils/rsyslog5-devel-gssapi/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GSS API input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gssapi
 
diff --git a/sysutils/rsyslog5-devel-mysql/Makefile b/sysutils/rsyslog5-devel-mysql/Makefile
index 586d3222ff25..b40cac1b4073 100644
--- a/sysutils/rsyslog5-devel-mysql/Makefile
+++ b/sysutils/rsyslog5-devel-mysql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	MySQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	mysql
 USE_MYSQL=	yes
diff --git a/sysutils/rsyslog5-devel-pgsql/Makefile b/sysutils/rsyslog5-devel-pgsql/Makefile
index 9ffdb409c8b3..1d867ee4c3b7 100644
--- a/sysutils/rsyslog5-devel-pgsql/Makefile
+++ b/sysutils/rsyslog5-devel-pgsql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	PostgreSQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	pgsql
 USE_PGSQL=	yes
diff --git a/sysutils/rsyslog5-devel-relp/Makefile b/sysutils/rsyslog5-devel-relp/Makefile
index 695f551c2557..097271146148 100644
--- a/sysutils/rsyslog5-devel-relp/Makefile
+++ b/sysutils/rsyslog5-devel-relp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RELP input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	relp
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog5-devel-rfc3195/Makefile b/sysutils/rsyslog5-devel-rfc3195/Makefile
index 46259283ac8a..bff68245ad1c 100644
--- a/sysutils/rsyslog5-devel-rfc3195/Makefile
+++ b/sysutils/rsyslog5-devel-rfc3195/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RFC3195 input support for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	rfc3195
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog5-devel-snmp/Makefile b/sysutils/rsyslog5-devel-snmp/Makefile
index be7c95329280..715d869c1c7f 100644
--- a/sysutils/rsyslog5-devel-snmp/Makefile
+++ b/sysutils/rsyslog5-devel-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	SNMP trap sender for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	snmp
 LIB_DEPENDS=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/sysutils/rsyslog5-devel/Makefile b/sysutils/rsyslog5-devel/Makefile
index 60de6eb6317a..8a06d2daf7d7 100644
--- a/sysutils/rsyslog5-devel/Makefile
+++ b/sysutils/rsyslog5-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	4.4.2
+PORTVERSION=	5.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
@@ -14,15 +14,15 @@ PKGNAMESUFFIX?=	-${MNAME}
 .endif
 
 MAINTAINER=	cristianorolim@hotmail.com
-COMMENT=	Syslogd supporting SQL, TCP and TLS
+COMMENT?=	Syslogd supporting SQL, TCP and TLS
 
 .ifdef MNAME
-RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog4
+RUN_DEPENDS=	rsyslog>=5:${PORTSDIR}/sysutils/rsyslog5
 
 PLIST=		${.CURDIR}/pkg-plist
 .endif
 
-CONFLICTS=	rsyslog-[!4].[0-9]*
+CONFLICTS=	rsyslog-[2-4].[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
@@ -75,8 +75,12 @@ IGNORE=	with gssapi module is only supported on FreeBSD 7.x or later
 
 CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
 
-DESCR?=		${.CURDIR}/../rsyslog4/pkg-descr
-MD5_FILE?=	${.CURDIR}/../rsyslog4/distinfo
+DESCR?=		${.CURDIR}/../rsyslog5/pkg-descr
+MD5_FILE?=	${.CURDIR}/../rsyslog5/distinfo
+.endif
+
+.if ${OSVERSION} < 700000
+USE_GCC=	4.2+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/rsyslog5-devel/distinfo b/sysutils/rsyslog5-devel/distinfo
index 87fbddea533b..58f721fa6c6a 100644
--- a/sysutils/rsyslog5-devel/distinfo
+++ b/sysutils/rsyslog5-devel/distinfo
@@ -1,3 +1,4 @@
-MD5 (rsyslog-4.4.2.tar.gz) = a8ada67b6cd5c00fbeb3a4b687b17359
-SHA256 (rsyslog-4.4.2.tar.gz) = 726b0894f29081c9ea9f2c0c9d86e77a8128b203b4d356c87180fa45a2d28942
-SIZE (rsyslog-4.4.2.tar.gz) = 1999058
+MD5 (rsyslog-5.3.3.tar.gz) = 837e50ff8d162e1a00ba0fd16b7f0d8d
+SHA256 (rsyslog-5.3.3.tar.gz) = 
+6cf261ce1ea2972d369e845374bfa4984eaab1d918375d4f2e301e18461a992b
+SIZE (rsyslog-5.3.3.tar.gz) = 2059714
diff --git a/sysutils/rsyslog5-devel/files/pkg-message.in b/sysutils/rsyslog5-devel/files/pkg-message.in
index 0366b0deaa24..fd027fff9592 100644
--- a/sysutils/rsyslog5-devel/files/pkg-message.in
+++ b/sysutils/rsyslog5-devel/files/pkg-message.in
@@ -5,7 +5,7 @@ add the following lines to rc.conf(5):
  rsyslogd_enable="YES"
 To avoid warnings about rsyslogd running in compatibility mode, add
 this:
- rsyslogd_flags="-c4"
+ rsyslogd_flags="-c3"
 It's recommended to copy syslog.conf(5) to
 %%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
 this:
diff --git a/sysutils/rsyslog5-devel/files/rsyslogd.in b/sysutils/rsyslog5-devel/files/rsyslogd.in
index e46263e40fc7..b7bd8d020e1b 100644
--- a/sysutils/rsyslog5-devel/files/rsyslogd.in
+++ b/sysutils/rsyslog5-devel/files/rsyslogd.in
@@ -1,8 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog5-devel/files/Attic/rsyslogd.in,v 1.1 2009-01-27 19:40:41 pgollucci Exp $
+# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog5-devel/files/Attic/rsyslogd.in,v 1.2 2009-12-18 20:44:28 miwi Exp $
 #
 
+
 # PROVIDE: rsyslogd
 # REQUIRE: mountcritremote cleanvar newsyslog ldconfig
 # BEFORE:  SERVERS
diff --git a/sysutils/rsyslog5-devel/pkg-descr b/sysutils/rsyslog5-devel/pkg-descr
index b3c35a7c60fc..018f816b2c97 100644
--- a/sysutils/rsyslog5-devel/pkg-descr
+++ b/sysutils/rsyslog5-devel/pkg-descr
@@ -1,16 +1,21 @@
 Rsyslog is an enhanced multi-threaded syslogd with a focus on security and
 reliability.
 
-Among others, it offers support for on-demand disk buffering, reliable syslog
-over TCP, SSL, TLS and RELP, writing to databases (MySQL, PostgreSQL, Oracle,
-and many more), email alerting, fully configurable output formats (including
+Among others, it offers support for on-demand disk buffering, reliable 
+syslog
+over TCP, SSL, TLS and RELP, writing to databases (MySQL, PostgreSQL, 
+Oracle,
+and many more), email alerting, fully configurable output formats 
+(including
 high-precision timestamps),the ability to filter on any part of the syslog
 message, on-the-wire message compression, and the ability to convert text
 files to syslog.
 
-It is a drop-in replacement for stock syslogd and able to work with the same
+It is a drop-in replacement for stock syslogd and able to work with the 
+same
 configuration file syntax. Its advanced features make it suitable for
-enterprise-class, encryption protected syslog relay chains while at the same
+enterprise-class, encryption protected syslog relay chains while at the 
+same
 time being very easy to setup for the novice user.
 
 WWW: http://www.rsyslog.com/
diff --git a/sysutils/rsyslog5-devel/pkg-plist b/sysutils/rsyslog5-devel/pkg-plist
index cbaa54f3efe9..aa18a7d1f2cf 100644
--- a/sysutils/rsyslog5-devel/pkg-plist
+++ b/sysutils/rsyslog5-devel/pkg-plist
@@ -26,6 +26,8 @@ lib/rsyslog/lmtcpclt.la
 lib/rsyslog/lmtcpclt.so
 lib/rsyslog/lmtcpsrv.la
 lib/rsyslog/lmtcpsrv.so
+lib/rsyslog/lmzlibw.la
+lib/rsyslog/lmzlibw.so
 lib/rsyslog/ommail.la
 lib/rsyslog/ommail.so
 lib/rsyslog/omtesting.la
@@ -55,9 +57,9 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.html
 %%PORTDOCS%%%%DOCSDIR%%/licensing.html
 %%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html
-%%PORTDOCS%%%%DOCSDIR%%/man_rsyslogd.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/multi_ruleset.html
 %%PORTDOCS%%%%DOCSDIR%%/netstream.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_gtls.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_ptcp.html
@@ -67,6 +69,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/omoracle.html
 %%PORTDOCS%%%%DOCSDIR%%/omrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/omsnmp.html
+%%PORTDOCS%%%%DOCSDIR%%/omstdout.html
+%%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html
 %%PORTDOCS%%%%DOCSDIR%%/professional_support.html
 %%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
 %%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic.jpg
@@ -139,6 +143,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html
 %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html
 %%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v5compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/version_naming.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/sysutils/rsyslog5-gnutls/Makefile b/sysutils/rsyslog5-gnutls/Makefile
index 19e27861a99f..80c35be7d839 100644
--- a/sysutils/rsyslog5-gnutls/Makefile
+++ b/sysutils/rsyslog5-gnutls/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GNUTLS module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
diff --git a/sysutils/rsyslog5-gssapi/Makefile b/sysutils/rsyslog5-gssapi/Makefile
index e7a883f4f57b..2e90c606d787 100644
--- a/sysutils/rsyslog5-gssapi/Makefile
+++ b/sysutils/rsyslog5-gssapi/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GSS API input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gssapi
 
diff --git a/sysutils/rsyslog5-mysql/Makefile b/sysutils/rsyslog5-mysql/Makefile
index 586d3222ff25..b40cac1b4073 100644
--- a/sysutils/rsyslog5-mysql/Makefile
+++ b/sysutils/rsyslog5-mysql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	MySQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	mysql
 USE_MYSQL=	yes
diff --git a/sysutils/rsyslog5-pgsql/Makefile b/sysutils/rsyslog5-pgsql/Makefile
index 9ffdb409c8b3..1d867ee4c3b7 100644
--- a/sysutils/rsyslog5-pgsql/Makefile
+++ b/sysutils/rsyslog5-pgsql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	PostgreSQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	pgsql
 USE_PGSQL=	yes
diff --git a/sysutils/rsyslog5-relp/Makefile b/sysutils/rsyslog5-relp/Makefile
index 695f551c2557..097271146148 100644
--- a/sysutils/rsyslog5-relp/Makefile
+++ b/sysutils/rsyslog5-relp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RELP input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	relp
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog5-rfc3195/Makefile b/sysutils/rsyslog5-rfc3195/Makefile
index 46259283ac8a..bff68245ad1c 100644
--- a/sysutils/rsyslog5-rfc3195/Makefile
+++ b/sysutils/rsyslog5-rfc3195/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RFC3195 input support for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	rfc3195
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog5-snmp/Makefile b/sysutils/rsyslog5-snmp/Makefile
index be7c95329280..715d869c1c7f 100644
--- a/sysutils/rsyslog5-snmp/Makefile
+++ b/sysutils/rsyslog5-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	SNMP trap sender for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	snmp
 LIB_DEPENDS=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/sysutils/rsyslog5/Makefile b/sysutils/rsyslog5/Makefile
index 60de6eb6317a..8a06d2daf7d7 100644
--- a/sysutils/rsyslog5/Makefile
+++ b/sysutils/rsyslog5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	4.4.2
+PORTVERSION=	5.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
@@ -14,15 +14,15 @@ PKGNAMESUFFIX?=	-${MNAME}
 .endif
 
 MAINTAINER=	cristianorolim@hotmail.com
-COMMENT=	Syslogd supporting SQL, TCP and TLS
+COMMENT?=	Syslogd supporting SQL, TCP and TLS
 
 .ifdef MNAME
-RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog4
+RUN_DEPENDS=	rsyslog>=5:${PORTSDIR}/sysutils/rsyslog5
 
 PLIST=		${.CURDIR}/pkg-plist
 .endif
 
-CONFLICTS=	rsyslog-[!4].[0-9]*
+CONFLICTS=	rsyslog-[2-4].[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
@@ -75,8 +75,12 @@ IGNORE=	with gssapi module is only supported on FreeBSD 7.x or later
 
 CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
 
-DESCR?=		${.CURDIR}/../rsyslog4/pkg-descr
-MD5_FILE?=	${.CURDIR}/../rsyslog4/distinfo
+DESCR?=		${.CURDIR}/../rsyslog5/pkg-descr
+MD5_FILE?=	${.CURDIR}/../rsyslog5/distinfo
+.endif
+
+.if ${OSVERSION} < 700000
+USE_GCC=	4.2+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/rsyslog5/distinfo b/sysutils/rsyslog5/distinfo
index 87fbddea533b..58f721fa6c6a 100644
--- a/sysutils/rsyslog5/distinfo
+++ b/sysutils/rsyslog5/distinfo
@@ -1,3 +1,4 @@
-MD5 (rsyslog-4.4.2.tar.gz) = a8ada67b6cd5c00fbeb3a4b687b17359
-SHA256 (rsyslog-4.4.2.tar.gz) = 726b0894f29081c9ea9f2c0c9d86e77a8128b203b4d356c87180fa45a2d28942
-SIZE (rsyslog-4.4.2.tar.gz) = 1999058
+MD5 (rsyslog-5.3.3.tar.gz) = 837e50ff8d162e1a00ba0fd16b7f0d8d
+SHA256 (rsyslog-5.3.3.tar.gz) = 
+6cf261ce1ea2972d369e845374bfa4984eaab1d918375d4f2e301e18461a992b
+SIZE (rsyslog-5.3.3.tar.gz) = 2059714
diff --git a/sysutils/rsyslog5/files/pkg-message.in b/sysutils/rsyslog5/files/pkg-message.in
index 0366b0deaa24..fd027fff9592 100644
--- a/sysutils/rsyslog5/files/pkg-message.in
+++ b/sysutils/rsyslog5/files/pkg-message.in
@@ -5,7 +5,7 @@ add the following lines to rc.conf(5):
  rsyslogd_enable="YES"
 To avoid warnings about rsyslogd running in compatibility mode, add
 this:
- rsyslogd_flags="-c4"
+ rsyslogd_flags="-c3"
 It's recommended to copy syslog.conf(5) to
 %%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
 this:
diff --git a/sysutils/rsyslog5/files/rsyslogd.in b/sysutils/rsyslog5/files/rsyslogd.in
index c4997460783e..7604f8b8cce0 100644
--- a/sysutils/rsyslog5/files/rsyslogd.in
+++ b/sysutils/rsyslog5/files/rsyslogd.in
@@ -3,6 +3,7 @@
 # $FreeBSD$
 #
 
+
 # PROVIDE: rsyslogd
 # REQUIRE: mountcritremote cleanvar newsyslog ldconfig
 # BEFORE:  SERVERS
diff --git a/sysutils/rsyslog5/pkg-descr b/sysutils/rsyslog5/pkg-descr
index b3c35a7c60fc..018f816b2c97 100644
--- a/sysutils/rsyslog5/pkg-descr
+++ b/sysutils/rsyslog5/pkg-descr
@@ -1,16 +1,21 @@
 Rsyslog is an enhanced multi-threaded syslogd with a focus on security and
 reliability.
 
-Among others, it offers support for on-demand disk buffering, reliable syslog
-over TCP, SSL, TLS and RELP, writing to databases (MySQL, PostgreSQL, Oracle,
-and many more), email alerting, fully configurable output formats (including
+Among others, it offers support for on-demand disk buffering, reliable 
+syslog
+over TCP, SSL, TLS and RELP, writing to databases (MySQL, PostgreSQL, 
+Oracle,
+and many more), email alerting, fully configurable output formats 
+(including
 high-precision timestamps),the ability to filter on any part of the syslog
 message, on-the-wire message compression, and the ability to convert text
 files to syslog.
 
-It is a drop-in replacement for stock syslogd and able to work with the same
+It is a drop-in replacement for stock syslogd and able to work with the 
+same
 configuration file syntax. Its advanced features make it suitable for
-enterprise-class, encryption protected syslog relay chains while at the same
+enterprise-class, encryption protected syslog relay chains while at the 
+same
 time being very easy to setup for the novice user.
 
 WWW: http://www.rsyslog.com/
diff --git a/sysutils/rsyslog5/pkg-plist b/sysutils/rsyslog5/pkg-plist
index cbaa54f3efe9..aa18a7d1f2cf 100644
--- a/sysutils/rsyslog5/pkg-plist
+++ b/sysutils/rsyslog5/pkg-plist
@@ -26,6 +26,8 @@ lib/rsyslog/lmtcpclt.la
 lib/rsyslog/lmtcpclt.so
 lib/rsyslog/lmtcpsrv.la
 lib/rsyslog/lmtcpsrv.so
+lib/rsyslog/lmzlibw.la
+lib/rsyslog/lmzlibw.so
 lib/rsyslog/ommail.la
 lib/rsyslog/ommail.so
 lib/rsyslog/omtesting.la
@@ -55,9 +57,9 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.html
 %%PORTDOCS%%%%DOCSDIR%%/licensing.html
 %%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html
-%%PORTDOCS%%%%DOCSDIR%%/man_rsyslogd.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/multi_ruleset.html
 %%PORTDOCS%%%%DOCSDIR%%/netstream.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_gtls.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_ptcp.html
@@ -67,6 +69,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/omoracle.html
 %%PORTDOCS%%%%DOCSDIR%%/omrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/omsnmp.html
+%%PORTDOCS%%%%DOCSDIR%%/omstdout.html
+%%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html
 %%PORTDOCS%%%%DOCSDIR%%/professional_support.html
 %%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
 %%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic.jpg
@@ -139,6 +143,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html
 %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html
 %%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v5compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/version_naming.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/sysutils/rsyslog55-dbi/Makefile b/sysutils/rsyslog55-dbi/Makefile
index d2df260c5123..7105b210b8a3 100644
--- a/sysutils/rsyslog55-dbi/Makefile
+++ b/sysutils/rsyslog55-dbi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 COMMENT=	LibDBI output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	libdbi
 LIB_DEPENDS=	dbi.0:${PORTSDIR}/databases/libdbi
diff --git a/sysutils/rsyslog55-gnutls/Makefile b/sysutils/rsyslog55-gnutls/Makefile
index 19e27861a99f..80c35be7d839 100644
--- a/sysutils/rsyslog55-gnutls/Makefile
+++ b/sysutils/rsyslog55-gnutls/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GNUTLS module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
diff --git a/sysutils/rsyslog55-gssapi/Makefile b/sysutils/rsyslog55-gssapi/Makefile
index e7a883f4f57b..2e90c606d787 100644
--- a/sysutils/rsyslog55-gssapi/Makefile
+++ b/sysutils/rsyslog55-gssapi/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GSS API input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gssapi
 
diff --git a/sysutils/rsyslog55-mysql/Makefile b/sysutils/rsyslog55-mysql/Makefile
index 586d3222ff25..b40cac1b4073 100644
--- a/sysutils/rsyslog55-mysql/Makefile
+++ b/sysutils/rsyslog55-mysql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	MySQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	mysql
 USE_MYSQL=	yes
diff --git a/sysutils/rsyslog55-pgsql/Makefile b/sysutils/rsyslog55-pgsql/Makefile
index 9ffdb409c8b3..1d867ee4c3b7 100644
--- a/sysutils/rsyslog55-pgsql/Makefile
+++ b/sysutils/rsyslog55-pgsql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	PostgreSQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	pgsql
 USE_PGSQL=	yes
diff --git a/sysutils/rsyslog55-relp/Makefile b/sysutils/rsyslog55-relp/Makefile
index 695f551c2557..097271146148 100644
--- a/sysutils/rsyslog55-relp/Makefile
+++ b/sysutils/rsyslog55-relp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RELP input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	relp
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog55-rfc3195/Makefile b/sysutils/rsyslog55-rfc3195/Makefile
index 46259283ac8a..bff68245ad1c 100644
--- a/sysutils/rsyslog55-rfc3195/Makefile
+++ b/sysutils/rsyslog55-rfc3195/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RFC3195 input support for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	rfc3195
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog55-snmp/Makefile b/sysutils/rsyslog55-snmp/Makefile
index be7c95329280..715d869c1c7f 100644
--- a/sysutils/rsyslog55-snmp/Makefile
+++ b/sysutils/rsyslog55-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	SNMP trap sender for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	snmp
 LIB_DEPENDS=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/sysutils/rsyslog55/Makefile b/sysutils/rsyslog55/Makefile
index 60de6eb6317a..8a06d2daf7d7 100644
--- a/sysutils/rsyslog55/Makefile
+++ b/sysutils/rsyslog55/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	4.4.2
+PORTVERSION=	5.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
@@ -14,15 +14,15 @@ PKGNAMESUFFIX?=	-${MNAME}
 .endif
 
 MAINTAINER=	cristianorolim@hotmail.com
-COMMENT=	Syslogd supporting SQL, TCP and TLS
+COMMENT?=	Syslogd supporting SQL, TCP and TLS
 
 .ifdef MNAME
-RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog4
+RUN_DEPENDS=	rsyslog>=5:${PORTSDIR}/sysutils/rsyslog5
 
 PLIST=		${.CURDIR}/pkg-plist
 .endif
 
-CONFLICTS=	rsyslog-[!4].[0-9]*
+CONFLICTS=	rsyslog-[2-4].[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
@@ -75,8 +75,12 @@ IGNORE=	with gssapi module is only supported on FreeBSD 7.x or later
 
 CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
 
-DESCR?=		${.CURDIR}/../rsyslog4/pkg-descr
-MD5_FILE?=	${.CURDIR}/../rsyslog4/distinfo
+DESCR?=		${.CURDIR}/../rsyslog5/pkg-descr
+MD5_FILE?=	${.CURDIR}/../rsyslog5/distinfo
+.endif
+
+.if ${OSVERSION} < 700000
+USE_GCC=	4.2+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/rsyslog55/distinfo b/sysutils/rsyslog55/distinfo
index 87fbddea533b..58f721fa6c6a 100644
--- a/sysutils/rsyslog55/distinfo
+++ b/sysutils/rsyslog55/distinfo
@@ -1,3 +1,4 @@
-MD5 (rsyslog-4.4.2.tar.gz) = a8ada67b6cd5c00fbeb3a4b687b17359
-SHA256 (rsyslog-4.4.2.tar.gz) = 726b0894f29081c9ea9f2c0c9d86e77a8128b203b4d356c87180fa45a2d28942
-SIZE (rsyslog-4.4.2.tar.gz) = 1999058
+MD5 (rsyslog-5.3.3.tar.gz) = 837e50ff8d162e1a00ba0fd16b7f0d8d
+SHA256 (rsyslog-5.3.3.tar.gz) = 
+6cf261ce1ea2972d369e845374bfa4984eaab1d918375d4f2e301e18461a992b
+SIZE (rsyslog-5.3.3.tar.gz) = 2059714
diff --git a/sysutils/rsyslog55/files/pkg-message.in b/sysutils/rsyslog55/files/pkg-message.in
index 0366b0deaa24..fd027fff9592 100644
--- a/sysutils/rsyslog55/files/pkg-message.in
+++ b/sysutils/rsyslog55/files/pkg-message.in
@@ -5,7 +5,7 @@ add the following lines to rc.conf(5):
  rsyslogd_enable="YES"
 To avoid warnings about rsyslogd running in compatibility mode, add
 this:
- rsyslogd_flags="-c4"
+ rsyslogd_flags="-c3"
 It's recommended to copy syslog.conf(5) to
 %%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
 this:
diff --git a/sysutils/rsyslog55/files/rsyslogd.in b/sysutils/rsyslog55/files/rsyslogd.in
index 1ba874068eaf..6ce16c56f70b 100644
--- a/sysutils/rsyslog55/files/rsyslogd.in
+++ b/sysutils/rsyslog55/files/rsyslogd.in
@@ -1,8 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog55/files/Attic/rsyslogd.in,v 1.1 2009-01-27 19:40:41 pgollucci Exp $
+# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog55/files/Attic/rsyslogd.in,v 1.2 2009-12-18 20:44:28 miwi Exp $
 #
 
+
 # PROVIDE: rsyslogd
 # REQUIRE: mountcritremote cleanvar newsyslog ldconfig
 # BEFORE:  SERVERS
diff --git a/sysutils/rsyslog55/pkg-descr b/sysutils/rsyslog55/pkg-descr
index b3c35a7c60fc..018f816b2c97 100644
--- a/sysutils/rsyslog55/pkg-descr
+++ b/sysutils/rsyslog55/pkg-descr
@@ -1,16 +1,21 @@
 Rsyslog is an enhanced multi-threaded syslogd with a focus on security and
 reliability.
 
-Among others, it offers support for on-demand disk buffering, reliable syslog
-over TCP, SSL, TLS and RELP, writing to databases (MySQL, PostgreSQL, Oracle,
-and many more), email alerting, fully configurable output formats (including
+Among others, it offers support for on-demand disk buffering, reliable 
+syslog
+over TCP, SSL, TLS and RELP, writing to databases (MySQL, PostgreSQL, 
+Oracle,
+and many more), email alerting, fully configurable output formats 
+(including
 high-precision timestamps),the ability to filter on any part of the syslog
 message, on-the-wire message compression, and the ability to convert text
 files to syslog.
 
-It is a drop-in replacement for stock syslogd and able to work with the same
+It is a drop-in replacement for stock syslogd and able to work with the 
+same
 configuration file syntax. Its advanced features make it suitable for
-enterprise-class, encryption protected syslog relay chains while at the same
+enterprise-class, encryption protected syslog relay chains while at the 
+same
 time being very easy to setup for the novice user.
 
 WWW: http://www.rsyslog.com/
diff --git a/sysutils/rsyslog55/pkg-plist b/sysutils/rsyslog55/pkg-plist
index cbaa54f3efe9..aa18a7d1f2cf 100644
--- a/sysutils/rsyslog55/pkg-plist
+++ b/sysutils/rsyslog55/pkg-plist
@@ -26,6 +26,8 @@ lib/rsyslog/lmtcpclt.la
 lib/rsyslog/lmtcpclt.so
 lib/rsyslog/lmtcpsrv.la
 lib/rsyslog/lmtcpsrv.so
+lib/rsyslog/lmzlibw.la
+lib/rsyslog/lmzlibw.so
 lib/rsyslog/ommail.la
 lib/rsyslog/ommail.so
 lib/rsyslog/omtesting.la
@@ -55,9 +57,9 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.html
 %%PORTDOCS%%%%DOCSDIR%%/licensing.html
 %%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html
-%%PORTDOCS%%%%DOCSDIR%%/man_rsyslogd.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/multi_ruleset.html
 %%PORTDOCS%%%%DOCSDIR%%/netstream.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_gtls.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_ptcp.html
@@ -67,6 +69,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/omoracle.html
 %%PORTDOCS%%%%DOCSDIR%%/omrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/omsnmp.html
+%%PORTDOCS%%%%DOCSDIR%%/omstdout.html
+%%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html
 %%PORTDOCS%%%%DOCSDIR%%/professional_support.html
 %%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
 %%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic.jpg
@@ -139,6 +143,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html
 %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html
 %%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v5compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/version_naming.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/sysutils/rsyslog6-devel-dbi/Makefile b/sysutils/rsyslog6-devel-dbi/Makefile
index d2df260c5123..7105b210b8a3 100644
--- a/sysutils/rsyslog6-devel-dbi/Makefile
+++ b/sysutils/rsyslog6-devel-dbi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 COMMENT=	LibDBI output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	libdbi
 LIB_DEPENDS=	dbi.0:${PORTSDIR}/databases/libdbi
diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile
index 19e27861a99f..80c35be7d839 100644
--- a/sysutils/rsyslog6-devel-gnutls/Makefile
+++ b/sysutils/rsyslog6-devel-gnutls/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GNUTLS module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
diff --git a/sysutils/rsyslog6-devel-gssapi/Makefile b/sysutils/rsyslog6-devel-gssapi/Makefile
index e7a883f4f57b..2e90c606d787 100644
--- a/sysutils/rsyslog6-devel-gssapi/Makefile
+++ b/sysutils/rsyslog6-devel-gssapi/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GSS API input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	gssapi
 
diff --git a/sysutils/rsyslog6-devel-mysql/Makefile b/sysutils/rsyslog6-devel-mysql/Makefile
index 586d3222ff25..b40cac1b4073 100644
--- a/sysutils/rsyslog6-devel-mysql/Makefile
+++ b/sysutils/rsyslog6-devel-mysql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	MySQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	mysql
 USE_MYSQL=	yes
diff --git a/sysutils/rsyslog6-devel-pgsql/Makefile b/sysutils/rsyslog6-devel-pgsql/Makefile
index 9ffdb409c8b3..1d867ee4c3b7 100644
--- a/sysutils/rsyslog6-devel-pgsql/Makefile
+++ b/sysutils/rsyslog6-devel-pgsql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	PostgreSQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	pgsql
 USE_PGSQL=	yes
diff --git a/sysutils/rsyslog6-devel-relp/Makefile b/sysutils/rsyslog6-devel-relp/Makefile
index 695f551c2557..097271146148 100644
--- a/sysutils/rsyslog6-devel-relp/Makefile
+++ b/sysutils/rsyslog6-devel-relp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RELP input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	relp
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog6-devel-rfc3195/Makefile b/sysutils/rsyslog6-devel-rfc3195/Makefile
index 46259283ac8a..bff68245ad1c 100644
--- a/sysutils/rsyslog6-devel-rfc3195/Makefile
+++ b/sysutils/rsyslog6-devel-rfc3195/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RFC3195 input support for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	rfc3195
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog6-devel-snmp/Makefile b/sysutils/rsyslog6-devel-snmp/Makefile
index be7c95329280..715d869c1c7f 100644
--- a/sysutils/rsyslog6-devel-snmp/Makefile
+++ b/sysutils/rsyslog6-devel-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	SNMP trap sender for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4
+MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	snmp
 LIB_DEPENDS=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile
index 60de6eb6317a..8a06d2daf7d7 100644
--- a/sysutils/rsyslog6-devel/Makefile
+++ b/sysutils/rsyslog6-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	4.4.2
+PORTVERSION=	5.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
@@ -14,15 +14,15 @@ PKGNAMESUFFIX?=	-${MNAME}
 .endif
 
 MAINTAINER=	cristianorolim@hotmail.com
-COMMENT=	Syslogd supporting SQL, TCP and TLS
+COMMENT?=	Syslogd supporting SQL, TCP and TLS
 
 .ifdef MNAME
-RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog4
+RUN_DEPENDS=	rsyslog>=5:${PORTSDIR}/sysutils/rsyslog5
 
 PLIST=		${.CURDIR}/pkg-plist
 .endif
 
-CONFLICTS=	rsyslog-[!4].[0-9]*
+CONFLICTS=	rsyslog-[2-4].[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
@@ -75,8 +75,12 @@ IGNORE=	with gssapi module is only supported on FreeBSD 7.x or later
 
 CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
 
-DESCR?=		${.CURDIR}/../rsyslog4/pkg-descr
-MD5_FILE?=	${.CURDIR}/../rsyslog4/distinfo
+DESCR?=		${.CURDIR}/../rsyslog5/pkg-descr
+MD5_FILE?=	${.CURDIR}/../rsyslog5/distinfo
+.endif
+
+.if ${OSVERSION} < 700000
+USE_GCC=	4.2+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/rsyslog6-devel/distinfo b/sysutils/rsyslog6-devel/distinfo
index 87fbddea533b..58f721fa6c6a 100644
--- a/sysutils/rsyslog6-devel/distinfo
+++ b/sysutils/rsyslog6-devel/distinfo
@@ -1,3 +1,4 @@
-MD5 (rsyslog-4.4.2.tar.gz) = a8ada67b6cd5c00fbeb3a4b687b17359
-SHA256 (rsyslog-4.4.2.tar.gz) = 726b0894f29081c9ea9f2c0c9d86e77a8128b203b4d356c87180fa45a2d28942
-SIZE (rsyslog-4.4.2.tar.gz) = 1999058
+MD5 (rsyslog-5.3.3.tar.gz) = 837e50ff8d162e1a00ba0fd16b7f0d8d
+SHA256 (rsyslog-5.3.3.tar.gz) = 
+6cf261ce1ea2972d369e845374bfa4984eaab1d918375d4f2e301e18461a992b
+SIZE (rsyslog-5.3.3.tar.gz) = 2059714
diff --git a/sysutils/rsyslog6-devel/files/pkg-message.in b/sysutils/rsyslog6-devel/files/pkg-message.in
index 0366b0deaa24..fd027fff9592 100644
--- a/sysutils/rsyslog6-devel/files/pkg-message.in
+++ b/sysutils/rsyslog6-devel/files/pkg-message.in
@@ -5,7 +5,7 @@ add the following lines to rc.conf(5):
  rsyslogd_enable="YES"
 To avoid warnings about rsyslogd running in compatibility mode, add
 this:
- rsyslogd_flags="-c4"
+ rsyslogd_flags="-c3"
 It's recommended to copy syslog.conf(5) to
 %%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
 this:
diff --git a/sysutils/rsyslog6-devel/files/rsyslogd.in b/sysutils/rsyslog6-devel/files/rsyslogd.in
index c4997460783e..7604f8b8cce0 100644
--- a/sysutils/rsyslog6-devel/files/rsyslogd.in
+++ b/sysutils/rsyslog6-devel/files/rsyslogd.in
@@ -3,6 +3,7 @@
 # $FreeBSD$
 #
 
+
 # PROVIDE: rsyslogd
 # REQUIRE: mountcritremote cleanvar newsyslog ldconfig
 # BEFORE:  SERVERS
diff --git a/sysutils/rsyslog6-devel/pkg-descr b/sysutils/rsyslog6-devel/pkg-descr
index b3c35a7c60fc..018f816b2c97 100644
--- a/sysutils/rsyslog6-devel/pkg-descr
+++ b/sysutils/rsyslog6-devel/pkg-descr
@@ -1,16 +1,21 @@
 Rsyslog is an enhanced multi-threaded syslogd with a focus on security and
 reliability.
 
-Among others, it offers support for on-demand disk buffering, reliable syslog
-over TCP, SSL, TLS and RELP, writing to databases (MySQL, PostgreSQL, Oracle,
-and many more), email alerting, fully configurable output formats (including
+Among others, it offers support for on-demand disk buffering, reliable 
+syslog
+over TCP, SSL, TLS and RELP, writing to databases (MySQL, PostgreSQL, 
+Oracle,
+and many more), email alerting, fully configurable output formats 
+(including
 high-precision timestamps),the ability to filter on any part of the syslog
 message, on-the-wire message compression, and the ability to convert text
 files to syslog.
 
-It is a drop-in replacement for stock syslogd and able to work with the same
+It is a drop-in replacement for stock syslogd and able to work with the 
+same
 configuration file syntax. Its advanced features make it suitable for
-enterprise-class, encryption protected syslog relay chains while at the same
+enterprise-class, encryption protected syslog relay chains while at the 
+same
 time being very easy to setup for the novice user.
 
 WWW: http://www.rsyslog.com/
diff --git a/sysutils/rsyslog6-devel/pkg-plist b/sysutils/rsyslog6-devel/pkg-plist
index cbaa54f3efe9..aa18a7d1f2cf 100644
--- a/sysutils/rsyslog6-devel/pkg-plist
+++ b/sysutils/rsyslog6-devel/pkg-plist
@@ -26,6 +26,8 @@ lib/rsyslog/lmtcpclt.la
 lib/rsyslog/lmtcpclt.so
 lib/rsyslog/lmtcpsrv.la
 lib/rsyslog/lmtcpsrv.so
+lib/rsyslog/lmzlibw.la
+lib/rsyslog/lmzlibw.so
 lib/rsyslog/ommail.la
 lib/rsyslog/ommail.so
 lib/rsyslog/omtesting.la
@@ -55,9 +57,9 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.html
 %%PORTDOCS%%%%DOCSDIR%%/licensing.html
 %%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html
-%%PORTDOCS%%%%DOCSDIR%%/man_rsyslogd.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/multi_ruleset.html
 %%PORTDOCS%%%%DOCSDIR%%/netstream.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_gtls.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_ptcp.html
@@ -67,6 +69,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/omoracle.html
 %%PORTDOCS%%%%DOCSDIR%%/omrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/omsnmp.html
+%%PORTDOCS%%%%DOCSDIR%%/omstdout.html
+%%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html
 %%PORTDOCS%%%%DOCSDIR%%/professional_support.html
 %%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
 %%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic.jpg
@@ -139,6 +143,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html
 %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html
 %%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v5compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/version_naming.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%