From owner-svn-ports-head@freebsd.org Sun Jul 7 10:59:45 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9C2815E1B23; Sun, 7 Jul 2019 10:59:45 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 521AE810BD; Sun, 7 Jul 2019 10:59:45 +0000 (UTC) (envelope-from matthew@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2AEAF27E46; Sun, 7 Jul 2019 10:59:45 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x67AxjJw030985; Sun, 7 Jul 2019 10:59:45 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x67Axjfj030984; Sun, 7 Jul 2019 10:59:45 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201907071059.x67Axjfj030984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sun, 7 Jul 2019 10:59:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506127 - head/sysutils/rsyslog8 X-SVN-Group: ports-head X-SVN-Commit-Author: matthew X-SVN-Commit-Paths: head/sysutils/rsyslog8 X-SVN-Commit-Revision: 506127 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 521AE810BD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.940,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 07 Jul 2019 10:59:46 -0000 Author: matthew Date: Sun Jul 7 10:59:44 2019 New Revision: 506127 URL: https://svnweb.freebsd.org/changeset/ports/506127 Log: Use the autoconf caching mechanism to set two variables thus preventing configure from finding libinotify even if it is present. This will have no effect on packages built in a clean environment, but it will make it easier to just build ad-hoc out of the ports tree. Submitted by: koobs Reported by: atari83 Differential Revision: https://reviews.freebsd.org/D20815 Modified: head/sysutils/rsyslog8/Makefile Modified: head/sysutils/rsyslog8/Makefile ============================================================================== --- head/sysutils/rsyslog8/Makefile Sun Jul 7 10:37:57 2019 (r506126) +++ head/sysutils/rsyslog8/Makefile Sun Jul 7 10:59:44 2019 (r506127) @@ -19,13 +19,10 @@ LIB_DEPENDS= libee.so:devel/libee \ libcurl.so:ftp/curl BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} -PORTSCOUT= limit:^8\. - USES= libtool pkgconfig autoreconf python:env - USE_LDCONFIG= yes -CONFLICTS_BUILD= libinotify-* +PORTSCOUT= limit:^8\. OPTIONS_DEFINE= DBI DOCS ELASTIC GCRYPT GSSAPI HTTP JSONPARSE KAFKA \ MYSQL NORMALIZE PGSQL RABBITMQ RELP SNMP @@ -72,7 +69,7 @@ JSONPARSE_PLIST_FILES= lib/rsyslog/mmjsonparse.so KAFKA_DESC= Kafka input/output module for rsyslog KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka -KAFKA_CONFIGURE_ENABLE= imkafka omkafka +KAFKA_CONFIGURE_ENABLE= imkafka omkafka KAFKA_PLIST_FILES= lib/rsyslog/imkafka.so \ lib/rsyslog/omkafka.so @@ -147,7 +144,8 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-imdiag --enable-imfile --enable-impstats \ --enable-mail --enable-omprog --enable-omstdout \ - --enable-omuxsock --enable-rfc3195 --disable-testbench + --enable-omuxsock --enable-rfc3195 --disable-testbench \ + ac_cv_func_inotify_init=no ac_cv_header_sys_inotify_h=no .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200061 CONFIGURE_ARGS+= --enable-imuxsock-rfc5424