From owner-svn-ports-head@freebsd.org Tue Aug 16 05:45:43 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37ECFBBB0FF; Tue, 16 Aug 2016 05:45:43 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 140A8151C; Tue, 16 Aug 2016 05:45:43 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7G5jg2H029218; Tue, 16 Aug 2016 05:45:42 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7G5jgQw029216; Tue, 16 Aug 2016 05:45:42 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201608160545.u7G5jgQw029216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 16 Aug 2016 05:45:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420266 - head/sysutils/syslog-ng-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Aug 2016 05:45:43 -0000 Author: cy Date: Tue Aug 16 05:45:41 2016 New Revision: 420266 URL: https://svnweb.freebsd.org/changeset/ports/420266 Log: Fix build due to missing dependencies and false detection of mongodb. Change reminder for when this port replaces PORTREVISION with DISTVERSION when next beta is available. This is to avoid a PORTEPOCH bump. Modified: head/sysutils/syslog-ng-devel/Makefile head/sysutils/syslog-ng-devel/pkg-plist Modified: head/sysutils/syslog-ng-devel/Makefile ============================================================================== --- head/sysutils/syslog-ng-devel/Makefile Mon Aug 15 20:32:24 2016 (r420265) +++ head/sysutils/syslog-ng-devel/Makefile Tue Aug 16 05:45:41 2016 (r420266) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= syslog-ng -# XXX Should be: PORTVERSION= 3.8.0.b2 -# XXX update at 3.8.1. +# XXX As of 3.8.1beta1, replace PORTVERSION with DISTVERSION=3.8.1beta1 PORTVERSION= 3.8.0b2 +PORTREVISION= 1 PKGNAMESUFFIX= -devel CATEGORIES= sysutils -# XXX Should be: DISTVERSION= ${PORTVERSION:S/.a/alpha/:S/.b/beta/:S/.r/rc/} -# XXX update at 3.8.1. +# XXX As of 3.8.1beta1, delete the following line. DISTVERSION= ${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/} DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -19,7 +18,9 @@ COMMENT= Powerful syslogd replacement BROKEN_powerpc64= Does not build LIB_DEPENDS= libevtlog.so:sysutils/eventlog \ - libpcre.so:devel/pcre + libpcre.so:devel/pcre \ + libcurl.so:ftp/curl \ + libuuid.so:misc/e2fsprogs-libuuid CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ @@ -27,7 +28,7 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON MONGO OPTIONS_DEFAULT= JSON TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support @@ -40,7 +41,8 @@ REDIS_DESC= Build with Redis support JAVA_DESC= Build with Java support (and modules, like Elastic) PYTHON_DESC= Build with Python 2.7 support -USES= autoreconf:build gmake libtool pathfix pkgconfig ssl +USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ + gettext-runtime USE_LDCONFIG= yes USE_RC_SUBR= syslog-ng GNU_CONFIGURE= yes @@ -114,6 +116,15 @@ PLIST_FILES+= lib/syslog-ng/libafsql.so CONFIGURE_ARGS+= --disable-sql .endif +.if ${PORT_OPTIONS:MMONGO} +BUILD_DEPENDS+= mongo:databases/mongodb +RUN_DEPENDS+= mongo:databases/mongodb +CONFIGURE_ARGS+= --enable-mongodb +PLIST_FILES+= lib/syslog-ng/libafmongodb.so +.else +CONFIGURE_ARGS+= --disable-mongodb +.endif + .if ${PORT_OPTIONS:MJSON} LIB_DEPENDS+= libjson-c.so:devel/json-c CONFIGURE_ARGS+= --enable-json Modified: head/sysutils/syslog-ng-devel/pkg-plist ============================================================================== --- head/sysutils/syslog-ng-devel/pkg-plist Mon Aug 15 20:32:24 2016 (r420265) +++ head/sysutils/syslog-ng-devel/pkg-plist Tue Aug 16 05:45:41 2016 (r420266) @@ -220,7 +220,6 @@ lib/syslog-ng/libaffile.so lib/syslog-ng/libafprog.so lib/syslog-ng/libafuser.so lib/syslog-ng/libafamqp.so -lib/syslog-ng/libafmongodb.so lib/syslog-ng/libcsvparser.so lib/syslog-ng/libconfgen.so lib/syslog-ng/libcurl.so