Unbreak. Patch correct file and bump PKGREVISION. Hi tnn!

4 files changed, 26 insertions, 23 deletions

diff --git a/sysutils/xentools45/Makefile b/sysutils/xentools45/Makefile
index 5d69f5b0c97..d8630d69658 100644
--- a/sysutils/xentools45/Makefile
+++ b/sysutils/xentools45/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/10/22 05:05:22 jnemeth Exp $
+# $NetBSD: Makefile,v 1.18 2015/10/28 00:47:07 jnemeth Exp $
 
 VERSION=	4.5.1
 VERSION_IPXE=	9a93db3f0947484e30e753bbd61a10b17336e20e
@@ -8,6 +8,7 @@ PKGNAME=		xentools45-${VERSION}
 PKGREVISION=		5
 CATEGORIES=		sysutils
 MASTER_SITES=		http://bits.xensource.com/oss-xen/release/${VERSION}/
+PKGREVISION=		1
 
 DISTFILES=		${DISTNAME}.tar.gz
 DISTFILES+=		ipxe-git-${VERSION_IPXE}.tar.gz
diff --git a/sysutils/xentools45/distinfo b/sysutils/xentools45/distinfo
index 16d60ef0895..0bb78103d9d 100644
--- a/sysutils/xentools45/distinfo
+++ b/sysutils/xentools45/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/10/23 17:00:28 tnn Exp $
+$NetBSD: distinfo,v 1.12 2015/10/28 00:47:07 jnemeth Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -24,6 +24,7 @@ SHA1 (patch-XSA139) = 3b86a578c86f5a3ecb127dede4bccf51d6bc7687
 SHA1 (patch-XSA140) = 55ef4eb9c4d09ac327f9600ac7553e92b9cd0624
 SHA1 (patch-blktap_drivers_Makefile) = 7cc53b2a0dea1694a969046ab8542271ca63f9e7
 SHA1 (patch-configure) = d1a1b9c9e00dd79bb872190282006201510ce2c1
+SHA1 (patch-console_daemon_utils.c) = 915078ce6155a367e3e597fa7ab551f6afac083f
 SHA1 (patch-examples_Makefile) = 5fe7bb876d254cf0c4f774ed0f08dcaea5b355ff
 SHA1 (patch-firmware_etherboot_Makefile) = f55e14948b7191e533a82b8fc3575f1052f23c45
 SHA1 (patch-firmware_etherboot_patches_series) = 2fa1342c78094c6dd5d60a07c236c4a1c0599fc4
@@ -62,5 +63,4 @@ SHA1 (patch-qemu-xen_audio_audio.c) = 8452d63fe90e38a64111d0cf425bacd565fe6d82
 SHA1 (patch-qemu-xen_qemu-doc.texi) = 721e80d15ac30ac71df3d6c4c485b0bf70897cf9
 SHA1 (patch-qemu-xen_util_hbitmap.c) = 5a495ae2b47d1ff6dd342633b8d655582f21dffe
 SHA1 (patch-qemu-xen_xen-hvm.c) = 11d4deb5de577e8beb2d1c6c3ca886e3d7563f8a
-SHA1 (patch-tools_console_daemon_utils.c) = 1c1a62f7e7ba9054548cd143cf5f8292e6f41985
 SHA1 (patch-xenstore_xc.c) = 51b39e9929062e72d0ff85f0ee6d13a6ac04ac65
diff --git a/sysutils/xentools45/patches/patch-console_daemon_utils.c b/sysutils/xentools45/patches/patch-console_daemon_utils.c
new file mode 100644
index 00000000000..7c63829d52f
--- /dev/null
+++ b/sysutils/xentools45/patches/patch-console_daemon_utils.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-console_daemon_utils.c,v 1.1 2015/10/28 00:47:07 jnemeth Exp $
+
+--- console/daemon/utils.c.orig	2015-06-22 13:41:35.000000000 +0000
++++ console/daemon/utils.c
+@@ -113,13 +113,15 @@ bool xen_setup(void)
+ 	xs = xs_daemon_open();
+ 	if (xs == NULL) {
+ 		dolog(LOG_ERR,
+-		      "Failed to contact xenstore (%m).  Is it running?");
++		      "Failed to contact xenstore (%s).  Is it running?",
++		      strerror(errno));
+ 		goto out;
+ 	}
+ 
+ 	xc = xc_interface_open(0,0,0);
+ 	if (!xc) {
+-		dolog(LOG_ERR, "Failed to contact hypervisor (%m)");
++		dolog(LOG_ERR, "Failed to contact hypervisor (%s)",
++		      strerror(errno));
+ 		goto out;
+ 	}
+ 
diff --git a/sysutils/xentools45/patches/patch-tools_console_daemon_utils.c b/sysutils/xentools45/patches/patch-tools_console_daemon_utils.c
deleted file mode 100644
index 4f95b4d75f2..00000000000
--- a/sysutils/xentools45/patches/patch-tools_console_daemon_utils.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-tools_console_daemon_utils.c,v 1.1 2015/10/23 17:00:28 tnn Exp $
-
---- tools/console/daemon/utils.c.orig	2015-06-22 13:41:35.000000000 +0000
-+++ tools/console/daemon/utils.c
-@@ -113,13 +113,13 @@ bool xen_setup(void)
- 	xs = xs_daemon_open();
- 	if (xs == NULL) {
- 		dolog(LOG_ERR,
--		      "Failed to contact xenstore (%m).  Is it running?");
-+		      "Failed to contact xenstore (%s).  Is it running?", strerror(errno));
- 		goto out;
- 	}
- 
- 	xc = xc_interface_open(0,0,0);
- 	if (!xc) {
--		dolog(LOG_ERR, "Failed to contact hypervisor (%m)");
-+		dolog(LOG_ERR, "Failed to contact hypervisor (%s)", strerror(errno));
- 		goto out;
- 	}
-