openpkg-packages/vortex/vortex.patch

Index: configure
--- configure.orig	2007-10-11 17:56:36 +0200
+++ configure	2007-10-13 20:14:04 +0200
@@ -19598,7 +19598,11 @@
 
 if test $vortex_p_t_r = yes; then
 
-      vortex_cv_pthreads_cflags="$flag"
+      if test ".$flag" != ".none"; then
+          vortex_cv_pthreads_cflags="$flag"
+      else 
+          vortex_cv_pthreads_cflags=""
+      fi
       break
 
 fi
Index: data/Makefile.in
--- data/Makefile.in.orig	2007-10-11 17:56:34 +0200
+++ data/Makefile.in	2007-10-13 20:07:38 +0200
@@ -199,7 +199,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-dtddir = $(datadir)/libvortex
+dtddir = $(datadir)/vortex
 dtd_DATA = channel.dtd sasl.dtd tls.dtd xml-rpc-boot.dtd vortex-listener-conf.dtd
 EXTRA_DIST = $(dtd_DATA)
 all: all-am
Index: src/vortex_tls.c
--- src/vortex_tls.c.orig	2007-09-17 16:53:26 +0200
+++ src/vortex_tls.c	2007-10-13 20:07:38 +0200
@@ -48,6 +48,7 @@
 #define LOG_DOMAIN "vortex-tls"
 
 #include <vortex.h>
+#undef boolean /* undefine AXL #define boolean int as it clashes with OpenSSL asn1.h */
 #include <openssl/err.h>
 
 /* some keys to store creation handlers and its associate data */
Index: test/Makefile.in
--- test/Makefile.in.orig	2007-10-11 17:56:35 +0200
+++ test/Makefile.in	2007-10-13 20:07:38 +0200
@@ -336,7 +336,7 @@
 @ENABLE_POLL_SUPPORT_TRUE@INCLUDE_VORTEX_POLL = -DVORTEX_HAVE_POLL=1
 @ENABLE_EPOLL_SUPPORT_TRUE@INCLUDE_VORTEX_EPOLL = -DVORTEX_HAVE_EPOLL=1
 @ENABLE_VORTEX_LOG_TRUE@INCLUDE_VORTEX_LOG = -DENABLE_VORTEX_LOG
-certfilesdir = $(datadir)/libvortex
+certfilesdir = $(datadir)/vortex
 certfiles_DATA = test-certificate.pem test-private-key.pem
 EXTRA_DIST = Makefile.win $(certfiles_DATA) vortex-regression-client.vcproj  vortex-regression-listener.vcproj vortex-regression-client.idl
 INCLUDES = -I$(top_srcdir)/libvortex/src $(AXL_CFLAGS)  $(PTHREAD_CFLAGS) \
Index: vortex.pc.in
--- vortex.pc.in.orig	2007-05-24 13:04:37 +0200
+++ vortex.pc.in	2007-10-13 20:07:38 +0200
@@ -7,5 +7,5 @@
 Description: Robust, full featured BEEP implementation (RFC 3080/RFC 3081)
 Requires: axl
 Version: @VORTEX_VERSION@
-Libs: -L${libdir} -lvortex @TLS_SUPPORT_FLAGS@ @SASL_LIBS@ @PTHREAD_LIBS@
+Libs: -L${libdir} -lvortex @TLS_SUPPORT_FLAGS@ @SASL_LIBS@ @LIBRARIES_LIBS@ @PTHREAD_LIBS@
 Cflags: -I${includedir}/vortex @SASL_CFLAGS@ @PTHREAD_CFLAGS@
Index: xml-rpc-gen/Makefile.in
--- xml-rpc-gen/Makefile.in.orig	2007-10-11 17:56:35 +0200
+++ xml-rpc-gen/Makefile.in	2007-10-13 20:07:38 +0200
@@ -222,7 +222,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-dtddir = $(datadir)/libvortex
+dtddir = $(datadir)/vortex
 dtd_DATA = xml-rpc.dtd
 EXTRA_DIST = $(dtd_DATA) $(wildcard *.idl) $(wildcard *.xdl) $(wildcard *.c) _support.c 
 INCLUDES = -g -Wall -ansi -I. -I$(top_srcdir)/libvortex/src $(AXL_CFLAGS) $(EXARG_CFLAGS) $(PTHREAD_CFLAGS) -DVERSION=\""$(VORTEX_VERSION)"\" -DINSTALL_DIR=\"$(datadir)/libvortex\" -I../src