Date: Sat, 15 Dec 2012 09:17:36 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308939 - in head/sysutils/syslog-ng-devel: . files Message-ID: <201212150917.qBF9HaFU017545@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sat Dec 15 09:17:36 2012 New Revision: 308939 URL: http://svnweb.freebsd.org/changeset/ports/308939 Log: Update 3.4.0a3 --> 3.4.0a3 build 176. This is a pre-beta release. Submitted by: Peter Czanik <czanik@balabit.hu> (syslog-ng upline) Modified: head/sysutils/syslog-ng-devel/Makefile head/sysutils/syslog-ng-devel/distinfo head/sysutils/syslog-ng-devel/files/patch-modules-Makefile.in head/sysutils/syslog-ng-devel/pkg-plist Modified: head/sysutils/syslog-ng-devel/Makefile ============================================================================== --- head/sysutils/syslog-ng-devel/Makefile Sat Dec 15 09:05:54 2012 (r308938) +++ head/sysutils/syslog-ng-devel/Makefile Sat Dec 15 09:17:36 2012 (r308939) @@ -7,12 +7,12 @@ PORTNAME= syslog-ng PORTVERSION= 3.4.0a3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -devel DISTVERSION= $(PORTVERSION:S/a/alpha/) -DISTFILES= $(PORTNAME)_$(DISTVERSION).tar.gz -MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/$(DISTVERSION)/source/ +DISTFILES= syslog-ng-3.4.0alpha3-20121210-v3.4.0alpha3-176-gfded.tar.gz +MASTER_SITES= http://packages.madhouse-project.org/syslog-ng/3.4/3.4.0alpha3/ MAINTAINER= cy@FreeBSD.org COMMENT= A powerful syslogd replacement @@ -29,8 +29,7 @@ OPTIONS= SYS_SSL "Build with OpenSSL sup IPV6 "Build with IPV6 support" on \ PCRE "Build with PCRE support" on \ SMTP "Build with SMTP support" off \ - JSON_C "Build with JSON-C support" off \ - JSON_GLIB "Build with JSON-GLIB support" off \ + JSON "Build with JSON-C support" off \ .include <bsd.port.options.mk> @@ -121,19 +120,10 @@ PLIST_FILES+= lib/syslog-ng/libafsql.la CONFIGURE_ARGS+= --disable-sql .endif -.if defined(WITH_JSON_C) && defined(WITH_JSON_GLIB) -BROKEN= JSON_C and JSON_GLIB are mutually exclusive -.endif - -.if defined(WITH_JSON_GLIB) -LIB_DEPENDS+= json-glib-1.0.0:${PORTSDIR}/devel/json-glib -CONFIGURE_ARGS+= --with-json=json-glib -PLIST_FILES+= lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so -.elif defined(WITH_JSON_C) +.if defined(WITH_JSON) LIB_DEPENDS+= json.0:${PORTSDIR}/devel/json-c -CONFIGURE_ARGS+= --with-json=json-c -PLIST_FILES+= lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so -PLIST_FILES+= lib/syslog-ng/libjsonparser.so lib/syslog-ng/libjsonparser.la +CONFIGURE_ARGS+= --enable-json +PLIST_FILES+= lib/syslog-ng/libjson-plugin.la lib/syslog-ng/libjson-plugin.so .else CONFIGURE_ARGS+= --disable-json .endif @@ -145,13 +135,6 @@ CONFIGURE_ARGS+= --disable-linux- post-patch: @${REINPLACE_CMD} -e 's:libnet-config:libnet115-config:g' ${WRKSRC}/configure @${LN} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist -.if ${OSVERSION} >= 900007 - @${REINPLACE_CMD} \ - -e 's|utmp|utmpx|' -e 's|getutent|getutxent|' \ - -e 's|ut_name|ut_user|' \ - ${WRKSRC}/configure ${WRKSRC}/modules/afuser/afuser.c \ - ${WRKSRC}/lib/utils.c ${WRKSRC}/lib/utils.h -.endif post-install: .if !defined(NOPORTDOCS) Modified: head/sysutils/syslog-ng-devel/distinfo ============================================================================== --- head/sysutils/syslog-ng-devel/distinfo Sat Dec 15 09:05:54 2012 (r308938) +++ head/sysutils/syslog-ng-devel/distinfo Sat Dec 15 09:17:36 2012 (r308939) @@ -1,2 +1,2 @@ -SHA256 (syslog-ng_3.4.0alpha3.tar.gz) = a8534c72ffad7f74bcb96429580615ecbbf72895db3becee0ddacf6331167f10 -SIZE (syslog-ng_3.4.0alpha3.tar.gz) = 2623951 +SHA256 (syslog-ng-3.4.0alpha3-20121210-v3.4.0alpha3-176-gfded.tar.gz) = 1c76e78cf4e2d8edf0640872412cf4888b312ea0ab2c9ab895775567b9b7b577 +SIZE (syslog-ng-3.4.0alpha3-20121210-v3.4.0alpha3-176-gfded.tar.gz) = 3178463 Modified: head/sysutils/syslog-ng-devel/files/patch-modules-Makefile.in ============================================================================== --- head/sysutils/syslog-ng-devel/files/patch-modules-Makefile.in Sat Dec 15 09:05:54 2012 (r308938) +++ head/sysutils/syslog-ng-devel/files/patch-modules-Makefile.in Sat Dec 15 09:17:36 2012 (r308939) @@ -1,13 +0,0 @@ ---- modules/Makefile.in.orig 2012-04-05 10:46:11.219706762 -0700 -+++ modules/Makefile.in 2012-04-05 12:45:02.702508603 -0700 -@@ -265,7 +265,9 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb afsmtp csvparser confgen syslogformat pacctformat basicfuncs dbparser tfjson tfuuid jsonparser -+# XXX Temporarily afsmtp build temporarily broken -+# XXX SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb afsmtp csvparser confgen syslogformat pacctformat basicfuncs dbparser tfjson tfuuid jsonparser -+SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb csvparser confgen syslogformat pacctformat basicfuncs dbparser tfjson tfuuid jsonparser - all: all-recursive - - .SUFFIXES: Modified: head/sysutils/syslog-ng-devel/pkg-plist ============================================================================== --- head/sysutils/syslog-ng-devel/pkg-plist Sat Dec 15 09:05:54 2012 (r308938) +++ head/sysutils/syslog-ng-devel/pkg-plist Sat Dec 15 09:17:36 2012 (r308939) @@ -35,6 +35,16 @@ include/syslog-ng/logmsg.h include/syslog-ng/logparser.h include/syslog-ng/logpipe.h include/syslog-ng/logproto.h +include/syslog-ng/logproto-buffered-server.h +include/syslog-ng/logproto-builtins.h +include/syslog-ng/logproto-client.h +include/syslog-ng/logproto-dgram-server.h +include/syslog-ng/logproto-framed-client.h +include/syslog-ng/logproto-framed-server.h +include/syslog-ng/logproto-record-server.h +include/syslog-ng/logproto-server.h +include/syslog-ng/logproto-text-client.h +include/syslog-ng/logproto-text-server.h include/syslog-ng/logqueue-fifo.h include/syslog-ng/logqueue.h include/syslog-ng/logreader.h @@ -78,10 +88,14 @@ lib/libsyslog-ng.la lib/libsyslog-ng.so lib/libsyslog-ng-3.4.0alpha3.so libdata/pkgconfig/syslog-ng.pc +lib/syslog-ng/libcryptofuncs.la +lib/syslog-ng/libcryptofuncs.so lib/syslog-ng/libaffile.la lib/syslog-ng/libaffile.so lib/syslog-ng/libafmongodb.la lib/syslog-ng/libafmongodb.so +lib/syslog-ng/libafamqp.la +lib/syslog-ng/libafamqp.so lib/syslog-ng/libafprog.la lib/syslog-ng/libafprog.so lib/syslog-ng/libafsocket-notls.la @@ -101,13 +115,12 @@ lib/syslog-ng/libsyslog-ng-crypto.la lib/syslog-ng/libsyslog-ng-crypto.so lib/syslog-ng/libsyslogformat.la lib/syslog-ng/libsyslogformat.so -lib/syslog-ng/libtfuuid.so -lib/syslog-ng/libtfuuid.la +lib/syslog-ng/libsystem-source.la +lib/syslog-ng/libsystem-source.so share/include/scl/pacct/plugin.conf share/include/scl/syslogconf/README share/include/scl/syslogconf/convert-syslogconf.awk share/include/scl/syslogconf/plugin.conf -share/include/scl/system/generate-system-source.sh share/include/scl/system/plugin.conf share/tools/cfg-grammar.y share/tools/lex-rules.am
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212150917.qBF9HaFU017545>