- Update to 5.4.0 [1]

- Remove -a and old school sockets from rc.d script [myself]

PR:             ports/144566 [1]
Submitted by:   Cristiano Rolim Pereira <cristianorolim@hotmail.com> (maintainer) [1]

Feature safe:   yes

16 files changed, 22 insertions, 230 deletions

diff --git a/sysutils/rsyslog5-devel/Makefile b/sysutils/rsyslog5-devel/Makefile
index 54f5cc40b45b..a243e4a401bd 100644
--- a/sysutils/rsyslog5-devel/Makefile
+++ b/sysutils/rsyslog5-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	5.3.7
+PORTVERSION=	5.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
diff --git a/sysutils/rsyslog5-devel/distinfo b/sysutils/rsyslog5-devel/distinfo
index 2bb7ece43fbf..a4527494eeae 100644
--- a/sysutils/rsyslog5-devel/distinfo
+++ b/sysutils/rsyslog5-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2
-SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029
-SIZE (rsyslog-5.3.7.tar.gz) = 2109777
+MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
+SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
+SIZE (rsyslog-5.4.0.tar.gz) = 2124201
diff --git a/sysutils/rsyslog5-devel/files/rsyslogd.in b/sysutils/rsyslog5-devel/files/rsyslogd.in
index b7bd8d020e1b..f4364395e85b 100644
--- a/sysutils/rsyslog5-devel/files/rsyslogd.in
+++ b/sysutils/rsyslog5-devel/files/rsyslogd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog5-devel/files/Attic/rsyslogd.in,v 1.2 2009-12-18 20:44:28 miwi Exp $
+# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog5-devel/files/Attic/rsyslogd.in,v 1.3 2010-03-08 23:15:09 pgollucci Exp $
 #
 
 
@@ -20,59 +20,6 @@ load_rc_config $name
 pidfile="${rsyslogd_pidfile}"
 command_args="-i ${pidfile} -f ${rsyslogd_config}"
 required_files="${rsyslogd_config}"
-start_precmd="rsyslogd_precmd"
 extra_commands="reload"
 
-sockfile="/var/run/rsyslogd.sockets"
-evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
-altlog_proglist="named"
-
-rsyslogd_precmd()
-{
-	local _l _ldir
-
-	#	Transitional symlink for old binaries
-	#
-	if [ ! -L /dev/log ]; then
-		ln -sf /var/run/log /dev/log
-	fi
-	rm -f /var/run/log
-
-	#	Create default list of syslog sockets to watch
-	#
-	( umask 022 ; > $sockfile )
-
-	#	If running named(8) or ntpd(8) chrooted, added appropriate
-	#	syslog socket to list of sockets to watch.
-	#
-	for _l in $altlog_proglist; do
-		eval _ldir=\$${_l}_chrootdir
-		if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
-			echo "${_ldir}/var/run/log" >> $sockfile
-		fi
-	done
-
-	#	If other sockets have been provided, change run_rc_command()'s
-	#	internal copy of $rsyslogd_flags to force use of specific
-	#	rsyslogd sockets.
-	#
-	if [ -s $sockfile ]; then
-		echo "/var/run/log" >> $sockfile
-		eval $evalargs
-	fi
-
-	return 0
-}
-
-set_socketlist()
-{
-	local _s _socketargs
-
-	_socketargs=
-	for _s in `cat $sockfile | tr '\n' ' '` ; do
-		_socketargs="-a $_s $_socketargs"
-	done
-	echo $_socketargs
-}
-
 run_rc_command "$1"
diff --git a/sysutils/rsyslog5-devel/pkg-plist b/sysutils/rsyslog5-devel/pkg-plist
index a0aae3781a23..4120023c3fba 100644
--- a/sysutils/rsyslog5-devel/pkg-plist
+++ b/sysutils/rsyslog5-devel/pkg-plist
@@ -126,6 +126,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html
diff --git a/sysutils/rsyslog5/Makefile b/sysutils/rsyslog5/Makefile
index 54f5cc40b45b..a243e4a401bd 100644
--- a/sysutils/rsyslog5/Makefile
+++ b/sysutils/rsyslog5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	5.3.7
+PORTVERSION=	5.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
diff --git a/sysutils/rsyslog5/distinfo b/sysutils/rsyslog5/distinfo
index 2bb7ece43fbf..a4527494eeae 100644
--- a/sysutils/rsyslog5/distinfo
+++ b/sysutils/rsyslog5/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2
-SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029
-SIZE (rsyslog-5.3.7.tar.gz) = 2109777
+MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
+SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
+SIZE (rsyslog-5.4.0.tar.gz) = 2124201
diff --git a/sysutils/rsyslog5/files/rsyslogd.in b/sysutils/rsyslog5/files/rsyslogd.in
index 7604f8b8cce0..57b09fffd37b 100644
--- a/sysutils/rsyslog5/files/rsyslogd.in
+++ b/sysutils/rsyslog5/files/rsyslogd.in
@@ -20,59 +20,6 @@ load_rc_config $name
 pidfile="${rsyslogd_pidfile}"
 command_args="-i ${pidfile} -f ${rsyslogd_config}"
 required_files="${rsyslogd_config}"
-start_precmd="rsyslogd_precmd"
 extra_commands="reload"
 
-sockfile="/var/run/rsyslogd.sockets"
-evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
-altlog_proglist="named"
-
-rsyslogd_precmd()
-{
-	local _l _ldir
-
-	#	Transitional symlink for old binaries
-	#
-	if [ ! -L /dev/log ]; then
-		ln -sf /var/run/log /dev/log
-	fi
-	rm -f /var/run/log
-
-	#	Create default list of syslog sockets to watch
-	#
-	( umask 022 ; > $sockfile )
-
-	#	If running named(8) or ntpd(8) chrooted, added appropriate
-	#	syslog socket to list of sockets to watch.
-	#
-	for _l in $altlog_proglist; do
-		eval _ldir=\$${_l}_chrootdir
-		if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
-			echo "${_ldir}/var/run/log" >> $sockfile
-		fi
-	done
-
-	#	If other sockets have been provided, change run_rc_command()'s
-	#	internal copy of $rsyslogd_flags to force use of specific
-	#	rsyslogd sockets.
-	#
-	if [ -s $sockfile ]; then
-		echo "/var/run/log" >> $sockfile
-		eval $evalargs
-	fi
-
-	return 0
-}
-
-set_socketlist()
-{
-	local _s _socketargs
-
-	_socketargs=
-	for _s in `cat $sockfile | tr '\n' ' '` ; do
-		_socketargs="-a $_s $_socketargs"
-	done
-	echo $_socketargs
-}
-
 run_rc_command "$1"
diff --git a/sysutils/rsyslog5/pkg-plist b/sysutils/rsyslog5/pkg-plist
index a0aae3781a23..4120023c3fba 100644
--- a/sysutils/rsyslog5/pkg-plist
+++ b/sysutils/rsyslog5/pkg-plist
@@ -126,6 +126,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html
diff --git a/sysutils/rsyslog55/Makefile b/sysutils/rsyslog55/Makefile
index 54f5cc40b45b..a243e4a401bd 100644
--- a/sysutils/rsyslog55/Makefile
+++ b/sysutils/rsyslog55/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	5.3.7
+PORTVERSION=	5.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
diff --git a/sysutils/rsyslog55/distinfo b/sysutils/rsyslog55/distinfo
index 2bb7ece43fbf..a4527494eeae 100644
--- a/sysutils/rsyslog55/distinfo
+++ b/sysutils/rsyslog55/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2
-SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029
-SIZE (rsyslog-5.3.7.tar.gz) = 2109777
+MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
+SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
+SIZE (rsyslog-5.4.0.tar.gz) = 2124201
diff --git a/sysutils/rsyslog55/files/rsyslogd.in b/sysutils/rsyslog55/files/rsyslogd.in
index 6ce16c56f70b..39231caaf92e 100644
--- a/sysutils/rsyslog55/files/rsyslogd.in
+++ b/sysutils/rsyslog55/files/rsyslogd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog55/files/Attic/rsyslogd.in,v 1.2 2009-12-18 20:44:28 miwi Exp $
+# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog55/files/Attic/rsyslogd.in,v 1.3 2010-03-08 23:15:09 pgollucci Exp $
 #
 
 
@@ -20,59 +20,6 @@ load_rc_config $name
 pidfile="${rsyslogd_pidfile}"
 command_args="-i ${pidfile} -f ${rsyslogd_config}"
 required_files="${rsyslogd_config}"
-start_precmd="rsyslogd_precmd"
 extra_commands="reload"
 
-sockfile="/var/run/rsyslogd.sockets"
-evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
-altlog_proglist="named"
-
-rsyslogd_precmd()
-{
-	local _l _ldir
-
-	#	Transitional symlink for old binaries
-	#
-	if [ ! -L /dev/log ]; then
-		ln -sf /var/run/log /dev/log
-	fi
-	rm -f /var/run/log
-
-	#	Create default list of syslog sockets to watch
-	#
-	( umask 022 ; > $sockfile )
-
-	#	If running named(8) or ntpd(8) chrooted, added appropriate
-	#	syslog socket to list of sockets to watch.
-	#
-	for _l in $altlog_proglist; do
-		eval _ldir=\$${_l}_chrootdir
-		if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
-			echo "${_ldir}/var/run/log" >> $sockfile
-		fi
-	done
-
-	#	If other sockets have been provided, change run_rc_command()'s
-	#	internal copy of $rsyslogd_flags to force use of specific
-	#	rsyslogd sockets.
-	#
-	if [ -s $sockfile ]; then
-		echo "/var/run/log" >> $sockfile
-		eval $evalargs
-	fi
-
-	return 0
-}
-
-set_socketlist()
-{
-	local _s _socketargs
-
-	_socketargs=
-	for _s in `cat $sockfile | tr '\n' ' '` ; do
-		_socketargs="-a $_s $_socketargs"
-	done
-	echo $_socketargs
-}
-
 run_rc_command "$1"
diff --git a/sysutils/rsyslog55/pkg-plist b/sysutils/rsyslog55/pkg-plist
index a0aae3781a23..4120023c3fba 100644
--- a/sysutils/rsyslog55/pkg-plist
+++ b/sysutils/rsyslog55/pkg-plist
@@ -126,6 +126,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html
diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile
index 54f5cc40b45b..a243e4a401bd 100644
--- a/sysutils/rsyslog6-devel/Makefile
+++ b/sysutils/rsyslog6-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	5.3.7
+PORTVERSION=	5.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
diff --git a/sysutils/rsyslog6-devel/distinfo b/sysutils/rsyslog6-devel/distinfo
index 2bb7ece43fbf..a4527494eeae 100644
--- a/sysutils/rsyslog6-devel/distinfo
+++ b/sysutils/rsyslog6-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2
-SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029
-SIZE (rsyslog-5.3.7.tar.gz) = 2109777
+MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
+SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
+SIZE (rsyslog-5.4.0.tar.gz) = 2124201
diff --git a/sysutils/rsyslog6-devel/files/rsyslogd.in b/sysutils/rsyslog6-devel/files/rsyslogd.in
index 7604f8b8cce0..57b09fffd37b 100644
--- a/sysutils/rsyslog6-devel/files/rsyslogd.in
+++ b/sysutils/rsyslog6-devel/files/rsyslogd.in
@@ -20,59 +20,6 @@ load_rc_config $name
 pidfile="${rsyslogd_pidfile}"
 command_args="-i ${pidfile} -f ${rsyslogd_config}"
 required_files="${rsyslogd_config}"
-start_precmd="rsyslogd_precmd"
 extra_commands="reload"
 
-sockfile="/var/run/rsyslogd.sockets"
-evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
-altlog_proglist="named"
-
-rsyslogd_precmd()
-{
-	local _l _ldir
-
-	#	Transitional symlink for old binaries
-	#
-	if [ ! -L /dev/log ]; then
-		ln -sf /var/run/log /dev/log
-	fi
-	rm -f /var/run/log
-
-	#	Create default list of syslog sockets to watch
-	#
-	( umask 022 ; > $sockfile )
-
-	#	If running named(8) or ntpd(8) chrooted, added appropriate
-	#	syslog socket to list of sockets to watch.
-	#
-	for _l in $altlog_proglist; do
-		eval _ldir=\$${_l}_chrootdir
-		if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
-			echo "${_ldir}/var/run/log" >> $sockfile
-		fi
-	done
-
-	#	If other sockets have been provided, change run_rc_command()'s
-	#	internal copy of $rsyslogd_flags to force use of specific
-	#	rsyslogd sockets.
-	#
-	if [ -s $sockfile ]; then
-		echo "/var/run/log" >> $sockfile
-		eval $evalargs
-	fi
-
-	return 0
-}
-
-set_socketlist()
-{
-	local _s _socketargs
-
-	_socketargs=
-	for _s in `cat $sockfile | tr '\n' ' '` ; do
-		_socketargs="-a $_s $_socketargs"
-	done
-	echo $_socketargs
-}
-
 run_rc_command "$1"
diff --git a/sysutils/rsyslog6-devel/pkg-plist b/sysutils/rsyslog6-devel/pkg-plist
index a0aae3781a23..4120023c3fba 100644
--- a/sysutils/rsyslog6-devel/pkg-plist
+++ b/sysutils/rsyslog6-devel/pkg-plist
@@ -126,6 +126,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html