Wed Aug 23 02:57:09 2017 UTC ()
Blindly make the same change as xentools45, handle ocaml-findlib appending
destdir. Blind because this package doesn't build due to -Werror and warnings

bump PKGREVISION in case ocaml updates affected things.


(maya)
diff -r1.59 -r1.60 pkgsrc/sysutils/xentools42/Makefile
diff -r1.33 -r1.34 pkgsrc/sysutils/xentools42/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/xentools42/patches/patch-ocaml_common.make
cvs diff -r1.59 -r1.60 pkgsrc/sysutils/xentools42/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/Attic/Makefile 2017/07/24 11:37:49 1.59
+++ pkgsrc/sysutils/xentools42/Attic/Makefile 2017/08/23 02:57:09 1.60
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.59 2017/07/24 11:37:49 maya Exp $ 1# $NetBSD: Makefile,v 1.60 2017/08/23 02:57:09 maya Exp $
2 2
3VERSION= 4.2.5 3VERSION= 4.2.5
4VERSION_IPXE= 1.0.0 4VERSION_IPXE= 1.0.0
5 5
6DISTNAME= xen-${VERSION} 6DISTNAME= xen-${VERSION}
7PKGNAME= xentools42-${VERSION} 7PKGNAME= xentools42-${VERSION}
8PKGREVISION= 23 8PKGREVISION= 24
9CATEGORIES= sysutils 9CATEGORIES= sysutils
10MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ 10MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
11 11
12DISTFILES= ${DISTNAME}.tar.gz 12DISTFILES= ${DISTNAME}.tar.gz
13DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz 13DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz
14SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ 14SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://xen.org/ 17HOMEPAGE= http://xen.org/
18COMMENT= Userland Tools for Xen 4.2.x 18COMMENT= Userland Tools for Xen 4.2.x
19LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
20 20
21# XXX add version check: Xen requires dev86 >= 0.16.14 21# XXX add version check: Xen requires dev86 >= 0.16.14
cvs diff -r1.33 -r1.34 pkgsrc/sysutils/xentools42/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/Attic/distinfo 2017/07/24 11:37:49 1.33
+++ pkgsrc/sysutils/xentools42/Attic/distinfo 2017/08/23 02:57:09 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.33 2017/07/24 11:37:49 maya Exp $ 1$NetBSD: distinfo,v 1.34 2017/08/23 02:57:09 maya Exp $
2 2
3SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 3SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
4RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 4RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
5SHA512 (ipxe-git-v1.0.0.tar.gz) = 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147 5SHA512 (ipxe-git-v1.0.0.tar.gz) = 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147
6Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes 6Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes
7SHA1 (xen-4.2.5.tar.gz) = f42741e4ec174495ace70c4b17a6b9b0e60e798a 7SHA1 (xen-4.2.5.tar.gz) = f42741e4ec174495ace70c4b17a6b9b0e60e798a
8RMD160 (xen-4.2.5.tar.gz) = 7d4f7f1b32ee541d341a756b1f8da02816438d19 8RMD160 (xen-4.2.5.tar.gz) = 7d4f7f1b32ee541d341a756b1f8da02816438d19
9SHA512 (xen-4.2.5.tar.gz) = 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac 9SHA512 (xen-4.2.5.tar.gz) = 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac
10Size (xen-4.2.5.tar.gz) = 15671925 bytes 10Size (xen-4.2.5.tar.gz) = 15671925 bytes
11SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb 11SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb
12SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 12SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808
13SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b 13SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b
14SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba 14SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba
@@ -57,27 +57,27 @@ SHA1 (patch-firmware_hvmloader_util.h) = @@ -57,27 +57,27 @@ SHA1 (patch-firmware_hvmloader_util.h) =
57SHA1 (patch-hotplug_NetBSD_Makefile) = efc7c4d5b2f4aa5d3de2c7f77427db77fd95898a 57SHA1 (patch-hotplug_NetBSD_Makefile) = efc7c4d5b2f4aa5d3de2c7f77427db77fd95898a
58SHA1 (patch-hotplug_NetBSD_block) = 35af7f18a8edf3b7743dfa3cc869ea223aafaefa 58SHA1 (patch-hotplug_NetBSD_block) = 35af7f18a8edf3b7743dfa3cc869ea223aafaefa
59SHA1 (patch-hotplug_NetBSD_vif-bridge) = 7d01f15273c983c2cfe125e75800f9719961427c 59SHA1 (patch-hotplug_NetBSD_vif-bridge) = 7d01f15273c983c2cfe125e75800f9719961427c
60SHA1 (patch-hotplug_NetBSD_vif-ip) = d3b0555f5ba0bfcbf0f7027eb5f74a84d0cf7c80 60SHA1 (patch-hotplug_NetBSD_vif-ip) = d3b0555f5ba0bfcbf0f7027eb5f74a84d0cf7c80
61SHA1 (patch-hotplug_common_Makefile) = 3ee2fec5c4cb171c35c7e73379da4235b5ddca99 61SHA1 (patch-hotplug_common_Makefile) = 3ee2fec5c4cb171c35c7e73379da4235b5ddca99
62SHA1 (patch-include_xen-sys_NetBSD_gntdev.h) = 4789687ab983119e27fccc2fc83181c185cbed96 62SHA1 (patch-include_xen-sys_NetBSD_gntdev.h) = 4789687ab983119e27fccc2fc83181c185cbed96
63SHA1 (patch-libfsimage_common_Makefile) = 06b05feed62ca96aa5ab15177227508905d5dccd 63SHA1 (patch-libfsimage_common_Makefile) = 06b05feed62ca96aa5ab15177227508905d5dccd
64SHA1 (patch-libfsimage_ufs_ufs.h) = 598d2c9d8e563c9ed6eb32e0877a5ea8d865e2ca 64SHA1 (patch-libfsimage_ufs_ufs.h) = 598d2c9d8e563c9ed6eb32e0877a5ea8d865e2ca
65SHA1 (patch-libxc_xc__netbsd.c) = 1ed0804174badf9e0c788a8ff0b1797459663d68 65SHA1 (patch-libxc_xc__netbsd.c) = 1ed0804174badf9e0c788a8ff0b1797459663d68
66SHA1 (patch-libxl_libxl__create.c) = 1706f782bcd3bea19b8127e9aefe8bda4a4061de 66SHA1 (patch-libxl_libxl__create.c) = 1706f782bcd3bea19b8127e9aefe8bda4a4061de
67SHA1 (patch-libxl_libxl__internal.h) = bc2865f5c14b1fb9df1f9ad77d3be4a1494068c6 67SHA1 (patch-libxl_libxl__internal.h) = bc2865f5c14b1fb9df1f9ad77d3be4a1494068c6
68SHA1 (patch-libxl_libxl__save__helper.c) = 1592f07e30db119905ae1efa9bd272fa75f60651 68SHA1 (patch-libxl_libxl__save__helper.c) = 1592f07e30db119905ae1efa9bd272fa75f60651
69SHA1 (patch-libxl_xl.c) = f7ca33eac8ce6c2383d985c82bf8cb406588e2c9 69SHA1 (patch-libxl_xl.c) = f7ca33eac8ce6c2383d985c82bf8cb406588e2c9
70SHA1 (patch-ocaml_common.make) = a809e3bed475cdffea3cb7ae480c8fe7af6aa798 70SHA1 (patch-ocaml_common.make) = 0cb657ef139c5651ed2a6962a63951ff46e6284f
71SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = 944ce96d18cefdc70babe83d3337ff94604b0f04 71SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = 944ce96d18cefdc70babe83d3337ff94604b0f04
72SHA1 (patch-ocaml_xenstored_Makefile) = a0e91b946307a610490a492d4d56dfe426bddb63 72SHA1 (patch-ocaml_xenstored_Makefile) = a0e91b946307a610490a492d4d56dfe426bddb63
73SHA1 (patch-ocaml_xenstored_define.ml) = c0772dff8e59f495a0ebe17a905aed04a29f2469 73SHA1 (patch-ocaml_xenstored_define.ml) = c0772dff8e59f495a0ebe17a905aed04a29f2469
74SHA1 (patch-ocaml_xenstored_utils.ml) = b446e9428c676b70d6b9001c578f6de2048c88c2 74SHA1 (patch-ocaml_xenstored_utils.ml) = b446e9428c676b70d6b9001c578f6de2048c88c2
75SHA1 (patch-pygrub_Makefile) = 42212486644818cc74fcf5ab3f77f3f7cd6433cf 75SHA1 (patch-pygrub_Makefile) = 42212486644818cc74fcf5ab3f77f3f7cd6433cf
76SHA1 (patch-python_xen_xend_XendNode.py) = 7310dcdcff361b8b37a7c328bf6c9eb096a4df98 76SHA1 (patch-python_xen_xend_XendNode.py) = 7310dcdcff361b8b37a7c328bf6c9eb096a4df98
77SHA1 (patch-python_xen_xend_osdep.py) = 8432ad06ef686efc316828e3e49f369a1f9936d5 77SHA1 (patch-python_xen_xend_osdep.py) = 8432ad06ef686efc316828e3e49f369a1f9936d5
78SHA1 (patch-python_xen_xm_create.py) = 36223a6720f41eda1dc0cda22c52db546c76127c 78SHA1 (patch-python_xen_xm_create.py) = 36223a6720f41eda1dc0cda22c52db546c76127c
79SHA1 (patch-qemu-xen-traditional_Makefile) = 526d1b22e21a9eca73f6d70e14db5258091ce3b4 79SHA1 (patch-qemu-xen-traditional_Makefile) = 526d1b22e21a9eca73f6d70e14db5258091ce3b4
80SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = ee1fd53411a357f8855a192bb905963f965ea9a7 80SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = ee1fd53411a357f8855a192bb905963f965ea9a7
81SHA1 (patch-qemu-xen-traditional_configure) = 40cd80a7b9368cde3f7e5d24fdf16330d3d7fd0c 81SHA1 (patch-qemu-xen-traditional_configure) = 40cd80a7b9368cde3f7e5d24fdf16330d3d7fd0c
82SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = a517c2d0c1c8b6ca81bed3a6a6c0e63e8687fd88 82SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = a517c2d0c1c8b6ca81bed3a6a6c0e63e8687fd88
83SHA1 (patch-qemu-xen-traditional_hw_ide.c) = 4dc86cfec2d86766293af18b558b6bd5a336e697 83SHA1 (patch-qemu-xen-traditional_hw_ide.c) = 4dc86cfec2d86766293af18b558b6bd5a336e697
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/xentools42/patches/Attic/patch-ocaml_common.make (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/patches/Attic/patch-ocaml_common.make 2015/08/23 16:17:12 1.2
+++ pkgsrc/sysutils/xentools42/patches/Attic/patch-ocaml_common.make 2017/08/23 02:57:09 1.3
@@ -1,13 +1,23 @@ @@ -1,13 +1,23 @@
1$NetBSD: patch-ocaml_common.make,v 1.2 2015/08/23 16:17:12 spz Exp $ 1$NetBSD: patch-ocaml_common.make,v 1.3 2017/08/23 02:57:09 maya Exp $
 2
 3Handle ocaml-findlib 1.7.3 already appending DESTDIR
2 4
3--- ocaml/common.make.orig 2014-09-02 06:22:57.000000000 +0000 5--- ocaml/common.make.orig 2014-09-02 06:22:57.000000000 +0000
4+++ ocaml/common.make 6+++ ocaml/common.make
5@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk 7@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
6 CC ?= gcc 8 CC ?= gcc
7 OCAMLOPT ?= ocamlopt 9 OCAMLOPT ?= ocamlopt
8 OCAMLC ?= ocamlc 10 OCAMLC ?= ocamlc
9-OCAMLMKLIB ?= ocamlmklib 11-OCAMLMKLIB ?= ocamlmklib
10+OCAMLMKLIB ?= ocamlmklib -elfmode 12+OCAMLMKLIB ?= ocamlmklib -elfmode
11 OCAMLDEP ?= ocamldep 13 OCAMLDEP ?= ocamldep
12 OCAMLLEX ?= ocamllex 14 OCAMLLEX ?= ocamllex
13 OCAMLYACC ?= ocamlyacc 15 OCAMLYACC ?= ocamlyacc
 16@@ -16,6 +16,6 @@ OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -
 17
 18 VERSION := 4.1
 19
 20-OCAMLDESTDIR ?= $(DESTDIR)$(shell ocamlfind printconf destdir)
 21+OCAMLDESTDIR ?= $(shell ocamlfind printconf destdir)
 22
 23 o= >$@.new && mv -f $@.new $@