svn commit: r310214 - head/sysutils/syslog-ng-devel

[Cy Schubert]

Author: cy
Date: Fri Jan 11 00:56:23 2013
New Revision: 310214
URL: http://svnweb.freebsd.org/changeset/ports/310214

Log:
  Update from 3.4.0beta1 to 3.4.0rc1
  
  Submitted by:	Peter Czanik <czanik at balabit.hu> (our syslog-ng upline)

Modified:
  head/sysutils/syslog-ng-devel/Makefile
  head/sysutils/syslog-ng-devel/distinfo
  head/sysutils/syslog-ng-devel/pkg-plist

Modified: head/sysutils/syslog-ng-devel/Makefile
==============================================================================
--- head/sysutils/syslog-ng-devel/Makefile	Fri Jan 11 00:51:48 2013	(r310213)
+++ head/sysutils/syslog-ng-devel/Makefile	Fri Jan 11 00:56:23 2013	(r310214)
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.4.0b1
+PORTVERSION=	3.4.0r1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-DISTVERSION=	$(PORTVERSION:S/b/beta/)
+DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
 DISTFILES=	syslog-ng_${DISTVERSION}.tar.gz
 MASTER_SITES=	http://www.balabit.com/downloads/files?path=/syslog-ng/open-source-edition/${DISTVERSION}/source/
 
@@ -29,6 +29,7 @@ OPTIONS=	SYS_SSL "Build with OpenSSL sup
 		PCRE "Build with PCRE support" on \
 		SMTP "Build with SMTP support" off \
 		JSON "Build with JSON-C support" off \
+		GEOIP "Build with GeoIP support" off \
 
 .include <bsd.port.options.mk>
 
@@ -102,6 +103,15 @@ LIB_DEPENDS+=		pcre:${PORTSDIR}/devel/pc
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
+.if defined(WITH_GEOIP)
+CONFIGURE_ARGS+=	--enable-geoip
+LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
+CONFIGURE_ENV+=		GEOIP_LIBS="-lGeoIP"
+PLIST_FILES+=		lib/syslog-ng/libtfgeoip.la lib/syslog-ng/libtfgeoip.so
+.else
+CONFIGURE_ARGS+=	--disable-geoip
+.endif
+
 .if defined(WITH_SMTP)
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
 LIB_DEPENDS+=		esmtp.7:${PORTSDIR}/mail/libesmtp

Modified: head/sysutils/syslog-ng-devel/distinfo
==============================================================================
--- head/sysutils/syslog-ng-devel/distinfo	Fri Jan 11 00:51:48 2013	(r310213)
+++ head/sysutils/syslog-ng-devel/distinfo	Fri Jan 11 00:56:23 2013	(r310214)
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.4.0beta1.tar.gz) = 7adf8a7706b531bffc1f10a64eb892c04c3278da436927155aaae59ce06c9704
-SIZE (syslog-ng_3.4.0beta1.tar.gz) = 3214545
+SHA256 (syslog-ng_3.4.0rc1.tar.gz) = aa611c70297bcdf89928390f3a21612590f84724a41f2076c527f4e1dafb62c7
+SIZE (syslog-ng_3.4.0rc1.tar.gz) = 3345313

Modified: head/sysutils/syslog-ng-devel/pkg-plist
==============================================================================
--- head/sysutils/syslog-ng-devel/pkg-plist	Fri Jan 11 00:51:48 2013	(r310213)
+++ head/sysutils/syslog-ng-devel/pkg-plist	Fri Jan 11 00:56:23 2013	(r310214)
@@ -86,7 +86,7 @@ include/syslog-ng/uuid.h
 include/syslog-ng/vptransform.h
 lib/libsyslog-ng.la
 lib/libsyslog-ng.so
-lib/libsyslog-ng-3.4.0beta1.so
+lib/libsyslog-ng-3.4.0rc1.so
 libdata/pkgconfig/syslog-ng.pc
 lib/syslog-ng/libcryptofuncs.la
 lib/syslog-ng/libcryptofuncs.so