Mon Jun 8 19:25:03 2020 UTC ()
sysutils/xentools48: fix SUBST blocks

The additional 1s,/usr/bin/env is necessary for parserom.pl, which
differs from the other Perl files in that directory.

The pathsvar block is a no-op since tools/Makefile does not contain
"/var" anymore and the other file has been converted to GNU autoconf for
replacing the placeholders.


(rillig)
diff -r1.33 -r1.34 pkgsrc/sysutils/xentools48/Makefile
cvs diff -r1.33 -r1.34 pkgsrc/sysutils/xentools48/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools48/Attic/Makefile 2020/06/06 04:09:44 1.33
+++ pkgsrc/sysutils/xentools48/Attic/Makefile 2020/06/08 19:25:03 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2020/06/06 04:09:44 rillig Exp $ 1# $NetBSD: Makefile,v 1.34 2020/06/08 19:25:03 rillig Exp $
2# 2#
3VERSION= 4.8.5 3VERSION= 4.8.5
4VERSION_IPXE= 827dd1bfee67daa683935ce65316f7e0f057fe1c 4VERSION_IPXE= 827dd1bfee67daa683935ce65316f7e0f057fe1c
5DIST_IPXE= ipxe-git-${VERSION_IPXE}.tar.gz 5DIST_IPXE= ipxe-git-${VERSION_IPXE}.tar.gz
6DIST_NEWLIB= newlib-1.16.0.tar.gz 6DIST_NEWLIB= newlib-1.16.0.tar.gz
7DIST_LWIP= lwip-1.3.0.tar.gz 7DIST_LWIP= lwip-1.3.0.tar.gz
8DIST_GRUB= grub-0.97.tar.gz 8DIST_GRUB= grub-0.97.tar.gz
9DIST_GMP= gmp-4.3.2.tar.bz2 9DIST_GMP= gmp-4.3.2.tar.bz2
10DIST_OCAML= ocaml-3.11.0.tar.gz 10DIST_OCAML= ocaml-3.11.0.tar.gz
11DIST_POLARSSL= polarssl-1.1.4-gpl.tgz 11DIST_POLARSSL= polarssl-1.1.4-gpl.tgz
12DIST_TPMEMU= tpm_emulator-0.7.4.tar.gz 12DIST_TPMEMU= tpm_emulator-0.7.4.tar.gz
13DIST_ZLIB= zlib-1.2.3.tar.gz 13DIST_ZLIB= zlib-1.2.3.tar.gz
14DIST_LIBPCI= pciutils-2.2.9.tar.bz2 14DIST_LIBPCI= pciutils-2.2.9.tar.bz2
@@ -127,32 +127,27 @@ SUBST_FILES.perlpath+= ../ipxe/src/drive @@ -127,32 +127,27 @@ SUBST_FILES.perlpath+= ../ipxe/src/drive
127SUBST_FILES.perlpath+= ../ipxe/src/util/catrom.pl 127SUBST_FILES.perlpath+= ../ipxe/src/util/catrom.pl
128SUBST_FILES.perlpath+= ../ipxe/src/util/diffsize.pl 128SUBST_FILES.perlpath+= ../ipxe/src/util/diffsize.pl
129SUBST_FILES.perlpath+= ../ipxe/src/util/disrom.pl 129SUBST_FILES.perlpath+= ../ipxe/src/util/disrom.pl
130SUBST_FILES.perlpath+= ../ipxe/src/util/get-pci-ids 130SUBST_FILES.perlpath+= ../ipxe/src/util/get-pci-ids
131SUBST_FILES.perlpath+= ../ipxe/src/util/licence.pl 131SUBST_FILES.perlpath+= ../ipxe/src/util/licence.pl
132SUBST_FILES.perlpath+= ../ipxe/src/util/mergerom.pl 132SUBST_FILES.perlpath+= ../ipxe/src/util/mergerom.pl
133SUBST_FILES.perlpath+= ../ipxe/src/util/modrom.pl 133SUBST_FILES.perlpath+= ../ipxe/src/util/modrom.pl
134SUBST_FILES.perlpath+= ../ipxe/src/util/padimg.pl 134SUBST_FILES.perlpath+= ../ipxe/src/util/padimg.pl
135SUBST_FILES.perlpath+= ../ipxe/src/util/parserom.pl 135SUBST_FILES.perlpath+= ../ipxe/src/util/parserom.pl
136SUBST_FILES.perlpath+= ../ipxe/src/util/sortobjdump.pl 136SUBST_FILES.perlpath+= ../ipxe/src/util/sortobjdump.pl
137SUBST_FILES.perlpath+= ../ipxe/src/util/swapdevids.pl 137SUBST_FILES.perlpath+= ../ipxe/src/util/swapdevids.pl
138SUBST_FILES.perlpath+= ../ipxe/src/util/symcheck.pl 138SUBST_FILES.perlpath+= ../ipxe/src/util/symcheck.pl
139SUBST_SED.perlpath= -e "s|/usr/bin/perl|${PREFIX}/bin/perl|g" 139SUBST_SED.perlpath= -e "s|/usr/bin/perl|${PREFIX}/bin/perl|g"
140 140SUBST_SED.perlpath+= -e '1s,/usr/bin/env perl,${PREFIX}/bin/perl,'
141SUBST_CLASSES+= pathsvar 
142SUBST_STAGE.pathsvar= pre-configure 
143SUBST_FILES.pathsvar= tools/Makefile \ 
144 tools/hotplug/Linux/init.d/sysconfig.xendomains 
145SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" 
146 141
147SUBST_CLASSES+= conf 142SUBST_CLASSES+= conf
148SUBST_STAGE.conf= pre-configure 143SUBST_STAGE.conf= pre-configure
149SUBST_FILES.conf= tools/libxl/xl_cmdtable.c 144SUBST_FILES.conf= tools/libxl/xl_cmdtable.c
150SUBST_FILES.conf+= docs/misc/xl-disk-configuration.txt 145SUBST_FILES.conf+= docs/misc/xl-disk-configuration.txt
151SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" 146SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
152 147
153XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh locking.sh 148XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh locking.sh
154 149
155SUBST_CLASSES.NetBSD+= proc 150SUBST_CLASSES.NetBSD+= proc
156SUBST_STAGE.proc= pre-configure 151SUBST_STAGE.proc= pre-configure
157SUBST_FILES.proc+= tools/ocaml/xenstored/define.ml 152SUBST_FILES.proc+= tools/ocaml/xenstored/define.ml
158SUBST_SED.proc= -e "s|/proc|/kern|g" 153SUBST_SED.proc= -e "s|/proc|/kern|g"