CVS commit: pkgsrc/sysutils/xentools45

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Aug 23 02:49:48 UTC 2017

Modified Files:
        pkgsrc/sysutils/xentools45: Makefile distinfo
        pkgsrc/sysutils/xentools45/patches: patch-ocaml_common.make

Log Message:
Handle ocaml-findlib 1.7.3 already appending DESTDIR

Paranoia bump PKGREVISION for possible functional changes from ocaml update


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/xentools45/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/xentools45/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xentools45/Makefile
diff -u pkgsrc/sysutils/xentools45/Makefile:1.49 pkgsrc/sysutils/xentools45/Makefile:1.50
--- pkgsrc/sysutils/xentools45/Makefile:1.49    Mon Jul 24 11:37:49 2017
+++ pkgsrc/sysutils/xentools45/Makefile Wed Aug 23 02:49:48 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2017/07/24 11:37:49 maya Exp $
+# $NetBSD: Makefile,v 1.50 2017/08/23 02:49:48 maya Exp $
 
 VERSION=       4.5.5
-PKGREVISION=   5
+PKGREVISION=   6
 VERSION_IPXE=  9a93db3f0947484e30e753bbd61a10b17336e20e
 
 DISTNAME=              xen-${VERSION}

Index: pkgsrc/sysutils/xentools45/distinfo
diff -u pkgsrc/sysutils/xentools45/distinfo:1.30 pkgsrc/sysutils/xentools45/distinfo:1.31
--- pkgsrc/sysutils/xentools45/distinfo:1.30    Mon Mar 20 18:09:21 2017
+++ pkgsrc/sysutils/xentools45/distinfo Wed Aug 23 02:49:48 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2017/03/20 18:09:21 bouyer Exp $
+$NetBSD: distinfo,v 1.31 2017/08/23 02:49:48 maya Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -52,7 +52,7 @@ SHA1 (patch-libxl_libxl__create.c) = d4c
 SHA1 (patch-libxl_libxl__save__helper.c) = 70e5237e28bea1aa87486e080fc25aa81300a6d8
 SHA1 (patch-libxl_libxl_uuid.c) = d14286be8ccdbcb5fae544a1968e7b681b63e884
 SHA1 (patch-libxl_xl__cmdtable.c) = d149603cac13c996d7800cee94a9df3aaadf9625
-SHA1 (patch-ocaml_common.make) = 4d4bddca7b5d93489a3f6620af51d95bbe265abb
+SHA1 (patch-ocaml_common.make) = 4c8fd60da404522ce0dadf18d3d59996e7a2992e
 SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = e079d5f3995ea44035c0c65610d15fb65af8571d
 SHA1 (patch-ocaml_xenstored_Makefile) = 8014db42b65ca9290013069d1f3cb816e3f023c2
 SHA1 (patch-ocaml_xenstored_define.ml) = 18d6878ae536554e8831f3732d2a8ea1b13a9b63

Index: pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make
diff -u pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make:1.1 pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make:1.2
--- pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make:1.1      Tue Jan 20 16:42:13 2015
+++ pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make  Wed Aug 23 02:49:48 2017
@@ -1,8 +1,11 @@
-$NetBSD: patch-ocaml_common.make,v 1.1 2015/01/20 16:42:13 bouyer Exp $
+$NetBSD: patch-ocaml_common.make,v 1.2 2017/08/23 02:49:48 maya Exp $
+
+Handle ocaml-findlib 1.7.3 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
-@@ -3,7 +3,7 @@
+++ work/xen-4.5.5/tools/ocaml/common.make
+@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
  CC ?= gcc
  OCAMLOPT ?= ocamlopt
  OCAMLC ?= ocamlc
@@ -11,3 +14,11 @@ $NetBSD: patch-ocaml_common.make,v 1.1 2
  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 $@