Received: by mail.netbsd.org (Postfix, from userid 605) id 0662D84DDC; Tue, 5 May 2020 09:02:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 82C4084D77 for ; Tue, 5 May 2020 09:02:44 +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 KaI42lXVMiOy for ; Tue, 5 May 2020 09:02:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D96EB84D5D for ; Tue, 5 May 2020 09:02:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D1629FB27; Tue, 5 May 2020 09:02:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1588669363158360" MIME-Version: 1.0 Date: Tue, 5 May 2020 09:02:43 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/pkgtools/pkg_install To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20200505090243.D1629FB27@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. --_----------=_1588669363158360 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue May 5 09:02:43 UTC 2020 Modified Files: pkgsrc/pkgtools/pkg_install: Makefile Log Message: pkg_install: Revert part of last commit. We need to use the library Makefile so that libnetpgpverify is built. Fixes bootstrap. To generate a diff of this commit: cvs rdiff -u -r1.228 -r1.229 pkgsrc/pkgtools/pkg_install/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1588669363158360 Content-Disposition: inline Content-Length: 906 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/pkg_install/Makefile diff -u pkgsrc/pkgtools/pkg_install/Makefile:1.228 pkgsrc/pkgtools/pkg_install/Makefile:1.229 --- pkgsrc/pkgtools/pkg_install/Makefile:1.228 Mon May 4 19:14:59 2020 +++ pkgsrc/pkgtools/pkg_install/Makefile Tue May 5 09:02:43 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.228 2020/05/04 19:14:59 agc Exp $ +# $NetBSD: Makefile,v 1.229 2020/05/05 09:02:43 jperkin Exp $ # Notes to package maintainers: # @@ -211,7 +211,7 @@ pre-configure: ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \ -f ${MAKE_FILE} depend all - cd ${WRKDIR}/netpgp && \ + cd ${WRKDIR}/netpgp && ${CP} Makefile.lib.in Makefile.in && \ ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure && \ ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} ${MAKE_PROGRAM} \ ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} all --_----------=_1588669363158360--