[pkgsrc/trunk]: pkgsrc/sysutils/xentools46 Handle ocaml-findlib 1.7.3 already...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5d6d114afb6
branches:  trunk
changeset: 367052:f5d6d114afb6
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed Aug 23 02:38:38 2017 +0000

description:
Handle ocaml-findlib 1.7.3 already appending DESTDIR, causing PLIST
mismatch.

Bump PKGREVISION out of paranoia for functional change from ocaml updates

diffstat:

 sysutils/xentools46/Makefile                        |   4 ++--
 sysutils/xentools46/distinfo                        |   4 ++--
 sysutils/xentools46/patches/patch-ocaml_common.make |  13 ++++++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 10b568a864d4 -r f5d6d114afb6 sysutils/xentools46/Makefile
--- a/sysutils/xentools46/Makefile      Tue Aug 22 21:38:19 2017 +0000
+++ b/sysutils/xentools46/Makefile      Wed Aug 23 02:38:38 2017 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2017/07/24 11:37:50 maya Exp $
+# $NetBSD: Makefile,v 1.19 2017/08/23 02:38:38 maya Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include               "version.mk"
 
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools46-${VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 
diff -r 10b568a864d4 -r f5d6d114afb6 sysutils/xentools46/distinfo
--- a/sysutils/xentools46/distinfo      Tue Aug 22 21:38:19 2017 +0000
+++ b/sysutils/xentools46/distinfo      Wed Aug 23 02:38:38 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2017/03/21 22:52:52 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2017/08/23 02:38:38 maya Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -45,7 +45,7 @@
 SHA1 (patch-libxl_libxl_uuid.c) = d14286be8ccdbcb5fae544a1968e7b681b63e884
 SHA1 (patch-libxl_xl__cmdtable.c) = d149603cac13c996d7800cee94a9df3aaadf9625
 SHA1 (patch-libxl_xl_cmdimpl.c) = 7aea48a9761b39cf620dcad2295a257c5fc53c8c
-SHA1 (patch-ocaml_common.make) = 4d4bddca7b5d93489a3f6620af51d95bbe265abb
+SHA1 (patch-ocaml_common.make) = df631c2da394b6e021934d2508e9d9fb497c3d41
 SHA1 (patch-ocaml_xenstored_Makefile) = 237e26d3ec25d706e16b415f90e0fcc4913e02e5
 SHA1 (patch-ocaml_xenstored_define.ml) = 18d6878ae536554e8831f3732d2a8ea1b13a9b63
 SHA1 (patch-ocaml_xenstored_utils.ml) = 04997cb9189a3331522c344aa1957e61febfd4d2
diff -r 10b568a864d4 -r f5d6d114afb6 sysutils/xentools46/patches/patch-ocaml_common.make
--- a/sysutils/xentools46/patches/patch-ocaml_common.make       Tue Aug 22 21:38:19 2017 +0000
+++ b/sysutils/xentools46/patches/patch-ocaml_common.make       Wed Aug 23 02:38:38 2017 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ocaml_common.make,v 1.1.1.1 2016/07/04 07:30:52 jnemeth Exp $
+$NetBSD: patch-ocaml_common.make,v 1.2 2017/08/23 02:38:38 maya Exp $
+
+Handle ocaml-findlib already appending DESTDIR
 
 --- ocaml/common.make.orig     2015-01-12 17:53:24.000000000 +0100
 +++ ocaml/common.make  2015-01-19 13:16:38.000000000 +0100
@@ -11,3 +13,12 @@
  OCAMLDEP ?= ocamldep
  OCAMLLEX ?= ocamllex
  OCAMLYACC ?= ocamlyacc
+@@ -17,6 +17,6 @@ OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -
+
+ VERSION := 4.1
+
+-OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
++OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir)
+
+ o= >$@.new && mv -f $@.new $@
+