From 4f42d8855cb32cf306ac1e347e2425aab5bc62f3 Mon Sep 17 00:00:00 2001
From: Fabian Fingerle <fabian@datensalat.eu>
Date: Thu, 18 Jun 2009 16:42:40 +0200
Subject: [PATCH] net-libs/wvstreams-4.6: fixes

---
 .../files/wvstreams-4.5-parallel-make.patch        | 69 ----------------------
 .../files/wvstreams-4.5-valgrind-optional.patch    | 32 ----------
 2 files changed, 101 deletions(-)
 delete mode 100644 net-libs/wvstreams/files/wvstreams-4.5-parallel-make.patch
 delete mode 100644 net-libs/wvstreams/files/wvstreams-4.5-valgrind-optional.patch

diff --git a/net-libs/wvstreams/files/wvstreams-4.5-parallel-make.patch b/net-libs/wvstreams/files/wvstreams-4.5-parallel-make.patch
deleted file mode 100644
index 5194d55..0000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-parallel-make.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -NrU5 wvstreams-4.5.orig/Makefile wvstreams-4.5/Makefile
---- wvstreams-4.5.orig/Makefile	2008-12-07 22:18:20.000000000 +0100
-+++ wvstreams-4.5/Makefile	2008-12-07 22:12:01.000000000 +0100
-@@ -109,14 +109,22 @@
- 
- #
- # libwvstreams: stream/event handling library
- #
- TARGETS += libwvstreams.so
--TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest
-+TARGETS += crypto/tests/ssltest
-+crypto/tests/ssltest: $(LIBWVSTREAMS)
-+
-+TARGETS += ipstreams/tests/unixtest
-+ipstreams/tests/unixtest: $(LIBWVSTREAMS)
-+
- TARGETS += crypto/tests/printcert
-+crypto/tests/printcert: $(LIBWVSTREAMS)
-+
- ifneq ("$(with_readline)", "no")
-   TARGETS += ipstreams/tests/wsd
-+  ipstreams/tests/wsd: $(LIBWVSTREAMS)
-   ipstreams/tests/wsd-LIBS += -lreadline
- else
-   TEST_SKIP_OBJS += ipstreams/tests/wsd
- endif
- TESTS += $(call tests_cc,configfile/tests)
-@@ -151,11 +159,17 @@
- #
- # libwvdbus: C++ DBus library based on wvstreams
- #
- ifneq ("$(with_dbus)", "no")
-   TARGETS += libwvdbus.so
--  TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd
-+
-+  TARGETS += dbus/tests/wvdbus
-+  dbus/tests/wvdbus: $(LIBWVDBUS)
-+
-+  TARGETS += dbus/tests/wvdbusd
-+  dbus/tests/wvdbusd: $(LIBWVDBUS)
-+  
-   TESTS += $(call tests_cc,dbus/tests)
-   libwvdbus_OBJS += $(call objects,dbus)
-   libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
-   libwvdbus.so-LIBS += $(LIBS_DBUS)
-   dbus/tests/%: PRELIBS+=$(LIBWVDBUS)
-diff -NrU5 wvstreams-4.5.orig/wvrules-posix.mk wvstreams-4.5/wvrules-posix.mk
---- wvstreams-4.5.orig/wvrules-posix.mk	2008-12-07 22:18:20.000000000 +0100
-+++ wvstreams-4.5/wvrules-posix.mk	2008-12-07 22:52:57.000000000 +0100
-@@ -83,14 +83,17 @@
- 	    done; \
- 	done; \
- 	$(AR) s $1
- endef
- 
--CC: FORCE
-+CC:
- 	@CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- 	  $(WVSTREAMS)/gen-cc CC c
- 
--CXX: FORCE
-+CXX:
- 	@CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-	  $(WVSTREAMS)/gen-cc CXX cc
-+
-+#All files must depend on the above two rules. This is a godawful hack.
-+$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
- 
- wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-valgrind-optional.patch b/net-libs/wvstreams/files/wvstreams-4.5-valgrind-optional.patch
deleted file mode 100644
index 47120e6..0000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-valgrind-optional.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -NrU5 wvstreams-4.5.orig/configure.ac wvstreams-4.5/configure.ac
---- wvstreams-4.5.orig/configure.ac	2008-12-07 18:38:13.000000000 +0100
-+++ wvstreams-4.5/configure.ac	2008-12-07 21:15:08.000000000 +0100
-@@ -61,10 +61,11 @@
- AC_ARG_WITH(openssl, AC_HELP_STRING([--with-openssl], [OpenSSL >= 0.9.7 (required)]))
- AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam], [PAM]))
- AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [Tcl]))
- AC_ARG_WITH(qt, AC_HELP_STRING([--with-qt], [Qt]))
- AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [zlib (required)]))
-+AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind], [Valgrind]))
- 
- AC_ARG_VAR(MOC, [Qt meta object compiler])
- AC_ARG_VAR(WEAVER_BUILD_INFO, [Extra version info])
- 
- # avoid autoconf's default values, but keep those the user might have given
-@@ -491,12 +492,14 @@
-     fi
-     AC_PATH_PROG(MOC, moc, [moc not found], $with_qt/bin)
- fi
- 
- # valgrind
--AC_CHECK_PROG(VALGRIND, valgrind, valgrind)
--AC_CHECK_HEADERS(valgrind/memcheck.h)
-+if test "$with_valgrind" != "no"; then
-+    AC_CHECK_PROG(VALGRIND, valgrind, valgrind)
-+    AC_CHECK_HEADERS(valgrind/memcheck.h)
-+fi
- 
- # zlib
- if test "$with_zlib" != "no"; then
-     AC_CHECK_HEADERS(zlib.h,, [with_zlib=no])
-     AC_CHECK_LIB(z, compress,, [with_zlib=no])
-- 
2.11.4.GIT