4 files changed, 14 insertions, 26 deletions

diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile
index 20b80bf3c14b..f4ac2fab65e4 100644
--- a/sysutils/rsyslog6-devel/Makefile
+++ b/sysutils/rsyslog6-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	6.1.1
-PORTREVISION?=	1
+PORTVERSION=	6.1.9
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 .ifdef MNAME
@@ -17,11 +16,15 @@ PKGNAMESUFFIX?=	-${MNAME}
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT?=	Syslogd supporting SQL, TCP and TLS
 
+USE_LDCONFIG=	yes
+
 .ifdef MNAME
 RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel
 PLIST=		${.CURDIR}/pkg-plist
 LATEST_LINK=	rsyslog6-devel-${MNAME}
 .else
+LIB_DEPENDS=	ee:${PORTSDIR}/devel/libee \
+		estr:${PORTSDIR}/devel/libestr
 LATEST_LINK=	rsyslog6-devel
 .endif
 
@@ -35,7 +38,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-devel-[!6].[0-9]* 
+CONFLICTS=	rsyslog-devel-[!6].[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
@@ -48,7 +51,7 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug
 .if ${ARCH} == "i386"
 CPPFLAGS+=-march=i686
 .endif
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LIBESTR_CFLAGS="${CPPFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr"  LIBEE_CFLAGS="${CPPFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee"
 
 .ifndef MNAME
 MAN8=	rsyslogd.8
diff --git a/sysutils/rsyslog6-devel/distinfo b/sysutils/rsyslog6-devel/distinfo
index 08004965f1ce..e3216d84dc95 100644
--- a/sysutils/rsyslog6-devel/distinfo
+++ b/sysutils/rsyslog6-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-6.1.1.tar.gz) = 970d1ae88ea544ff916a61c572afbe7a4617ef675b6a017812bb67a78265f00f
-SIZE (rsyslog-6.1.1.tar.gz) = 2312617
+SHA256 (rsyslog-6.1.9.tar.gz) = b6672a95ada4946e4e7caa8cb163f3bcb271cf838b39801736019ea7bb1f034e
+SIZE (rsyslog-6.1.9.tar.gz) = 2407312
diff --git a/sysutils/rsyslog6-devel/files/patch-Makefile.in b/sysutils/rsyslog6-devel/files/patch-Makefile.in
deleted file mode 100644
index 7181504bf088..000000000000
--- a/sysutils/rsyslog6-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./Makefile.in.orig	2010-11-30 10:45:25.000000000 +0000
-+++ ./Makefile.in	2010-12-10 06:41:03.768306480 +0000
-@@ -54,7 +54,6 @@
- @ENABLE_PGSQL_TRUE@am__append_11 = plugins/ompgsql
- @ENABLE_SNMP_TRUE@am__append_12 = plugins/omsnmp
- @ENABLE_CUST1_TRUE@am__append_13 = plugins/cust1
--@ENABLE_IMTEMPLATE_TRUE@am__append_14 = plugins/imtemplate
- @ENABLE_OMSTDOUT_TRUE@am__append_15 = plugins/omstdout
- @ENABLE_PMLASTMSG_TRUE@am__append_16 = plugins/pmlastmsg
- @ENABLE_PMRFC3164SD_TRUE@am__append_17 = plugins/pmrfc3164sd
-@@ -203,7 +202,7 @@
- 	plugins/omgssapi plugins/imgssapi plugins/omrelp \
- 	plugins/imrelp plugins/ommysql plugins/omlibdbi \
- 	plugins/ompgsql plugins/omsnmp plugins/cust1 \
--	plugins/imtemplate plugins/omstdout plugins/pmlastmsg \
-+	plugins/omstdout plugins/pmlastmsg \
- 	plugins/pmrfc3164sd plugins/omruleset plugins/omdbalerting \
- 	plugins/omudpspoof plugins/omuxsock plugins/omhdfs \
- 	plugins/omtemplate plugins/imfile plugins/imptcp \
diff --git a/sysutils/rsyslog6-devel/pkg-plist b/sysutils/rsyslog6-devel/pkg-plist
index bfd22b64c986..3aa297cf1f2d 100644
--- a/sysutils/rsyslog6-devel/pkg-plist
+++ b/sysutils/rsyslog6-devel/pkg-plist
@@ -6,6 +6,8 @@ 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
@@ -49,8 +51,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/imfile.html
 %%PORTDOCS%%%%DOCSDIR%%/imgssapi.html
 %%PORTDOCS%%%%DOCSDIR%%/imklog.html
-%%PORTDOCS%%%%DOCSDIR%%/imptcp.html
 %%PORTDOCS%%%%DOCSDIR%%/impstats.html
+%%PORTDOCS%%%%DOCSDIR%%/imptcp.html
 %%PORTDOCS%%%%DOCSDIR%%/imrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/imsolaris.html
 %%PORTDOCS%%%%DOCSDIR%%/imtcp.html
@@ -61,6 +63,8 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/licensing.html
 %%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/mmnormalize.html
+%%PORTDOCS%%%%DOCSDIR%%/mmsnmptrapd.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/multi_ruleset.html
 %%PORTDOCS%%%%DOCSDIR%%/netstream.html