5 files changed, 54 insertions, 35 deletions
diff --git a/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py b/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
new file mode 100644
index 000000000000..db564bd2376c
--- /dev/null
+++ b/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
@@ -0,0 +1,11 @@
+--- buildtools/wafsamba/samba_install.py.orig	2010-12-21 02:00:02.000000000 +0100
++++ buildtools/wafsamba/samba_install.py	2011-06-21 11:46:28.000000000 +0200
+@@ -109,7 +109,7 @@
+             inst_name    = bld.make_libname(t.target)
+     elif self.vnum:
+         vnum_base    = self.vnum.split('.')[0]
+-        install_name = bld.make_libname(target_name, version=self.vnum)
++        install_name = bld.make_libname(target_name, version=vnum_base)
+         install_link = bld.make_libname(target_name, version=vnum_base)
+         inst_name    = bld.make_libname(t.target)
+         if not self.private_library:
diff --git a/devel/tevent/files/patch-lib__replace__system__wait.h b/devel/tevent/files/patch-lib__replace__system__wait.h
new file mode 100644
index 000000000000..3cfa995371b3
--- /dev/null
+++ b/devel/tevent/files/patch-lib__replace__system__wait.h
@@ -0,0 +1,21 @@
+--- ./lib/replace/system/wait.h.orig	2010-04-01 15:26:22.000000000 +0200
++++ ./lib/replace/system/wait.h	2010-04-23 01:08:35.000000000 +0200
+@@ -32,6 +32,18 @@
+ 
+ #include <signal.h>
+ 
++#ifndef SIGRTMIN
++#	ifdef NSIG
++#		define SIGRTMIN (NSIG+1)
++#	else
++#		define SIGRTMIN 33
++#	endif
++#endif
++
++#ifndef SIGRTMAX
++#define SIGRTMAX (SIGRTMIN+64)
++#endif
++
+ #ifndef SIGCLD
+ #define SIGCLD SIGCHLD
+ #endif
diff --git a/devel/tevent/files/patch-tevent.mk b/devel/tevent/files/patch-tevent.mk
deleted file mode 100644
index c25afaba9ab6..000000000000
--- a/devel/tevent/files/patch-tevent.mk
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./tevent.mk.orig	2010-01-08 23:45:07.000000000 +0000
-+++ ./tevent.mk	2010-01-08 23:47:23.000000000 +0000
-@@ -1,6 +1,6 @@
- TEVENT_SOBASE = libtevent.$(SHLIBEXT)
- TEVENT_SONAME = $(TEVENT_SOBASE).0
--TEVENT_SOLIB = $(TEVENT_SOBASE).$(PACKAGE_VERSION)
-+TEVENT_SOLIB = $(TEVENT_SOBASE).0
- TEVENT_STLIB = libtevent.a
- 
- $(TEVENT_STLIB): $(TEVENT_OBJ)
-@@ -9,22 +9,19 @@
- $(TEVENT_SOBASE): $(TEVENT_SOLIB)
- 	ln -fs $< $@
- 
--$(TEVENT_SONAME): $(TEVENT_SOLIB)
--	ln -fs $< $@
--
- dirs::
- 	@mkdir -p lib
- 
- installdirs::
- 	mkdir -p $(DESTDIR)$(includedir)
- 	mkdir -p $(DESTDIR)$(libdir)
--	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
-+	mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
- 
- installheaders:: installdirs
- 	cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
- 
- installlibs:: installdirs
--	cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
-+	cp tevent.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	cp $(TEVENT_STLIB) $(TEVENT_SOLIB) $(DESTDIR)$(libdir)
- 
- install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
diff --git a/devel/tevent/files/patch-tevent_signal.c b/devel/tevent/files/patch-tevent_signal.c
new file mode 100644
index 000000000000..f35ed12e904b
--- /dev/null
+++ b/devel/tevent/files/patch-tevent_signal.c
@@ -0,0 +1,11 @@
+--- tevent_signal.c.orig	2011-07-24 22:04:44.000000000 +0200
++++ tevent_signal.c	2011-07-30 03:36:03.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include "tevent_internal.h"
+ #include "tevent_util.h"
+ 
+-#define TEVENT_NUM_SIGNALS 64
++#define TEVENT_NUM_SIGNALS SIGRTMAX
+ 
+ /* maximum number of SA_SIGINFO signals to hold in the queue.
+   NB. This *MUST* be a power of 2, in order for the ring buffer
diff --git a/devel/tevent/files/patch-wscript b/devel/tevent/files/patch-wscript
new file mode 100644
index 000000000000..bfab3c52aa00
--- /dev/null
+++ b/devel/tevent/files/patch-wscript
@@ -0,0 +1,11 @@
+--- wscript.orig	2011-07-10 11:52:43.000000000 +0200
++++ wscript	2011-07-30 03:18:21.000000000 +0200
+@@ -69,7 +69,7 @@
+         SRC += ' tevent_epoll.c'
+ 
+     if bld.env.standalone_tevent:
+-        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
++        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
+         bld.PKG_CONFIG_FILES('tevent.pc', vnum=VERSION)
+         private_library = False
+     else: