svn commit: r326520 - head/sysutils/rsyslog7

[Brad Davis]

Author: brd (doc committer)
Date: Fri Sep  6 15:56:54 2013
New Revision: 326520
URL: http://svnweb.freebsd.org/changeset/ports/326520

Log:
  - Update sysutils/rsyslog7 to 7.4.4
  - Make UUID support optional since it not used very often and conflicts with postgres [1]
  
  Changes: http://www.rsyslog.com/changelog-for-7-4-4-v7-stable/
  
  PR:		180139 [1]
  Submitted by:	Sevan Janiyan <venture37 at geeklan.co.uk> [1]
  Reviewed by:	swills@

Modified:
  head/sysutils/rsyslog7/Makefile
  head/sysutils/rsyslog7/distinfo
  head/sysutils/rsyslog7/pkg-descr

Modified: head/sysutils/rsyslog7/Makefile
==============================================================================
--- head/sysutils/rsyslog7/Makefile	Fri Sep  6 15:53:13 2013	(r326519)
+++ head/sysutils/rsyslog7/Makefile	Fri Sep  6 15:56:54 2013	(r326520)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	7.4.3
+PORTVERSION=	7.4.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
@@ -12,8 +12,7 @@ BUILD_DEPENDS=	libgcrypt-config:${PORTSD
 
 LIB_DEPENDS=	ee:${PORTSDIR}/devel/libee \
 		estr:${PORTSDIR}/devel/libestr \
-		json.0:${PORTSDIR}/devel/json-c \
-		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
+		json.0:${PORTSDIR}/devel/json-c
 
 USE_LDCONFIG=	yes
 
@@ -21,7 +20,7 @@ PORTSCOUT=	limit:^7\.4
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP
+OPTIONS_DEFINE=	DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP UUID
 
 DBI_DESC=	LibDBI output module for rsyslog
 GNUTLS_DESC=	GNUTLS module for rsyslog
@@ -31,6 +30,7 @@ PGSQL_DESC=	PostgreSQL output module for
 RELP_DESC=	RELP input/output module for rsyslog
 RFC3195_DESC=	RFC3195 input support for rsyslog
 SNMP_DESC=	SNMP trap sender for rsyslog
+UUID_DESC=	Support for generating a UUID per log message
 
 USES=		pkgconfig
 
@@ -113,6 +113,12 @@ PLIST_FILES+=	lib/rsyslog/omsnmp.la \
 CONFIGURE_ARGS+=--disable-snmp
 .endif
 
+.if ${PORT_OPTIONS:MUUID}
+LIB_DEPENDS+=	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
+.else
+CONFIGURE_ARGS+=--disable-uuid
+.endif
+
 .ifdef WITH_MYSQL_MICROSECONDS
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
 .endif
@@ -137,7 +143,7 @@ CONFIGURE_ARGS+=--enable-rtinst --enable
 CPPFLAGS+=-march=i686
 .endif
 
-CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lsysinfo -lkvm"
+CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm"
 CFLAGS+=	${CPPFLAGS}
 
 MAN8=	rsyslogd.8

Modified: head/sysutils/rsyslog7/distinfo
==============================================================================
--- head/sysutils/rsyslog7/distinfo	Fri Sep  6 15:53:13 2013	(r326519)
+++ head/sysutils/rsyslog7/distinfo	Fri Sep  6 15:56:54 2013	(r326520)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-7.4.3.tar.gz) = d96fcb733452177f5f06789507e06f5c01434d83001c130c9fcdf21e0fffe382
-SIZE (rsyslog-7.4.3.tar.gz) = 2908523
+SHA256 (rsyslog-7.4.4.tar.gz) = 276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087
+SIZE (rsyslog-7.4.4.tar.gz) = 2910075

Modified: head/sysutils/rsyslog7/pkg-descr
==============================================================================
--- head/sysutils/rsyslog7/pkg-descr	Fri Sep  6 15:53:13 2013	(r326519)
+++ head/sysutils/rsyslog7/pkg-descr	Fri Sep  6 15:56:54 2013	(r326520)
@@ -14,6 +14,6 @@ suitable for enterprise-class, encryptio
 chains while at the same time being very easy to setup for the
 novice user.
 
-Tracking v7-devel
+Tracking v7-stable
 
 WWW: http://www.rsyslog.com/