7 files changed, 59 insertions, 3 deletions
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 241cbc2eea8..e835e4632f5 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.45 2011/05/12 12:15:41 dmcmahill Exp $
+$NetBSD: distinfo,v 1.46 2013/10/04 18:35:22 joerg Exp $
 
 SHA1 (guile-1.8.8.tar.gz) = 548d6927aeda332b117f8fc5e4e82c39a05704f9
 RMD160 (guile-1.8.8.tar.gz) = 8ac185a72ad8394b14d5377549e5bbf02889faaa
 Size (guile-1.8.8.tar.gz) = 3956654 bytes
 SHA1 (patch-aa) = 9f697e63f253665c1a1afa3c2827195b9b7638f3
-SHA1 (patch-ae) = 43ed56936c8871c45ca82d1afef5b2f98b914d32
+SHA1 (patch-ae) = e53d126adbc1dc1312d40b3f118bf47591152ce5
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
 SHA1 (patch-ah) = 351136075aaaab96117fecc7cedc8ee989d8a1e0
 SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309
@@ -12,3 +12,5 @@ SHA1 (patch-al) = 6a5fb3136028bb5a5185ce7174a20d5f9d227e18
 SHA1 (patch-am) = 7a549811ef98f40a6a87f31840109ee2a091489b
 SHA1 (patch-an) = 89ee76c4e74a7af3a5e2a8e65d889292de1768f1
 SHA1 (patch-ao) = b648826c5e951cd98ca6e2cdf48435cbdba096ff
+SHA1 (patch-libguile_guile-snarf-docs.in) = 392b0774a8d21bc06f2cf741683773b918bc8ffb
+SHA1 (patch-libguile_guile-snarf.in) = f2cbf83d7f1bb161599b7c86dc327f8416bbe612
diff --git a/lang/guile/patches/patch-ae b/lang/guile/patches/patch-ae
index fd4f42fc9d0..67308939b1b 100644
--- a/lang/guile/patches/patch-ae
+++ b/lang/guile/patches/patch-ae
@@ -1,3 +1,5 @@
+$NetBSD: patch-ae,v 1.17 2013/10/04 18:35:22 joerg Exp $
+
 --- libguile/gc_os_dep.c.orig	2009-06-26 20:21:44.000000000 +0000
 +++ libguile/gc_os_dep.c
 @@ -132,7 +132,7 @@ typedef int GC_bool;
diff --git a/lang/guile/patches/patch-libguile_guile-snarf-docs.in b/lang/guile/patches/patch-libguile_guile-snarf-docs.in
new file mode 100644
index 00000000000..40f9ab3e1a7
--- /dev/null
+++ b/lang/guile/patches/patch-libguile_guile-snarf-docs.in
@@ -0,0 +1,11 @@
+$NetBSD: patch-libguile_guile-snarf-docs.in,v 1.1 2013/10/04 18:35:22 joerg Exp $
+
+--- libguile/guile-snarf-docs.in.orig	2013-09-29 06:57:32.000000000 +0000
++++ libguile/guile-snarf-docs.in
+@@ -23,4 +23,5 @@ bindir=`dirname $0`
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+ 
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" | grep -v '^#' | sed 's,\^ *\^ {,\
++&,g'
diff --git a/lang/guile/patches/patch-libguile_guile-snarf.in b/lang/guile/patches/patch-libguile_guile-snarf.in
new file mode 100644
index 00000000000..cdebb7f4b35
--- /dev/null
+++ b/lang/guile/patches/patch-libguile_guile-snarf.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-libguile_guile-snarf.in,v 1.1 2013/10/04 18:35:22 joerg Exp $
+
+--- libguile/guile-snarf.in.orig	2010-12-13 17:24:40.000000000 +0000
++++ libguile/guile-snarf.in
+@@ -51,7 +51,8 @@ modern_snarf ()                         
+     ## empty file.
+     echo "/* cpp arguments: $@ */" ;
+     ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
+-    grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
++    sed 's,\^ *\^,\
++&,g' ${temp} | grep "^ *\^ *\^" | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
+ 
+ ## main
diff --git a/lang/guile16/distinfo b/lang/guile16/distinfo
index 28e749129a7..c8002a8cd94 100644
--- a/lang/guile16/distinfo
+++ b/lang/guile16/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2013/04/21 15:35:24 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/10/04 18:35:22 joerg Exp $
 
 SHA1 (guile-1.6.8.tar.gz) = 5c244f730d7aaee32db4b0cc77b688f74a5caa71
 RMD160 (guile-1.6.8.tar.gz) = 9c2c6a6afe2adce458e30e97da782ae18ce75b5c
@@ -12,4 +12,6 @@ SHA1 (patch-ah) = e66596a5ecc5c2d4fd09833507499b4d02c7af8a
 SHA1 (patch-ai) = 73e4a95dc9e9ede4d423e3a73fc2b0ac4f4802e0
 SHA1 (patch-aj) = 2d55986fd8161bdc32c6e2ef7fe3d89310ab20cd
 SHA1 (patch-ak) = 8cb47bf5d2c3818f860c459180507d4b2eae0b60
+SHA1 (patch-libguile_guile-snarf-docs.in) = 6c8b01350e7585c4f7bb650e3f7f991e231629b1
+SHA1 (patch-libguile_guile-snarf.in) = f1e0ace27799bcf4fd3f8c81607e4da5aeda7e23
 SHA1 (patch-scripts-snarf-check-and-output-texi) = 49ea1065f77925ff9417eb49bd8790d2c4f16202
diff --git a/lang/guile16/patches/patch-libguile_guile-snarf-docs.in b/lang/guile16/patches/patch-libguile_guile-snarf-docs.in
new file mode 100644
index 00000000000..57e45aff564
--- /dev/null
+++ b/lang/guile16/patches/patch-libguile_guile-snarf-docs.in
@@ -0,0 +1,11 @@
+$NetBSD: patch-libguile_guile-snarf-docs.in,v 1.1 2013/10/04 18:35:22 joerg Exp $
+
+--- libguile/guile-snarf-docs.in.orig	2013-09-29 06:44:33.000000000 +0000
++++ libguile/guile-snarf-docs.in
+@@ -23,4 +23,5 @@ bindir=`dirname $0`
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+ 
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" | grep -v '^#' | sed 's,\^ *\^ {,\
++&,g'
diff --git a/lang/guile16/patches/patch-libguile_guile-snarf.in b/lang/guile16/patches/patch-libguile_guile-snarf.in
new file mode 100644
index 00000000000..a6cb28ea440
--- /dev/null
+++ b/lang/guile16/patches/patch-libguile_guile-snarf.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-libguile_guile-snarf.in,v 1.1 2013/10/04 18:35:22 joerg Exp $
+
+--- libguile/guile-snarf.in.orig	2005-06-09 22:42:54.000000000 +0000
++++ libguile/guile-snarf.in
+@@ -51,7 +51,8 @@ modern_snarf ()                         
+     ## empty file.
+     echo "/* cpp arguments: $@ */" ;
+     ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
+-    grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//"
++    sed 's,\^ *\^,\
++&,g' ${temp} | grep "^ *\^ *\^" | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
+ 
+ ## main