Index: Portfile
===================================================================
--- Portfile	(revision 124897)
+++ Portfile	(working copy)
@@ -43,7 +43,9 @@
                 rmd160  8ac185a72ad8394b14d5377549e5bbf02889faaa
 
 patchfiles	patch-srfi-60.c.diff \
+		patch-libguile-c-tokenize.c \
 		patch-libguile-fports.c.diff \
+		patch-libguile-guile-snarf.in \
 		patch-no-stack-checking.diff
 
 depends_lib	port:readline \
@@ -52,7 +54,8 @@
                 port:libtool \
                 port:gmp
 
-configure.args	CPPFLAGS="-I${prefix}/include"		\
+configure.args	CFLAGS="-fwrapv"			\
+		CPPFLAGS="-I${prefix}/include"		\
 		LDFLAGS="-L${prefix}/lib"		\
 		--infodir="${prefix}/share/info"	\
 		--mandir="${prefix}/share/man"		\
Index: files/patch-libguile-c-tokenize.c
===================================================================
--- files/patch-libguile-c-tokenize.c	(revision 0)
+++ files/patch-libguile-c-tokenize.c	(working copy)
@@ -0,0 +1,18 @@
+--- libguile/c-tokenize.c	2010-12-13 20:24:04.000000000 +0100
++++ libguile/c-tokenize.c	2014-04-13 22:20:33.000000000 +0200
+@@ -898,13 +898,13 @@ case 3:
+ /* rule 3 can match eol */
+ YY_RULE_SETUP
+ #line 71 "./c-tokenize.lex"
+-{ OUT(eol); }
++{ /*OUT(eol);*/ }
+ 	YY_BREAK
+ case 4:
+ /* rule 4 can match eol */
+ YY_RULE_SETUP
+ #line 73 "./c-tokenize.lex"
+-{ OUT(hash); IS_NOT_COOKIE; }
++{ /*OUT(hash);*/ IS_NOT_COOKIE; }
+ 	YY_BREAK
+ case 5:
+ YY_RULE_SETUP
Index: files/patch-libguile-guile-snarf.in
===================================================================
--- files/patch-libguile-guile-snarf.in	(revision 0)
+++ files/patch-libguile-guile-snarf.in	(working copy)
@@ -0,0 +1,12 @@
+--- libguile/guile-snarf.in	2010-12-13 18:24:40.000000000 +0100
++++ libguile/guile-snarf.in	2014-04-13 21:05:42.000000000 +0200
+@@ -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 -e 's/\^ *\^/\
++^^/g' ${temp} | grep "^.*\^ *\^" | sed -e "s/^.*\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
+ 
+ ## main