Received: by mail.netbsd.org (Postfix, from userid 605) id 1744D84E01; Mon, 20 Nov 2017 21:14:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9704F84DDB for ; Mon, 20 Nov 2017 21:14:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id NEAmMMJzmmHd for ; Mon, 20 Nov 2017 21:14:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CB2E884C2E for ; Mon, 20 Nov 2017 21:14:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C66A8FB40; Mon, 20 Nov 2017 21:14:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151121246036430" MIME-Version: 1.0 Date: Mon, 20 Nov 2017 21:14:20 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2017Q3] pkgsrc/net To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20171120211420.C66A8FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_151121246036430 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Mon Nov 20 21:14:20 UTC 2017 Modified Files: pkgsrc/net/nagios-plugin-ldap [pkgsrc-2017Q3]: Makefile pkgsrc/net/nagios-plugins [pkgsrc-2017Q3]: Makefile.common distinfo pkgsrc/net/nagios-plugins/patches [pkgsrc-2017Q3]: patch-configure Log Message: Pullup ticket #5645 - requested by taca net/nagios-plugin-ldap: build fix Revisions pulled up: - net/nagios-plugin-ldap/Makefile 1.19 - net/nagios-plugins/Makefile.common 1.15 - net/nagios-plugins/distinfo 1.23 - net/nagios-plugins/patches/patch-configure 1.4 --- Module Name: pkgsrc Committed By: taca Date: Wed Nov 8 03:20:49 UTC 2017 Modified Files: pkgsrc/net/nagios-plugin-ldap: Makefile pkgsrc/net/nagios-plugins: Makefile.common distinfo pkgsrc/net/nagios-plugins/patches: patch-configure Log Message: net/nagios-plugin-ldap: fix build problem Fix build problem of nagios-plugin-ldap using --with-ldap option of configure. This is minimum change to build fix for nagios-plugin-ldap. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.4.1 pkgsrc/net/nagios-plugin-ldap/Makefile cvs rdiff -u -r1.14 -r1.14.4.1 pkgsrc/net/nagios-plugins/Makefile.common cvs rdiff -u -r1.22 -r1.22.4.1 pkgsrc/net/nagios-plugins/distinfo cvs rdiff -u -r1.3 -r1.3.4.1 \ pkgsrc/net/nagios-plugins/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_151121246036430 Content-Disposition: inline Content-Length: 3856 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/nagios-plugin-ldap/Makefile diff -u pkgsrc/net/nagios-plugin-ldap/Makefile:1.18 pkgsrc/net/nagios-plugin-ldap/Makefile:1.18.4.1 --- pkgsrc/net/nagios-plugin-ldap/Makefile:1.18 Tue Jul 4 19:48:52 2017 +++ pkgsrc/net/nagios-plugin-ldap/Makefile Mon Nov 20 21:14:20 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2017/07/04 19:48:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.18.4.1 2017/11/20 21:14:20 bsiegert Exp $ # PKGNAME= nagios-plugin-ldap-${PLUGINSVERSION} @@ -14,6 +14,8 @@ DEPENDS+= nagios-plugins-${PLUGINSVERSIO BINARY_TARGET= check_ldap +CONFIGURE_ARGS+= --with-ldap=yes + .include "../../net/nagios-plugins/Makefile.plugin" .include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" Index: pkgsrc/net/nagios-plugins/Makefile.common diff -u pkgsrc/net/nagios-plugins/Makefile.common:1.14 pkgsrc/net/nagios-plugins/Makefile.common:1.14.4.1 --- pkgsrc/net/nagios-plugins/Makefile.common:1.14 Sun Sep 10 14:11:30 2017 +++ pkgsrc/net/nagios-plugins/Makefile.common Mon Nov 20 21:14:20 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2017/09/10 14:11:30 joerg Exp $ +# $NetBSD: Makefile.common,v 1.14.4.1 2017/11/20 21:14:20 bsiegert Exp $ # # used by net/nagios-plugin-ldap/Makefile # used by net/nagios-plugin-mysql/Makefile @@ -23,5 +23,6 @@ CONFIGURE_ARGS.DragonFly+= fu_cv_sys_sta CONFIGURE_ARGS+= --with-nagios-user=${NAGIOS_USER:Q} CONFIGURE_ARGS+= --with-nagios-group=${NAGIOS_GROUP:Q} CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/nagios +CONFIGURE_ARGS+= --with-ldap=no CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} Index: pkgsrc/net/nagios-plugins/distinfo diff -u pkgsrc/net/nagios-plugins/distinfo:1.22 pkgsrc/net/nagios-plugins/distinfo:1.22.4.1 --- pkgsrc/net/nagios-plugins/distinfo:1.22 Sat Sep 9 22:47:35 2017 +++ pkgsrc/net/nagios-plugins/distinfo Mon Nov 20 21:14:20 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2017/09/09 22:47:35 joerg Exp $ +$NetBSD: distinfo,v 1.22.4.1 2017/11/20 21:14:20 bsiegert Exp $ SHA1 (nagios-plugins-2.2.1.tar.gz) = 0d3fc8876343a906f0dcc2c00850e4ad956a150a RMD160 (nagios-plugins-2.2.1.tar.gz) = 39c364ac08854a1829d47562d4add1ae58a49334 @@ -8,7 +8,7 @@ SHA1 (patch-ad) = cad52f9d8c5a6b53a1b512 SHA1 (patch-af) = 12ea1194eee95ea15ecc6d7daedd10eb9541ee6e SHA1 (patch-ah) = 99b5eb4896262f5aa1de60e9f42c395a59794a6b SHA1 (patch-an) = a6adf179db754f98b2da118a8c1101edda026fbc -SHA1 (patch-configure) = d418b81f06e22b769cd187a77f45f0add605698e +SHA1 (patch-configure) = 8a805fd88735b7b1c9cb96a974a1e6216ff23d2e SHA1 (patch-gl_gettext.h) = 37d14b4472f678bd84c13183e0fb263cd17f6ac5 SHA1 (patch-plugins-root_Makefile.in) = 46e8968df375ca35d453e36c277d4052f125897b SHA1 (patch-plugins-scripts_check__breeze.pl) = 57ffda78989fd0d0c0fa26c74b7f53bd083dab4f Index: pkgsrc/net/nagios-plugins/patches/patch-configure diff -u pkgsrc/net/nagios-plugins/patches/patch-configure:1.3 pkgsrc/net/nagios-plugins/patches/patch-configure:1.3.4.1 --- pkgsrc/net/nagios-plugins/patches/patch-configure:1.3 Tue Jul 4 19:45:18 2017 +++ pkgsrc/net/nagios-plugins/patches/patch-configure Mon Nov 20 21:14:20 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.3 2017/07/04 19:45:18 jperkin Exp $ +$NetBSD: patch-configure,v 1.3.4.1 2017/11/20 21:14:20 bsiegert Exp $ Disable all the plugins which are installed by the nagios-plugin-* packages. @@ -13,15 +13,6 @@ Disable all the plugins which are instal EXTRAS="$EXTRAS check_radius\$(EXEEXT)" RADIUSLIBS="-lradiusclient" -@@ -17518,7 +17518,7 @@ _ACEOF - - fi - -- if test "$ac_cv_lib_ldap_main" = "yes"; then -+ if false; then - LDAPLIBS="-lldap -llber"\ - LDAPINCLUDE="-I/usr/include/ldap" - @@ -18947,6 +18947,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ --_----------=_151121246036430--