OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Oct-2007 20:19:52
Branch: HEAD Handle: 2007101319195100
Modified files:
openpkg-src/vortex vortex.patch vortex.spec
Log:
upgrading package: vortex 1.0.7 -> 1.0.8
Summary:
Revision Changes Path
1.5 +32 -16 openpkg-src/vortex/vortex.patch
1.14 +10 -10 openpkg-src/vortex/vortex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vortex/vortex.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 vortex.patch
--- openpkg-src/vortex/vortex.patch 3 Jun 2007 08:16:12 -0000 1.4
+++ openpkg-src/vortex/vortex.patch 13 Oct 2007 18:19:51 -0000 1.5
@@ -1,7 +1,23 @@
+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-05-30 19:44:34 +0200
-+++ data/Makefile.in 2007-06-02 13:14:12 +0200
-@@ -200,7 +200,7 @@
+--- 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@
@@ -11,8 +27,8 @@
EXTRA_DIST = $(dtd_DATA)
all: all-am
Index: src/vortex_tls.c
---- src/vortex_tls.c.orig 2007-05-18 22:03:57 +0200
-+++ src/vortex_tls.c 2007-06-02 13:14:12 +0200
+--- 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"
@@ -22,20 +38,20 @@
/* some keys to store creation handlers and its associate data */
Index: test/Makefile.in
---- test/Makefile.in.orig 2007-05-30 19:44:34 +0200
-+++ test/Makefile.in 2007-06-02 13:14:36 +0200
-@@ -324,7 +324,7 @@
+--- 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 @@
@[EMAIL PROTECTED] = -DVORTEX_HAVE_POLL=1
@[EMAIL PROTECTED] = -DVORTEX_HAVE_EPOLL=1
@[EMAIL PROTECTED] = -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
- INCLUDES = -I$(top_srcdir)/libvortex/src \
+ 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-27 09:17:32 +0200
-+++ vortex.pc.in 2007-06-02 13:15:00 +0200
+--- 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
@@ -44,9 +60,9 @@
+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-05-30 19:44:35 +0200
-+++ xml-rpc-gen/Makefile.in 2007-06-02 13:14:12 +0200
-@@ -224,7 +224,7 @@
+--- 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@
@@ -54,4 +70,4 @@
+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
$(LIBRARIES_CFLAGS) $(AXL_CFLAGS) $(EXARG_CFLAGS) $(PTHREAD_CFLAGS)
-DVERSION=\""$(VORTEX_VERSION)"\" -DINSTALL_DIR=\"$(datadir)/libvortex\"
-I../src
+ 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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vortex/vortex.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 vortex.spec
--- openpkg-src/vortex/vortex.spec 3 Sep 2007 15:49:19 -0000 1.13
+++ openpkg-src/vortex/vortex.spec 13 Oct 2007 18:19:51 -0000 1.14
@@ -23,8 +23,8 @@
##
# package version
-%define V_external 1.0.7
-%define V_internal b2910.g2911
+%define V_external 1.0.8
+%define V_internal b3048.g3052
# package information
Name: vortex
@@ -37,7 +37,7 @@
Group: Network
License: LGPL
Version: %{V_external}
-Release: 20070903
+Release: 20071013
# package options
%option with_ssl yes
@@ -88,15 +88,15 @@
CFLAGS="%{l_cflags -O}"
CPPFLAGS="%{l_cppflags}"
LDFLAGS="%{l_ldflags}"
- LIBRARIES_CFLAGS="%{l_cppflags} `pkg-config gthread-2.0 glib-2.0
--cflags`"
- LIBRARIES_LIBS="%{l_ldflags} `pkg-config gthread-2.0 glib-2.0 --libs`"
- LIBRARIES_CFLAGS="$LIBRARIES_CFLAGS `pkg-config readline --cflags`"
- LIBRARIES_LIBS="$LIBRARIES_LIBS `pkg-config readline --libs`"
+ CFLAGS="%{l_cppflags} `pkg-config gthread-2.0 glib-2.0 --cflags`"
+ LIBS="%{l_ldflags} `pkg-config gthread-2.0 glib-2.0 --libs`"
+ CFLAGS="$CFLAGS `pkg-config readline --cflags`"
+ LIBS="$LIBS `pkg-config readline --libs`"
%if "%{with_ssl}" == "yes"
- LIBRARIES_CFLAGS="$LIBRARIES_CFLAGS `pkg-config openssl --cflags`"
- LIBRARIES_LIBS="$LIBRARIES_LIBS `pkg-config openssl --libs`"
+ CFLAGS="$CFLAGS `pkg-config openssl --cflags`"
+ LIBS="$LIBS `pkg-config openssl --libs`"
%endif
- export CC CFLAGS CPPFLAGS LDFLAGS LIBRARIES_CFLAGS LIBRARIES_LIBS
+ export CC CFLAGS CPPFLAGS LDFLAGS LIBS
./configure \
--prefix=%{l_prefix} \
%if "%{with_ssl}" == "yes"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
