Received: by mail.netbsd.org (Postfix, from userid 605) id 8D4FB84DAC; Sun, 29 Oct 2017 16:47:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 18F3184D9E for ; Sun, 29 Oct 2017 16:47:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id BPt-Fjf7GUuN for ; Sun, 29 Oct 2017 16:47:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6AF4A84D5A for ; Sun, 29 Oct 2017 16:47:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6108FFBDE; Sun, 29 Oct 2017 16:47:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1509295622188550" MIME-Version: 1.0 Date: Sun, 29 Oct 2017 16:47:02 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/devel/libidn2 To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20171029164702.6108FFBDE@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. --_----------=_1509295622188550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Sun Oct 29 16:47:02 UTC 2017 Modified Files: pkgsrc/devel/libidn2: Makefile Log Message: libidn2: Fix installation if gtk-doc package is already installed By default libidn2 is configured with `--disable-gtk-doc'. However, despite that, it will checks several `gtkdoc-*' tools anyway, ending in a failure during the installation phase because only a couple of them are available. Add a kludge via CONFIGURE_ENV to avoid picking up gtkdoc-* tools. Pointed out by via PR pkg/52667. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libidn2/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1509295622188550 Content-Disposition: inline Content-Length: 978 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libidn2/Makefile diff -u pkgsrc/devel/libidn2/Makefile:1.4 pkgsrc/devel/libidn2/Makefile:1.5 --- pkgsrc/devel/libidn2/Makefile:1.4 Wed Aug 30 15:22:30 2017 +++ pkgsrc/devel/libidn2/Makefile Sun Oct 29 16:47:02 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2017/08/30 15:22:30 schmonz Exp $ +# $NetBSD: Makefile,v 1.5 2017/10/29 16:47:02 leot Exp $ DISTNAME= libidn2-2.0.4 CATEGORIES= devel @@ -15,6 +15,13 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= libidn2.pc.in INFO_FILES= yes +# XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc +# XXX: package is installed and then fails in the installation phase. +CONFIGURE_ENV+= ac_cv_prog_GTKDOC_CHECK= \ + ac_cv_path_GTKDOC_CHECK_PATH= \ + ac_cv_path_GTKDOC_REBASE= \ + ac_cv_path_GTKDOC_MKPDF= + .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../textproc/libunistring/buildlink3.mk" --_----------=_1509295622188550--