diff -ur stone_soup-0.12.1.old/source/Makefile stone_soup-0.12.1/source/Makefile
--- stone_soup-0.12.1.old/source/Makefile	2013-06-10 18:18:05.000000000 +0000
+++ stone_soup-0.12.1/source/Makefile	2013-06-10 18:23:15.102011960 +0000
@@ -1144,10 +1144,10 @@
   NEED_REBUILD = y
 endif
 
-.cflags: .force-cflags
+.cflags:
 ifdef NEED_REBUILD
 	@echo "    * rebuilding crawl: new build flags or prefix"
 	@echo 'TRACK_CFLAGS = $(TRACK_CFLAGS) #EOL'
 	@echo 'OLD_CFLAGS   = $(OLD_CFLAGS) #EOL'
 	@echo '$(TRACK_CFLAGS)' > .cflags
 endif

-.PHONY: .force-cflags
-
 endif
 
 ##########################################################################
diff -ur stone_soup-0.12.1.old/source/libutil.cc stone_soup-0.12.1/source/libutil.cc
--- stone_soup-0.12.1.old/source/libutil.cc	2013-06-10 18:18:05.000000000 +0000
+++ stone_soup-0.12.1/source/libutil.cc	2013-06-10 18:24:36.803987874 +0000
@@ -1056,7 +1056,7 @@
 
 mouse_mode mouse_control::ms_current_mode = MOUSE_MODE_NORMAL;
 
-size_t strlcpy(char *dst, const char *src, size_t n)
+size_t strlcpy(char *dst, const char *src, size_t n) throw ()
 {
     if (!n)
         return strlen(src);
diff -ur stone_soup-0.12.1.old/source/pattern.cc stone_soup-0.12.1/source/pattern.cc
--- stone_soup-0.12.1.old/source/pattern.cc	2013-06-10 18:18:05.000000000 +0000
+++ stone_soup-0.12.1/source/pattern.cc	2013-06-10 18:25:01.147384075 +0000
@@ -6,7 +6,7 @@
         #define PCRE_STATIC
     #endif
 
-    #include <pcre.h>
+    #include <pcre/pcre.h>
 #endif
 
 #ifdef REGEX_POSIX