Tue Aug 22 17:02:11 2017 UTC ()
Fix with ocaml-findlib update fallout. ocamlfind now includes destdir
resulting in a mismatched PLIST.
PR pkg/52477. Fix by Gary Duzan.

Paranoia bump PKGREVISION


(maya)
diff -r1.5 -r1.6 pkgsrc/sysutils/xentools48/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/xentools48/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/xentools48/patches/patch-tools_ocaml_common.make
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/xentools48/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools48/Attic/Makefile 2017/07/24 11:37:50 1.5
+++ pkgsrc/sysutils/xentools48/Attic/Makefile 2017/08/22 17:02:10 1.6
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.5 2017/07/24 11:37:50 maya Exp $ 1# $NetBSD: Makefile,v 1.6 2017/08/22 17:02:10 maya Exp $
2# 2#
3VERSION= 4.8.0 3VERSION= 4.8.0
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
15 15
16DIST_SUBDIR= xen48 16DIST_SUBDIR= xen48
17DISTNAME= xen-${VERSION} 17DISTNAME= xen-${VERSION}
18PKGNAME= xentools48-${VERSION} 18PKGNAME= xentools48-${VERSION}
19PKGREVISION= 1 19PKGREVISION= 2
20CATEGORIES= sysutils 20CATEGORIES= sysutils
21MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ 21MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
22 22
23DISTFILES= ${DISTNAME}.tar.gz 23DISTFILES= ${DISTNAME}.tar.gz
24 24
25XEN_EXTFILES= http://xenbits.xensource.com/xen-extfiles/ 25XEN_EXTFILES= http://xenbits.xensource.com/xen-extfiles/
26DISTFILES+= ${DIST_IPXE} 26DISTFILES+= ${DIST_IPXE}
27SITES.${DIST_IPXE} += ${XEN_EXTFILES} 27SITES.${DIST_IPXE} += ${XEN_EXTFILES}
28 28
29DISTFILES+= ${DIST_NEWLIB} 29DISTFILES+= ${DIST_NEWLIB}
30SITES.${DIST_NEWLIB} += ${XEN_EXTFILES} 30SITES.${DIST_NEWLIB} += ${XEN_EXTFILES}
31 31
32DISTFILES+= ${DIST_LWIP} 32DISTFILES+= ${DIST_LWIP}
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/xentools48/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools48/Attic/distinfo 2017/03/30 09:15:09 1.1
+++ pkgsrc/sysutils/xentools48/Attic/distinfo 2017/08/22 17:02:10 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.1 2017/03/30 09:15:09 bouyer Exp $ 1$NetBSD: distinfo,v 1.2 2017/08/22 17:02:10 maya Exp $
2 2
3SHA1 (xen48/gmp-4.3.2.tar.bz2) = c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c 3SHA1 (xen48/gmp-4.3.2.tar.bz2) = c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c
4RMD160 (xen48/gmp-4.3.2.tar.bz2) = a8f3f41501ece290c348aeb4444bbea40bc53e71 4RMD160 (xen48/gmp-4.3.2.tar.bz2) = a8f3f41501ece290c348aeb4444bbea40bc53e71
5SHA512 (xen48/gmp-4.3.2.tar.bz2) = 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf 5SHA512 (xen48/gmp-4.3.2.tar.bz2) = 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
6Size (xen48/gmp-4.3.2.tar.bz2) = 1897483 bytes 6Size (xen48/gmp-4.3.2.tar.bz2) = 1897483 bytes
7SHA1 (xen48/grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb 7SHA1 (xen48/grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb
8RMD160 (xen48/grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 8RMD160 (xen48/grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0
9SHA512 (xen48/grub-0.97.tar.gz) = c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb 9SHA512 (xen48/grub-0.97.tar.gz) = c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
10Size (xen48/grub-0.97.tar.gz) = 971783 bytes 10Size (xen48/grub-0.97.tar.gz) = 971783 bytes
11SHA1 (xen48/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz) = 37270d4d39686e29130c51405dbabf670d37b73d 11SHA1 (xen48/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz) = 37270d4d39686e29130c51405dbabf670d37b73d
12RMD160 (xen48/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz) = f780d33d510a83eda0c06cb9fa4732650e337640 12RMD160 (xen48/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz) = f780d33d510a83eda0c06cb9fa4732650e337640
13SHA512 (xen48/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz) = 82ba65e1c676d32b29c71e6395c9506cab952c8f8b03f692e2b50133be8f0c0146d0f22c223262d81a4df579986fde5abc6507869f4965be4846297ef7b4b890 13SHA512 (xen48/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz) = 82ba65e1c676d32b29c71e6395c9506cab952c8f8b03f692e2b50133be8f0c0146d0f22c223262d81a4df579986fde5abc6507869f4965be4846297ef7b4b890
14Size (xen48/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz) = 3656744 bytes 14Size (xen48/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz) = 3656744 bytes
@@ -86,27 +86,27 @@ SHA1 (patch-tools_include_xen-sys_NetBSD @@ -86,27 +86,27 @@ SHA1 (patch-tools_include_xen-sys_NetBSD
86SHA1 (patch-tools_libs_call_netbsd.c) = c5e166212b0069220d9155636b41028f0f7f9e9e 86SHA1 (patch-tools_libs_call_netbsd.c) = c5e166212b0069220d9155636b41028f0f7f9e9e
87SHA1 (patch-tools_libs_call_private.h) = caeaf937ae379836c3187bee97ac0b986af53f9f 87SHA1 (patch-tools_libs_call_private.h) = caeaf937ae379836c3187bee97ac0b986af53f9f
88SHA1 (patch-tools_libs_evtchn_netbsd.c) = 1abb0f128ab0702b606e22f199d297d1e9c0aae5 88SHA1 (patch-tools_libs_evtchn_netbsd.c) = 1abb0f128ab0702b606e22f199d297d1e9c0aae5
89SHA1 (patch-tools_libs_foreignmemory_compat.c) = d90307702b10badb8101684c38e1a32b5bba786f 89SHA1 (patch-tools_libs_foreignmemory_compat.c) = d90307702b10badb8101684c38e1a32b5bba786f
90SHA1 (patch-tools_libs_foreignmemory_netbsd.c) = ac278e3b7e1077272130bf2b83ef613472ae19ea 90SHA1 (patch-tools_libs_foreignmemory_netbsd.c) = ac278e3b7e1077272130bf2b83ef613472ae19ea
91SHA1 (patch-tools_libs_foreignmemory_private.h) = ed97af7fef60ba8752625b19f4e7027a5bc7ac54 91SHA1 (patch-tools_libs_foreignmemory_private.h) = ed97af7fef60ba8752625b19f4e7027a5bc7ac54
92SHA1 (patch-tools_libxl_Makefile) = 6ae383af726e2525c74f5d58b1a8893e55694217 92SHA1 (patch-tools_libxl_Makefile) = 6ae383af726e2525c74f5d58b1a8893e55694217
93SHA1 (patch-tools_libxl_libxl__create.c) = 8d4984705fff4a3907cc2a436115c400ef732141 93SHA1 (patch-tools_libxl_libxl__create.c) = 8d4984705fff4a3907cc2a436115c400ef732141
94SHA1 (patch-tools_libxl_libxl_event.c) = 8147122d03102eccc45c48a7d6ca1aa5d6286040 94SHA1 (patch-tools_libxl_libxl_event.c) = 8147122d03102eccc45c48a7d6ca1aa5d6286040
95SHA1 (patch-tools_libxl_libxl_internal.h) = 613edc0fa055b23f5dc2a2448456d3d6005337fe 95SHA1 (patch-tools_libxl_libxl_internal.h) = 613edc0fa055b23f5dc2a2448456d3d6005337fe
96SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b 96SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b
97SHA1 (patch-tools_libxl_xl__cmdtable.c) = 073c08795af8ec828c60864a788c32e9cca31547 97SHA1 (patch-tools_libxl_xl__cmdtable.c) = 073c08795af8ec828c60864a788c32e9cca31547
98SHA1 (patch-tools_libxl_xl_cmdimpl.c) = d43beffad3c6da70cb69b2b5d3cf0b48f614e2a6 98SHA1 (patch-tools_libxl_xl_cmdimpl.c) = d43beffad3c6da70cb69b2b5d3cf0b48f614e2a6
99SHA1 (patch-tools_ocaml_common.make) = 423d241ec7dc93faf4ec0bf15f9d3c1f34f42646 99SHA1 (patch-tools_ocaml_common.make) = b73a72e64c42176a178bb8d9e37c6c9867055146
100SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5 100SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
101SHA1 (patch-tools_ocaml_xenstored_define.ml) = 1f12a8a853b847b80e2c3bb5919ed2410a70092f 101SHA1 (patch-tools_ocaml_xenstored_define.ml) = 1f12a8a853b847b80e2c3bb5919ed2410a70092f
102SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 560b26b6d5030838721ddb4e3d819766c3db0349 102SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 560b26b6d5030838721ddb4e3d819766c3db0349
103SHA1 (patch-tools_pygrub_Makefile) = 662d296b0687e73ef459714e1276b067ad8f4de9 103SHA1 (patch-tools_pygrub_Makefile) = 662d296b0687e73ef459714e1276b067ad8f4de9
104SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60 104SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60
105SHA1 (patch-tools_qemu-xen-traditional_block-raw-posix.c) = eb3efea4b0c7fd744f627f1926fca737ba826b99 105SHA1 (patch-tools_qemu-xen-traditional_block-raw-posix.c) = eb3efea4b0c7fd744f627f1926fca737ba826b99
106SHA1 (patch-tools_qemu-xen-traditional_configure) = 6a42dcac010f90439a347c0f6e886b07185cb19a 106SHA1 (patch-tools_qemu-xen-traditional_configure) = 6a42dcac010f90439a347c0f6e886b07185cb19a
107SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea 107SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea
108SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e 108SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e
109SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1 109SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1
110SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.h) = 6edb7a9a03d99b84801bf595c4d68acbc361bb4b 110SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.h) = 6edb7a9a03d99b84801bf595c4d68acbc361bb4b
111SHA1 (patch-tools_qemu-xen-traditional_hw_piix4acpi.c) = 280265db035e239b173efd9d63b629201d2c0cfa 111SHA1 (patch-tools_qemu-xen-traditional_hw_piix4acpi.c) = 280265db035e239b173efd9d63b629201d2c0cfa
112SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a 112SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/xentools48/patches/Attic/patch-tools_ocaml_common.make (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools48/patches/Attic/patch-tools_ocaml_common.make 2017/03/30 09:15:10 1.1
+++ pkgsrc/sysutils/xentools48/patches/Attic/patch-tools_ocaml_common.make 2017/08/22 17:02:11 1.2
@@ -1,13 +1,19 @@ @@ -1,13 +1,19 @@
1$NetBSD: patch-tools_ocaml_common.make,v 1.1 2017/03/30 09:15:10 bouyer Exp $ 1--- tools/ocaml/common.make.orig 2016-12-05 12:03:27.000000000 +0000
2 2+++ tools/ocaml/common.make 2017-08-18 16:00:39.195689939 +0100
3--- tools/ocaml/common.make.orig 2015-01-12 17:53:24.000000000 +0100 
4+++ tools/ocaml/common.make 2015-01-19 13:16:38.000000000 +0100 
5@@ -3,7 +3,7 @@ 3@@ -3,7 +3,7 @@
6 CC ?= gcc 4 CC ?= gcc
7 OCAMLOPT ?= ocamlopt 5 OCAMLOPT ?= ocamlopt
8 OCAMLC ?= ocamlc 6 OCAMLC ?= ocamlc
9-OCAMLMKLIB ?= ocamlmklib 7-OCAMLMKLIB ?= ocamlmklib
10+OCAMLMKLIB ?= ocamlmklib -elfmode 8+OCAMLMKLIB ?= ocamlmklib -elfmode
11 OCAMLDEP ?= ocamldep 9 OCAMLDEP ?= ocamldep
12 OCAMLLEX ?= ocamllex 10 OCAMLLEX ?= ocamllex
13 OCAMLYACC ?= ocamlyacc 11 OCAMLYACC ?= ocamlyacc
 12@@ -17,6 +17,6 @@
 13
 14 VERSION := 4.1
 15
 16-OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
 17+OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir)
 18
 19 o= >$@.new && mv -f $@.new $@