From ea1e9c38e9dc4540aa189f1a0037845814caa050 Mon Sep 17 00:00:00 2001
From: jym <jym@pkgsrc.org>
Date: Sun, 20 Nov 2011 03:43:30 +0000
Subject: Improve the pattern matching a bit for compiler version. Otherwise we
 get garbage in the match, and sed will choke on it during compilation.

---
 sysutils/xenkernel3/distinfo                  |  3 ++-
 sysutils/xenkernel3/patches/patch-gcc-version | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/xenkernel3/patches/patch-gcc-version

(limited to 'sysutils/xenkernel3')

diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index cef6a16200f..4aa6f253431 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2011/09/10 18:35:51 bouyer Exp $
+$NetBSD: distinfo,v 1.16 2011/11/20 03:43:30 jym Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
@@ -15,3 +15,4 @@ SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
 SHA1 (patch-da) = 6db74e00d15615e71936fa8637a05159f378b454
 SHA1 (patch-db) = 8e7b563fd816669fd39e1e8bf5137b5937060968
 SHA1 (patch-dc) = 606ad2af582b88ddfd250b952831af9d3b2b1f5d
+SHA1 (patch-gcc-version) = 1174ace3eee1d3707a2935498ac5a39671913f9f
diff --git a/sysutils/xenkernel3/patches/patch-gcc-version b/sysutils/xenkernel3/patches/patch-gcc-version
new file mode 100644
index 00000000000..bd5925c6dc1
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-gcc-version
@@ -0,0 +1,14 @@
+$NetBSD: patch-gcc-version,v 1.1 2011/11/20 03:43:30 jym Exp $
+Improve the pattern matching a bit for compiler version. Otherwise we
+get garbage in the match, and sed will choke on it.
+--- ./xen/Makefile.orig	2008-04-25 13:03:12.000000000 +0000
++++ ./xen/Makefile
+@@ -115,7 +115,7 @@ include/xen/compile.h: include/xen/compi
+ 	    -e 's/@@whoami@@/$(USER)/g' \
+ 	    -e 's/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g' \
+ 	    -e 's/@@hostname@@/$(shell hostname)/g' \
+-	    -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep -i "gcc.*version")!g' \
++	    -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep -i "gcc.* version ")!g' \
+ 	    -e 's/@@version@@/$(XEN_VERSION)/g' \
+ 	    -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
+ 	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
-- 
cgit v1.2.3