sysutils/rsyslog4-devel||2011-11-02|is now stable see sysutils/rsyslog4

sysutils/rsyslog4-devel-dbi||2011-11-02|is now stable see sysutils/rsyslog4
sysutils/rsyslog4-devel-gnutls||2011-11-02|is now stable see sysutils/rsyslog4
sysutils/rsyslog4-devel-gssapi||2011-11-02|is now stable see sysutils/rsyslog4
sysutils/rsyslog4-devel-mysql||2011-11-02|is now stable see sysutils/rsyslog4
sysutils/rsyslog4-devel-pgsql||2011-11-02|is now stable see sysutils/rsyslog4
sysutils/rsyslog4-devel-relp||2011-11-02|is now stable see sysutils/rsyslog4
sysutils/rsyslog4-devel-rfc3195||2011-11-02|is now stable see sysutils/rsyslog4
sysutils/rsyslog4-devel-snmp||2011-11-02|is now stable see sysutils/rsyslog4

18 files changed, 9 insertions, 594 deletions

diff --git a/MOVED b/MOVED
index 35c8336471c0..3085c782cfc4 100644
--- a/MOVED
+++ b/MOVED
@@ -2989,3 +2989,12 @@ sysutils/rsyslog3-gssapi||2011-11-02|Has expired: unsupported upstream
 sysutils/rsyslog3-mysql||2011-11-02|Has expired: unsupported upstream
 sysutils/rsyslog3-pgsql||2011-11-02|Has expired: unsupported upstream
 sysutils/rsyslog3-relp||2011-11-02|Has expired: unsupported upstream
+sysutils/rsyslog4-devel||2011-11-02|is now stable see sysutils/rsyslog4
+sysutils/rsyslog4-devel-dbi||2011-11-02|is now stable see sysutils/rsyslog4
+sysutils/rsyslog4-devel-gnutls||2011-11-02|is now stable see sysutils/rsyslog4
+sysutils/rsyslog4-devel-gssapi||2011-11-02|is now stable see sysutils/rsyslog4
+sysutils/rsyslog4-devel-mysql||2011-11-02|is now stable see sysutils/rsyslog4
+sysutils/rsyslog4-devel-pgsql||2011-11-02|is now stable see sysutils/rsyslog4
+sysutils/rsyslog4-devel-relp||2011-11-02|is now stable see sysutils/rsyslog4
+sysutils/rsyslog4-devel-rfc3195||2011-11-02|is now stable see sysutils/rsyslog4
+sysutils/rsyslog4-devel-snmp||2011-11-02|is now stable see sysutils/rsyslog4
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 7bf4f44c387f..1e0d71ad2780 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -723,15 +723,6 @@
     SUBDIR += rsyncmanager
     SUBDIR += rsyslog4
     SUBDIR += rsyslog4-dbi
-    SUBDIR += rsyslog4-devel
-    SUBDIR += rsyslog4-devel-dbi
-    SUBDIR += rsyslog4-devel-gnutls
-    SUBDIR += rsyslog4-devel-gssapi
-    SUBDIR += rsyslog4-devel-mysql
-    SUBDIR += rsyslog4-devel-pgsql
-    SUBDIR += rsyslog4-devel-relp
-    SUBDIR += rsyslog4-devel-rfc3195
-    SUBDIR += rsyslog4-devel-snmp
     SUBDIR += rsyslog4-gnutls
     SUBDIR += rsyslog4-gssapi
     SUBDIR += rsyslog4-mysql
diff --git a/sysutils/rsyslog4-devel-dbi/Makefile b/sysutils/rsyslog4-devel-dbi/Makefile
deleted file mode 100644
index 630db24943c5..000000000000
--- a/sysutils/rsyslog4-devel-dbi/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for: rsyslog4-dbi
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-
-COMMENT=	LibDBI output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4-devel
-
-MNAME=	libdbi
-LIB_DEPENDS=	dbi.1:${PORTSDIR}/databases/libdbi
-
-CONFIGURE_ARGS+=--enable-libdbi
-
-PLIST_FILES+=	lib/rsyslog/omlibdbi.la \
-		lib/rsyslog/omlibdbi.so
-
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/omlibdbi/.libs/omlibdbi.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/omlibdbi/omlibdbi.la ${PREFIX}/lib/rsyslog
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/rsyslog4-devel-gnutls/Makefile b/sysutils/rsyslog4-devel-gnutls/Makefile
deleted file mode 100644
index 52f6f1d1986b..000000000000
--- a/sysutils/rsyslog4-devel-gnutls/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#New ports collection makefile for: rsyslog4-gnutls
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-#
-
-PORTREVISION=	2
-
-COMMENT=	GNUTLS module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4-devel
-
-MNAME=	gnutls
-LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
-
-CONFIGURE_ARGS+=--enable-gnutls
-
-PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.la \
-		lib/rsyslog/lmnsd_gtls.so
-
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/runtime/.libs/lmnsd_gtls.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/runtime/lmnsd_gtls.la ${PREFIX}/lib/rsyslog
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/rsyslog4-devel-gssapi/Makefile b/sysutils/rsyslog4-devel-gssapi/Makefile
deleted file mode 100644
index cf6f1cce2dc4..000000000000
--- a/sysutils/rsyslog4-devel-gssapi/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for: rsyslog4-gssapi
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-#
-
-COMMENT=	GSS API input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4-devel
-
-MNAME=	gssapi
-
-CONFIGURE_ARGS+=--enable-gssapi-krb5
-
-PLIST_FILES+=	lib/rsyslog/imgssapi.la \
-		lib/rsyslog/imgssapi.so \
-		lib/rsyslog/lmgssutil.la \
-		lib/rsyslog/lmgssutil.so \
-		lib/rsyslog/omgssapi.la \
-		lib/rsyslog/omgssapi.so
-
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/omgssapi/.libs/omgssapi.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/omgssapi/omgssapi.la ${PREFIX}/lib/rsyslog
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/imgssapi/.libs/imgssapi.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/imgssapi/imgssapi.la ${PREFIX}/lib/rsyslog
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/.libs/lmgssutil.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/lmgssutil.la ${PREFIX}/lib/rsyslog
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/rsyslog4-devel-mysql/Makefile b/sysutils/rsyslog4-devel-mysql/Makefile
deleted file mode 100644
index 02b377b0ecc0..000000000000
--- a/sysutils/rsyslog4-devel-mysql/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for: rsyslog4-mysql
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-#
-
-COMMENT=	MySQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4-devel
-
-MNAME=	mysql
-USE_MYSQL=	yes
-
-CONFIGURE_ARGS+=--enable-mysql
-
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/ommysql/.libs/ommysql.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/ommysql/ommysql.la ${PREFIX}/lib/rsyslog
-post-install:
-.ifndef NOPORTEXAMPLES
-	@${INSTALL} -d ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql ${EXAMPLESDIR}/mysql_createDB.sql
-.endif
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/rsyslog4-devel-mysql/pkg-plist b/sysutils/rsyslog4-devel-mysql/pkg-plist
deleted file mode 100644
index 3321cd33fa3a..000000000000
--- a/sysutils/rsyslog4-devel-mysql/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/rsyslog/ommysql.la
-lib/rsyslog/ommysql.so
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mysql_createDB.sql
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/sysutils/rsyslog4-devel-pgsql/Makefile b/sysutils/rsyslog4-devel-pgsql/Makefile
deleted file mode 100644
index d4755d1f4cdc..000000000000
--- a/sysutils/rsyslog4-devel-pgsql/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for: rsyslog4-pgsql
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-#
-
-COMMENT=	PostgreSQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4-devel
-
-MNAME=	pgsql
-USE_PGSQL=	yes
-
-CONFIGURE_ARGS+=--enable-pgsql
-
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/ompgsql/.libs/ompgsql.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/ompgsql/ompgsql.la ${PREFIX}/lib/rsyslog
-post-install:
-.ifndef NOPORTEXAMPLES
-	@${INSTALL} -d ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql ${EXAMPLESDIR}/pgsql_createDB.sql
-.endif
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/rsyslog4-devel-pgsql/pkg-plist b/sysutils/rsyslog4-devel-pgsql/pkg-plist
deleted file mode 100644
index c01f4b8042c0..000000000000
--- a/sysutils/rsyslog4-devel-pgsql/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/rsyslog/ompgsql.la
-lib/rsyslog/ompgsql.so
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql_createDB.sql
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/sysutils/rsyslog4-devel-relp/Makefile b/sysutils/rsyslog4-devel-relp/Makefile
deleted file mode 100644
index 85c3a12cd892..000000000000
--- a/sysutils/rsyslog4-devel-relp/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: rsyslog4-relp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-#
-
-COMMENT=	RELP input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4-devel
-
-MNAME=	relp
-BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS=	relp.0:${PORTSDIR}/devel/librelp
-
-CONFIGURE_ARGS+=--enable-relp
-
-PLIST_FILES+=	lib/rsyslog/imrelp.la \
-		lib/rsyslog/imrelp.so \
-		lib/rsyslog/omrelp.la \
-		lib/rsyslog/omrelp.so
-
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/omrelp/.libs/omrelp.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/omrelp/omrelp.la ${PREFIX}/lib/rsyslog
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/imrelp/.libs/imrelp.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/imrelp/imrelp.la ${PREFIX}/lib/rsyslog
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/rsyslog4-devel-rfc3195/Makefile b/sysutils/rsyslog4-devel-rfc3195/Makefile
deleted file mode 100644
index c50b30ed4e5e..000000000000
--- a/sysutils/rsyslog4-devel-rfc3195/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-#
-
-COMMENT=	RFC3195 input support for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4-devel
-
-MNAME=	rfc3195
-BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
-
-CONFIGURE_ARGS+=--enable-rfc3195
-
-PLIST_FILES+=	lib/rsyslog/im3195.la \
-		lib/rsyslog/im3195.so
-
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/im3195/.libs/im3195.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/im3195/im3195.la ${PREFIX}/lib/rsyslog
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/rsyslog4-devel-snmp/Makefile b/sysutils/rsyslog4-devel-snmp/Makefile
deleted file mode 100644
index cd5f4e78f1ad..000000000000
--- a/sysutils/rsyslog4-devel-snmp/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-#
-
-COMMENT=	SNMP trap sender for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog4-devel
-
-MNAME=	snmp
-LIB_DEPENDS=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
-
-CONFIGURE_ARGS+=--enable-snmp
-
-PLIST_FILES+=	lib/rsyslog/omsnmp.la \
-		lib/rsyslog/omsnmp.so
-
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/plugins/omsnmp/.libs/omsnmp.so ${PREFIX}/lib/rsyslog
-	@${INSTALL_DATA} \
-		${WRKSRC}/plugins/omsnmp/omsnmp.la ${PREFIX}/lib/rsyslog
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/rsyslog4-devel/Makefile b/sysutils/rsyslog4-devel/Makefile
deleted file mode 100644
index 6e74ac975acc..000000000000
--- a/sysutils/rsyslog4-devel/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# New ports collection makefile for: rsyslog4-devel
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rsyslog
-PORTVERSION=	4.7.3
-PORTREVISION=	2
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
-.ifdef MNAME
-PKGNAMESUFFIX?=	-${MNAME}
-.endif
-
-MAINTAINER=	pgollucci@FreeBSD.org
-COMMENT?=	Syslogd supporting SQL, TCP and TLS
-
-.ifdef MNAME
-RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog4-devel
-PLIST=		${.CURDIR}/pkg-plist
-LATEST_LINK=	rsyslog4-devel-${MNAME}
-.else
-LATEST_LINK=	rsyslog4-devel
-.endif
-
-PORTSCOUT=	limit:^4.7
-
-CONFLICTS=	rsyslog-devel-[!4].[!7].[0-9]*
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-GNU_CONFIGURE=	yes
-
-.ifdef WITH_DEBUG
-CONFIGURE_ARGS+=--enable-rtinst --enable-debug
-.endif
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 700000
-BROKEN=	does not build on 6.x
-.endif
-
-.if ${ARCH} == "i386"
-CPPFLAGS+=-march=i686
-.endif
-
-.ifndef MNAME
-MAN8=	rsyslogd.8
-MAN5=	rsyslog.conf.5
-
-USE_RC_SUBR=	${PORTNAME}d
-SUB_FILES=	pkg-message
-
-CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate --enable-testbench=no
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\
-		${WRKSRC}/tools/syslogd.c
-	@${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\
-		's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|'
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
-
-post-install:
-.ifndef NOPORTDOCS
-	@${INSTALL} -d ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/*html ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${DOCSDIR}/
-.endif
-.ifndef NOPORTEXAMPLES
-	@${INSTALL} -d ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
-.endif
-
-.ifdef MNAME
-
-.if ${MNAME} == "gssapi" && ${OSVERSION} < 700000
-IGNORE=	with gssapi module is only supported on FreeBSD 7.x or later
-.endif
-
-.if ${MNAME} == "snmp" && ${ARCH} == "i386" && ${OSVERSION} >= 800000
-BROKEN=		Does not link on i386: can't find symbol snmp_timeout in libnetsnmp
-.endif
-
-CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
-
-DESCR?=		${.CURDIR}/../rsyslog4-devel/pkg-descr
-DISTINFO_FILE?=	${.CURDIR}/../rsyslog4-devel/distinfo
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/rsyslog4-devel/distinfo b/sysutils/rsyslog4-devel/distinfo
deleted file mode 100644
index 7f52e00cd4c8..000000000000
--- a/sysutils/rsyslog4-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rsyslog-4.7.3.tar.gz) = a4063b6027e01dc380a97833ceb98ca0b0a060b9e843ed794829f60bd7af93b9
-SIZE (rsyslog-4.7.3.tar.gz) = 2129255
diff --git a/sysutils/rsyslog4-devel/files/pkg-message.in b/sysutils/rsyslog4-devel/files/pkg-message.in
deleted file mode 100644
index 0366b0deaa24..000000000000
--- a/sysutils/rsyslog4-devel/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-===================================================================
-To start using rsyslogd(8), stop syslogd(8) if it's running and
-add the following lines to rc.conf(5):
- syslogd_enable="NO"
- rsyslogd_enable="YES"
-To avoid warnings about rsyslogd running in compatibility mode, add
-this:
- rsyslogd_flags="-c4"
-It's recommended to copy syslog.conf(5) to
-%%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
-this:
- rsyslogd_config="/etc/syslog.conf"
-newsyslog(8) has the path of syslogd's pid file hardcoded. To
-make it work seamlessly with rsyslog, add this:
- rsyslogd_pidfile="/var/run/syslog.pid"
-===================================================================
diff --git a/sysutils/rsyslog4-devel/files/rsyslogd.in b/sysutils/rsyslog4-devel/files/rsyslogd.in
deleted file mode 100644
index 304785a127c0..000000000000
--- a/sysutils/rsyslog4-devel/files/rsyslogd.in
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog4-devel/files/Attic/rsyslogd.in,v 1.2 2010-03-27 00:15:04 dougb Exp $
-#
-
-# PROVIDE: rsyslogd
-# REQUIRE: mountcritremote cleanvar newsyslog ldconfig
-# BEFORE:  SERVERS
-
-. /etc/rc.subr
-
-name=rsyslogd
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-load_rc_config $name
-: ${rsyslogd_enable:="NO"}
-: ${rsyslogd_pidfile:="/var/run/rsyslogd.pid"}
-: ${rsyslogd_config:="%%PREFIX%%/etc/rsyslog.conf"}
-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/rsyslog4-devel/pkg-descr b/sysutils/rsyslog4-devel/pkg-descr
deleted file mode 100644
index ac8a530e60af..000000000000
--- a/sysutils/rsyslog4-devel/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-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
-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
-configuration file syntax. Its advanced features make it suitable for
-enterprise-class, encryption protected syslog relay chains while at the same
-time being very easy to setup for the novice user.
-
-Tracking v4-devel
-
-WWW: http://www.rsyslog.com/
diff --git a/sysutils/rsyslog4-devel/pkg-plist b/sysutils/rsyslog4-devel/pkg-plist
deleted file mode 100644
index 05b3af72270c..000000000000
--- a/sysutils/rsyslog4-devel/pkg-plist
+++ /dev/null
@@ -1,152 +0,0 @@
-lib/rsyslog/imfile.la
-lib/rsyslog/imfile.so
-lib/rsyslog/imklog.la
-lib/rsyslog/imklog.so
-lib/rsyslog/immark.la
-lib/rsyslog/immark.so
-lib/rsyslog/imtcp.la
-lib/rsyslog/imtcp.so
-lib/rsyslog/imtemplate.la
-lib/rsyslog/imtemplate.so
-lib/rsyslog/imudp.la
-lib/rsyslog/imudp.so
-lib/rsyslog/imuxsock.la
-lib/rsyslog/imuxsock.so
-lib/rsyslog/lmnet.la
-lib/rsyslog/lmnet.so
-lib/rsyslog/lmnetstrms.la
-lib/rsyslog/lmnetstrms.so
-lib/rsyslog/lmnsd_ptcp.la
-lib/rsyslog/lmnsd_ptcp.so
-lib/rsyslog/lmregexp.la
-lib/rsyslog/lmregexp.so
-lib/rsyslog/lmstrmsrv.la
-lib/rsyslog/lmstrmsrv.so
-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
-lib/rsyslog/omtesting.so
-sbin/rsyslogd
-%%PORTDOCS%%%%DOCSDIR%%/bugs.html
-%%PORTDOCS%%%%DOCSDIR%%/build_from_repo.html
-%%PORTDOCS%%%%DOCSDIR%%/contributors.html
-%%PORTDOCS%%%%DOCSDIR%%/debug.html
-%%PORTDOCS%%%%DOCSDIR%%/dev_queue.html
-%%PORTDOCS%%%%DOCSDIR%%/droppriv.html
-%%PORTDOCS%%%%DOCSDIR%%/expression.html
-%%PORTDOCS%%%%DOCSDIR%%/features.html
-%%PORTDOCS%%%%DOCSDIR%%/generic_design.html
-%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
-%%PORTDOCS%%%%DOCSDIR%%/history.html
-%%PORTDOCS%%%%DOCSDIR%%/how2help.html
-%%PORTDOCS%%%%DOCSDIR%%/im3195.html
-%%PORTDOCS%%%%DOCSDIR%%/imfile.html
-%%PORTDOCS%%%%DOCSDIR%%/imgssapi.html
-%%PORTDOCS%%%%DOCSDIR%%/imklog.html
-%%PORTDOCS%%%%DOCSDIR%%/imptcp.html
-%%PORTDOCS%%%%DOCSDIR%%/imrelp.html
-%%PORTDOCS%%%%DOCSDIR%%/imtcp.html
-%%PORTDOCS%%%%DOCSDIR%%/imuxsock.html
-%%PORTDOCS%%%%DOCSDIR%%/imsolaris.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/ipv6.html
-%%PORTDOCS%%%%DOCSDIR%%/licensing.html
-%%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.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
-%%PORTDOCS%%%%DOCSDIR%%/omlibdbi.html
-%%PORTDOCS%%%%DOCSDIR%%/ommail.html
-%%PORTDOCS%%%%DOCSDIR%%/ommysql.html
-%%PORTDOCS%%%%DOCSDIR%%/omoracle.html
-%%PORTDOCS%%%%DOCSDIR%%/omrelp.html
-%%PORTDOCS%%%%DOCSDIR%%/omsnmp.html
-%%PORTDOCS%%%%DOCSDIR%%/omuxsock.html
-%%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
-%%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic.jpg
-%%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/queues.html
-%%PORTDOCS%%%%DOCSDIR%%/queues_analogy.html
-%%PORTDOCS%%%%DOCSDIR%%/rainerscript.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionexeconlywhenpreviousissuspended.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionresumeinterval.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_allowedsender.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_controlcharacterescapeprefix.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintcfsyslinehandlerlist.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintmodulelist.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprinttemplatelist.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dircreatemode.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirgroup.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirowner.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_droptrailinglfonreception.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dynafilecachesize.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escapecontrolcharactersonreceive.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_failonchownfailure.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_filecreatemode.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_filegroup.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_fileowner.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_generateconfiggraph.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_gssforwardservicename.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_gsslistenservicename.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_gssmode.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_includeconfig.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_mainmsgqueuesize.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_markmessageperiod.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_moddir.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_modload.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_repeatedmsgreduction.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_resetconfigvariables.html
-%%PORTDOCS%%%%DOCSDIR%%/rsconf1_umask.html
-%%PORTDOCS%%%%DOCSDIR%%/rscript_abnf.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_actions.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_examples.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_filter.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_global.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_modules.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_nomatch.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_output.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_templates.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_high_database_rate.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html
-%%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html
-%%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html
-%%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_100.jpg
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.html
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.jpg
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_client.html
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_errmsgs.html
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_machine.html
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_scenario.html
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_server.html
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_summary.html
-%%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html
-%%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html
-%%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html
-%%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html
-%%PORTDOCS%%%%DOCSDIR%%/version_naming.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/rsyslog