Fix header guard.

10 files changed, 60 insertions, 7 deletions

diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index 250a0559800..617d8cd4813 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2013/04/11 19:57:51 joerg Exp $
+$NetBSD: distinfo,v 1.18 2013/07/13 19:43:21 joerg Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
@@ -18,3 +18,4 @@ SHA1 (patch-dc) = 606ad2af582b88ddfd250b952831af9d3b2b1f5d
 SHA1 (patch-gcc-version) = 1174ace3eee1d3707a2935498ac5a39671913f9f
 SHA1 (patch-xen_arch_x86_hvm_io.c) = 0f6dfc3b3857c2ab43fabf2c9693e2932b442931
 SHA1 (patch-xen_arch_x86_string.c) = 363d521a627d07cd9caffcfe1c529342b3b67321
+SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a
diff --git a/sysutils/xenkernel3/patches/patch-xen_common_libelf_libelf-private.h b/sysutils/xenkernel3/patches/patch-xen_common_libelf_libelf-private.h
new file mode 100644
index 00000000000..42ae5bf395d
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-xen_common_libelf_libelf-private.h
@@ -0,0 +1,10 @@
+$NetBSD: patch-xen_common_libelf_libelf-private.h,v 1.1 2013/07/13 19:43:21 joerg Exp $
+
+--- xen/common/libelf/libelf-private.h.orig	2013-07-12 18:07:36.000000000 +0000
++++ xen/common/libelf/libelf-private.h
+@@ -1,4 +1,4 @@
+-#ifndef __LIBELF_PRIVATE_H__
++#ifndef __LIBELF_PRIVATE_H_
+ #define __LIBELF_PRIVATE_H_
+ 
+ #ifdef __XEN__
diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo
index 3d23347a39f..f863c929493 100644
--- a/sysutils/xenkernel33/distinfo
+++ b/sysutils/xenkernel33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2013/04/11 19:57:51 joerg Exp $
+$NetBSD: distinfo,v 1.18 2013/07/13 19:43:21 joerg Exp $
 
 SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
@@ -15,3 +15,4 @@ SHA1 (patch-compat_memory_c) = f45daded92c0dac30213d6d7dcc81ac72ead7c47
 SHA1 (patch-include_xen_compat_h) = 96ba96ba31792f48c989f033f7706f09fd1171c2
 SHA1 (patch-xen_Makefile) = 30d27b40fb8f5c4ee663a6a82abf36db3b7ebd1c
 SHA1 (patch-xen_arch_x86_Rules.mk) = 81bdc8a653b57b5fcb9ae7d835f0284ab800dc21
+SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a
diff --git a/sysutils/xenkernel33/patches/patch-xen_common_libelf_libelf-private.h b/sysutils/xenkernel33/patches/patch-xen_common_libelf_libelf-private.h
new file mode 100644
index 00000000000..42ae5bf395d
--- /dev/null
+++ b/sysutils/xenkernel33/patches/patch-xen_common_libelf_libelf-private.h
@@ -0,0 +1,10 @@
+$NetBSD: patch-xen_common_libelf_libelf-private.h,v 1.1 2013/07/13 19:43:21 joerg Exp $
+
+--- xen/common/libelf/libelf-private.h.orig	2013-07-12 18:07:36.000000000 +0000
++++ xen/common/libelf/libelf-private.h
+@@ -1,4 +1,4 @@
+-#ifndef __LIBELF_PRIVATE_H__
++#ifndef __LIBELF_PRIVATE_H_
+ #define __LIBELF_PRIVATE_H_
+ 
+ #ifdef __XEN__
diff --git a/sysutils/xenkernel41/distinfo b/sysutils/xenkernel41/distinfo
index 36d572ac694..26e5642a2d1 100644
--- a/sysutils/xenkernel41/distinfo
+++ b/sysutils/xenkernel41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2013/05/03 16:48:37 drochner Exp $
+$NetBSD: distinfo,v 1.18 2013/07/13 19:43:21 joerg Exp $
 
 SHA1 (xen-4.1.5.tar.gz) = 38f098cdbcf4612a6e059e6ad332e68bbfc8bf4d
 RMD160 (xen-4.1.5.tar.gz) = 265d6a9faee6cf9314f4ed647604f7b43c327f52
@@ -22,5 +22,6 @@ SHA1 (patch-xen_Makefile) = d1c7e4860221f93d90818f45a77748882486f92b
 SHA1 (patch-xen_arch_x86_Rules.mk) = 6b9b4bfa28924f7d3f6c793a389f1a7ac9d228e2
 SHA1 (patch-xen_arch_x86_cpu_mcheck_vmce.c) = 5afd01780a13654f1d21bf1562f6431c8370be0b
 SHA1 (patch-xen_arch_x86_time.c) = 2dedd8ea1d372ecffea70aad448756dd3688cfba
+SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a
 SHA1 (patch-xen_drivers_char_console_c) = 0fe186369602ccffaeec6f4bfbee8bb4298d3ff0
 SHA1 (patch-xen_include_xen_stdarg.h) = e9df974a9b783ed442ab17497198432cb9844b70
diff --git a/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-private.h b/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-private.h
new file mode 100644
index 00000000000..42ae5bf395d
--- /dev/null
+++ b/sysutils/xenkernel41/patches/patch-xen_common_libelf_libelf-private.h
@@ -0,0 +1,10 @@
+$NetBSD: patch-xen_common_libelf_libelf-private.h,v 1.1 2013/07/13 19:43:21 joerg Exp $
+
+--- xen/common/libelf/libelf-private.h.orig	2013-07-12 18:07:36.000000000 +0000
++++ xen/common/libelf/libelf-private.h
+@@ -1,4 +1,4 @@
+-#ifndef __LIBELF_PRIVATE_H__
++#ifndef __LIBELF_PRIVATE_H_
+ #define __LIBELF_PRIVATE_H_
+ 
+ #ifdef __XEN__
diff --git a/sysutils/xenkernel42/distinfo b/sysutils/xenkernel42/distinfo
index 61f5103322b..e58d2b1edd0 100644
--- a/sysutils/xenkernel42/distinfo
+++ b/sysutils/xenkernel42/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2013/06/13 21:49:59 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/07/13 19:43:21 joerg Exp $
 
 SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c
 RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6
@@ -7,4 +7,5 @@ SHA1 (patch-Config.mk) = a43ed1b3304d6383dc093acd128a7f373d0ca266
 SHA1 (patch-xen_Makefile) = e0d1b74518b9675ddc64295d1523ded9a8757c0a
 SHA1 (patch-xen_arch_x86_Rules.mk) = 6b9b4bfa28924f7d3f6c793a389f1a7ac9d228e2
 SHA1 (patch-xen_arch_x86_time.c) = e5ce7e83d1dcbcc1cdffd6921f25fce4d7389ac8
+SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a
 SHA1 (patch-xen_include_xen_lib.h) = 36dcaf3874a1b1214babc45d7e19fe3b556c1044
diff --git a/sysutils/xenkernel42/patches/patch-xen_common_libelf_libelf-private.h b/sysutils/xenkernel42/patches/patch-xen_common_libelf_libelf-private.h
new file mode 100644
index 00000000000..42ae5bf395d
--- /dev/null
+++ b/sysutils/xenkernel42/patches/patch-xen_common_libelf_libelf-private.h
@@ -0,0 +1,10 @@
+$NetBSD: patch-xen_common_libelf_libelf-private.h,v 1.1 2013/07/13 19:43:21 joerg Exp $
+
+--- xen/common/libelf/libelf-private.h.orig	2013-07-12 18:07:36.000000000 +0000
++++ xen/common/libelf/libelf-private.h
+@@ -1,4 +1,4 @@
+-#ifndef __LIBELF_PRIVATE_H__
++#ifndef __LIBELF_PRIVATE_H_
+ #define __LIBELF_PRIVATE_H_
+ 
+ #ifdef __XEN__
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo
index ab1da7e7c1d..0535af44bc6 100644
--- a/sysutils/xentools41/distinfo
+++ b/sysutils/xentools41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2013/05/06 14:59:10 joerg Exp $
+$NetBSD: distinfo,v 1.31 2013/07/13 19:43:21 joerg Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -10,6 +10,7 @@ SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a91
 SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba
 SHA1 (patch-.._.._ipxe_src_net_tls.c) = c0cfbc2ab2b92c659c146601c4f80d58c951ca62
 SHA1 (patch-.._Config.mk) = 9b971a41f67bb3974d3a4459bb9d96fbbd636c96
+SHA1 (patch-.._xen_patch-common_libelf_libelf-private.h) = b115b0118f932b15c653c131c0c9c9885e2480ff
 SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada
 SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d
 SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb
@@ -40,9 +41,7 @@ SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e
 SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3
 SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d
 SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c
-SHA1 (patch-examples_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-firmware_hvmloader_Makefile) = b2914e4988ba004d45403d67f1580b1f9725d006
-SHA1 (patch-hotplug_common_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ioemu-qemu-xen_hw_pass-through.c) = 76185c239078f29cb42b953d6c2cd1f59e240989
 SHA1 (patch-ioemu-qemu-xen_hw_pass-through.h) = 98c26798d1ad99d3eee8b33deb08f747c958c886
 SHA1 (patch-ioemu-qemu-xen_hw_piix4acpi.c) = ca19457e9bde2d844a86a866960ac6de1f3d084c
diff --git a/sysutils/xentools41/patches/patch-.._xen_patch-common_libelf_libelf-private.h b/sysutils/xentools41/patches/patch-.._xen_patch-common_libelf_libelf-private.h
new file mode 100644
index 00000000000..46d6d9fda6c
--- /dev/null
+++ b/sysutils/xentools41/patches/patch-.._xen_patch-common_libelf_libelf-private.h
@@ -0,0 +1,10 @@
+$NetBSD: patch-.._xen_patch-common_libelf_libelf-private.h,v 1.1 2013/07/13 19:43:21 joerg Exp $
+
+--- ../xen/common/libelf/libelf-private.h.orig	2013-07-12 18:07:36.000000000 +0000
++++ ../xen/common/libelf/libelf-private.h
+@@ -1,4 +1,4 @@
+-#ifndef __LIBELF_PRIVATE_H__
++#ifndef __LIBELF_PRIVATE_H_
+ #define __LIBELF_PRIVATE_H_
+ 
+ #ifdef __XEN__