3 files changed, 11 insertions, 26 deletions

diff --git a/devel/commoncpp/files/patch-config:ltmain.sh b/devel/commoncpp/files/patch-config:ltmain.sh
deleted file mode 100644
index ede65a87bcf6..000000000000
--- a/devel/commoncpp/files/patch-config:ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- autoconf/ltmain.sh.orig	Thu Feb 12 16:50:30 2004
-+++ autoconf/ltmain.sh	Thu Feb 12 16:50:39 2004
-@@ -5428,10 +5428,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/commoncpp/files/patch-include-cc++-Makefile.in b/devel/commoncpp/files/patch-include-cc++-Makefile.in
new file mode 100644
index 000000000000..0bafe1402e94
--- /dev/null
+++ b/devel/commoncpp/files/patch-include-cc++-Makefile.in
@@ -0,0 +1,11 @@
+--- include/cc++/Makefile.in.bak	Sat Nov 20 13:51:00 2004
++++ include/cc++/Makefile.in	Sat Jun  4 00:22:54 2005
+@@ -224,7 +224,7 @@
+ AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip
+ EXTRA_DIST = *.h
+ MAINTAINERCLEANFILES = config.h Makefile.in config.tmp
+-ccxxincludedir = $(ccincludedir)/cc++/
++ccxxincludedir = $(ccincludedir)/cc++
+ 
+ # export.h are used by other library
+ ccxxinclude_HEADERS = \
diff --git a/devel/commoncpp/files/patch-include_cc++_thread.h b/devel/commoncpp/files/patch-include_cc++_thread.h
deleted file mode 100644
index 8b976b1ac738..000000000000
--- a/devel/commoncpp/files/patch-include_cc++_thread.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/cc++/thread.h.orig	Sat Jan 17 17:51:01 2004
-+++ include/cc++/thread.h	Thu Dec 23 16:38:55 2004
-@@ -914,7 +914,7 @@
- 	static Thread* _main;
- 
- 	Thread *_parent;
--	enum Cancel _cancel;
-+	Cancel _cancel;
- 	Semaphore *_start;
- 
- 	// private data