Received: by mail.netbsd.org (Postfix, from userid 605) id D06C084DCD; Tue, 19 May 2020 19:58:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 54D5A84DC4 for ; Tue, 19 May 2020 19:58:59 +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 wZ_xxed2wFZk for ; Tue, 19 May 2020 19:58:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id ACEBB84CEF for ; Tue, 19 May 2020 19:58:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A6AD1FB27; Tue, 19 May 2020 19:58:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158991833838830" MIME-Version: 1.0 Date: Tue, 19 May 2020 19:58:58 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/sysutils/xentools411 To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200519195858.A6AD1FB27@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. --_----------=_158991833838830 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue May 19 19:58:58 UTC 2020 Modified Files: pkgsrc/sysutils/xentools411: Makefile Log Message: sysutils/xentools411: clean up SUBST blocks Several files have switched from /usr/bin/perl to /usr/bin/env perl. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/xentools411/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158991833838830 Content-Disposition: inline Content-Length: 4082 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/xentools411/Makefile diff -u pkgsrc/sysutils/xentools411/Makefile:1.15 pkgsrc/sysutils/xentools411/Makefile:1.16 --- pkgsrc/sysutils/xentools411/Makefile:1.15 Wed May 13 04:39:04 2020 +++ pkgsrc/sysutils/xentools411/Makefile Tue May 19 19:58:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2020/05/13 04:39:04 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2020/05/19 19:58:58 rillig Exp $ # VERSION= 4.11.3 VERSION_IPXE= 356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d @@ -7,7 +7,7 @@ DIST_IPXE= ipxe-git-${VERSION_IPXE}.tar. DIST_SUBDIR= xen411 DISTNAME= xen-${VERSION} PKGNAME= xentools411-${VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= sysutils MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ @@ -50,6 +50,7 @@ USE_TOOLS+= pod2man gmake pkg-config ma USE_LANGUAGES= c GNU_CONFIGURE= YES +GNU_CONFIGURE_STRICT= no # seabios is for one of the sub-configures #CONFIGURE_ARGS+= --enable-xenapi CONFIGURE_ARGS+= --disable-seabios @@ -72,38 +73,15 @@ REPLACE_PYTHON+= tools/python/scripts/co REPLACE_PYTHON+= tools/python/scripts/verify-stream-v2 REPLACE_PYTHON+= tools/xenmon/xenmon.py tools/misc/xencov_split -SUBST_CLASSES+= perlpath -SUBST_STAGE.perlpath= pre-configure -SUBST_FILES.perlpath= tools/misc/xencov_split -SUBST_FILES.perlpath+= tools/firmware/rombios/makesym.perl -SUBST_FILES.perlpath+= tools/qemu-xen-traditional/texi2pod.pl -SUBST_FILES.perlpath+= tools/examples/xeninfo.pl -SUBST_FILES.perlpath+= tools/include/xen-external/bsd-sys-queue-h-seddery -SUBST_FILES.perlpath+= tools/qemu-xen/scripts/texi2pod.pl -SUBST_FILES.perlpath+= tools/qemu-xen/scripts/get_maintainer.pl -SUBST_FILES.perlpath+= tools/qemu-xen/scripts/checkpatch.pl -SUBST_FILES.perlpath+= tools/libxl/libxl_save_msgs_gen.pl -SUBST_FILES.perlpath+= tools/libxl/check-libxl-api-rules -SUBST_FILES.perlpath+= ../ipxe/src/drivers/infiniband/qib_genbits.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/catrom.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/diffsize.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/disrom.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/get-pci-ids -SUBST_FILES.perlpath+= ../ipxe/src/util/licence.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/mergerom.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/modrom.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/padimg.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/parserom.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/sortobjdump.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/swapdevids.pl -SUBST_FILES.perlpath+= ../ipxe/src/util/symcheck.pl -SUBST_SED.perlpath= -e "s|/usr/bin/perl|${PREFIX}/bin/perl|g" - -SUBST_CLASSES+= pathsvar -SUBST_STAGE.pathsvar= pre-configure -SUBST_FILES.pathsvar= tools/Makefile \ - tools/hotplug/Linux/init.d/sysconfig.xendomains -SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" +REPLACE_PERL+= ../ipxe/src/util/*.pl +REPLACE_PERL+= ../ipxe/src/drivers/infiniband/qib_genbits.pl +REPLACE_PERL+= ../ipxe/src/util/get-pci-ids +REPLACE_PERL+= tools/examples/xeninfo.pl +REPLACE_PERL+= tools/firmware/rombios/makesym.perl +REPLACE_PERL+= tools/include/xen-external/bsd-sys-queue-h-seddery +REPLACE_PERL+= tools/libxl/check-libxl-api-rules +REPLACE_PERL+= tools/libxl/libxl_save_msgs_gen.pl +REPLACE_PERL+= tools/qemu-xen-traditional/*.pl SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure @@ -114,7 +92,7 @@ XEND_SCRIPTS= block vif-bridge vif-ip q SUBST_CLASSES.NetBSD+= proc SUBST_STAGE.proc= pre-configure -SUBST_FILES.proc+= tools/ocaml/xenstored/define.ml +SUBST_FILES.proc+= tools/ocaml/xenstored/select.ml SUBST_SED.proc= -e "s|/proc|/kern|g" SUBST_CLASSES+= getopt @@ -129,15 +107,6 @@ PROCPATH.*= /proc .include "../../mk/bsd.prefs.mk" -SUBST_CLASSES+= procdev -SUBST_STAGE.procdev= pre-configure -SUBST_FILES.procdev= tools/ocaml/xenstored/define.ml -.if ${OPSYS} == "NetBSD" -SUBST_SED.procdev= -e "s|@PROCDEV@|/dev|g" -.else -SUBST_SED.procdev= -e "s|@PROCDEV@|/proc/xen|g" -.endif - .if ${OPSYS} == "NetBSD" MESSAGE_SRC= ${.CURDIR}/MESSAGE ${.CURDIR}/MESSAGE.NetBSD .endif --_----------=_158991833838830--