CVS commit: pkgsrc/sysutils/xentools48

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Aug 22 17:02:11 UTC 2017

Modified Files:
        pkgsrc/sysutils/xentools48: Makefile distinfo
        pkgsrc/sysutils/xentools48/patches: patch-tools_ocaml_common.make

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xentools48/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/xentools48/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xentools48/patches/patch-tools_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/xentools48/Makefile
diff -u pkgsrc/sysutils/xentools48/Makefile:1.5 pkgsrc/sysutils/xentools48/Makefile:1.6
--- pkgsrc/sysutils/xentools48/Makefile:1.5     Mon Jul 24 11:37:50 2017
+++ pkgsrc/sysutils/xentools48/Makefile Tue Aug 22 17:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/07/24 11:37:50 maya Exp $
+# $NetBSD: Makefile,v 1.6 2017/08/22 17:02:10 maya Exp $
 #
 VERSION=       4.8.0
 VERSION_IPXE=  827dd1bfee67daa683935ce65316f7e0f057fe1c
@@ -16,7 +16,7 @@ DIST_LIBPCI=  pciutils-2.2.9.tar.bz2
 DIST_SUBDIR=           xen48
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools48-${VERSION}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 

Index: pkgsrc/sysutils/xentools48/distinfo
diff -u pkgsrc/sysutils/xentools48/distinfo:1.1 pkgsrc/sysutils/xentools48/distinfo:1.2
--- pkgsrc/sysutils/xentools48/distinfo:1.1     Thu Mar 30 09:15:09 2017
+++ pkgsrc/sysutils/xentools48/distinfo Tue Aug 22 17:02:10 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2017/03/30 09:15:09 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2017/08/22 17:02:10 maya Exp $
 
 SHA1 (xen48/gmp-4.3.2.tar.bz2) = c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c
 RMD160 (xen48/gmp-4.3.2.tar.bz2) = a8f3f41501ece290c348aeb4444bbea40bc53e71
@@ -96,7 +96,7 @@ SHA1 (patch-tools_libxl_libxl_internal.h
 SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b
 SHA1 (patch-tools_libxl_xl__cmdtable.c) = 073c08795af8ec828c60864a788c32e9cca31547
 SHA1 (patch-tools_libxl_xl_cmdimpl.c) = d43beffad3c6da70cb69b2b5d3cf0b48f614e2a6
-SHA1 (patch-tools_ocaml_common.make) = 423d241ec7dc93faf4ec0bf15f9d3c1f34f42646
+SHA1 (patch-tools_ocaml_common.make) = b73a72e64c42176a178bb8d9e37c6c9867055146
 SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
 SHA1 (patch-tools_ocaml_xenstored_define.ml) = 1f12a8a853b847b80e2c3bb5919ed2410a70092f
 SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 560b26b6d5030838721ddb4e3d819766c3db0349

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