diff --git a/devel/pire/files/patch-pire_glue.cpp b/devel/pire/files/patch-pire_glue.cpp
new file mode 100644
index 000000000000..5ac31fae9b95
--- /dev/null
+++ b/devel/pire/files/patch-pire_glue.cpp
@@ -0,0 +1,11 @@
+--- pire/glue.cpp.orig	2010-11-16 23:42:09.000000000 +0000
++++ pire/glue.cpp
+@@ -60,7 +60,7 @@ public:
+ 		size_t finalTableSize = 0;
+ 		for (typename yvector<State>::const_iterator i = states.begin(), ie = states.end(); i != ie; ++i)
+ 			finalTableSize += RangeLen(Lhs().AcceptedRegexps(i->first)) + RangeLen(Rhs().AcceptedRegexps(i->second));
+-		SetSc(new Scanner);
++		this->SetSc(new Scanner);
+ 		Sc().Init(states.size(), Letters(), finalTableSize, size_t(0), Lhs().RegexpsCount() + Rhs().RegexpsCount());
+ 				
+ 		for (size_t state = 0; state != states.size(); ++state) {
diff --git a/devel/pire/files/patch-pire_stub_saveload.h b/devel/pire/files/patch-pire_stub_saveload.h
new file mode 100644
index 000000000000..b572b914ba86
--- /dev/null
+++ b/devel/pire/files/patch-pire_stub_saveload.h
@@ -0,0 +1,20 @@
+--- pire/stub/saveload.h.orig	2010-11-16 23:42:09.000000000 +0000
++++ pire/stub/saveload.h
+@@ -52,7 +52,7 @@ namespace Pire {
+ 				if (!Traits::eq_int_type(ret, Traits::eof())) {
+ 					m_ch = (Char) ret;
+ 					m_read += sizeof(Char);
+-					setg(&m_ch, &m_ch, &m_ch+1);
++					this->setg(&m_ch, &m_ch, &m_ch+1);
+ 				}
+ 				return ret;
+ 			}
+@@ -117,7 +117,7 @@ namespace Pire {
+ 			BasicAlignedOutput(std::basic_ostream<Char, Traits>* backend)
+ 				: m_streambuf(backend->rdbuf())
+ 			{
+-				rdbuf(&m_streambuf);
++				this->rdbuf(&m_streambuf);
+ 			}
+ 
+ 			void Align(size_t divisor = sizeof(void*))
diff --git a/devel/pire/files/patch-samples_pigrep_pigrep.cpp b/devel/pire/files/patch-samples_pigrep_pigrep.cpp
new file mode 100644
index 000000000000..8c456602f749
--- /dev/null
+++ b/devel/pire/files/patch-samples_pigrep_pigrep.cpp
@@ -0,0 +1,10 @@
+--- samples/pigrep/pigrep.cpp.orig	2010-11-16 23:42:09.000000000 +0000
++++ samples/pigrep/pigrep.cpp
+@@ -29,6 +29,7 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <string>
+ #include <stdexcept>
+ #include <iostream>
diff --git a/devel/pire/files/patch-tools_bench_bench.cpp b/devel/pire/files/patch-tools_bench_bench.cpp
new file mode 100644
index 000000000000..88bd60a9c7ff
--- /dev/null
+++ b/devel/pire/files/patch-tools_bench_bench.cpp
@@ -0,0 +1,10 @@
+--- tools/bench/bench.cpp.orig	2010-11-16 23:42:09.000000000 +0000
++++ tools/bench/bench.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <fcntl.h>
+ #include <errno.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <sys/time.h>