cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.1.11, now part of the 2.1/2.2 series.

Browse Source
This commit is contained in:
marcm 2004-06-25 16:16:51 +00:00
parent a8ffb5140c
commit 9e9a0c1889
10 changed files with 138 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/libsoup/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 15:44:05 marcm Exp $
# $OpenBSD: Makefile,v 1.2 2004/06/25 16:16:51 marcm Exp $
COMMENT= "a SOAP (Simple Object Access Protocol) implementation in C"
DISTNAME= libsoup-1.99.26
DISTNAME= libsoup-2.1.11
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org/
@ -15,19 +15,24 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/1.99/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/2.1/}
EXTRACT_SUFX= .tar.bz2
MODULE= gettext
LIB_DEPENDS= glib-2.0.0.0,gobject-2.0.0.0,gthread-2.0.0.0::devel/glib2 \
xml2.7::textproc/libxml
LIB_DEPENDS= glib-2.0.0.0::devel/glib2
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.57
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --disable-gtk-doc
# Uses GnuTLS now...
CONFIGURE_ARGS+= --disable-ssl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
API_VERSION= 2.2
SUBST_VARS= API_VERSION
.include <bsd.port.mk>

6
devel/libsoup/distinfo
View File

@ -1,3 +1,3 @@
MD5 (libsoup-1.99.26.tar.bz2) = acb6658fd0dcebd2c5fc8347e0183515
RMD160 (libsoup-1.99.26.tar.bz2) = e1ba87712a55005da6dc61137faf7962a79e1341
SHA1 (libsoup-1.99.26.tar.bz2) = b3759bafb349e103f62ec360cf6a553b73ddd9fd
MD5 (libsoup-2.1.11.tar.bz2) = 7a1811eb8c6d1988402cfdee9e9c65f3
RMD160 (libsoup-2.1.11.tar.bz2) = 9568082dcbdac5daa638caf2c87b2f1c9d2f0f67
SHA1 (libsoup-2.1.11.tar.bz2) = 3c375487fa4457e443d3a67da05d7496f5e038c3

29
devel/libsoup/patches/patch-configure_in
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2003/11/03 15:44:05 marcm Exp $
--- configure.in.orig 2003-11-01 09:47:20.000000000 -0800
+++ configure.in 2003-11-01 09:47:23.000000000 -0800
@@ -248,11 +248,11 @@ if test "x$enable_ssl" = xyes; then
###
### Check for GnuTLS
###
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $gnutls_inc_prefix"
- AC_CHECK_HEADERS(gnutls/gnutls.h,
- [enable_gnutls="yes"],
- [enable_gnutls="no"; break])
+dnl save_CPPFLAGS=$CPPFLAGS
+dnl CPPFLAGS="$CPPFLAGS $gnutls_inc_prefix"
+dnl AC_CHECK_HEADERS(gnutls/gnutls.h,
+dnl [enable_gnutls="yes"],
+dnl [enable_gnutls="no"; break])
if test "x$enable_gnutls" = xyes; then
if test "x$enable_static_ssl" = "xyes"; then
@@ -271,7 +271,7 @@ if test "x$enable_ssl" = xyes; then
AC_SUBST(GNUTLS_CFLAGS)
AC_SUBST(GNUTLS_LIBS)
- CPPFLAGS=$save_CPPFLAGS
+dnl CPPFLAGS=$save_CPPFLAGS
AM_CONDITIONAL(BUILD_PROXY, false)

14
devel/libsoup/patches/patch-libsoup_soup-address_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libsoup_soup-address_c,v 1.1.1.1 2003/11/03 15:44:05 marcm Exp $
--- libsoup/soup-address.c.orig 2003-08-28 14:09:44.000000000 -0700
+++ libsoup/soup-address.c 2003-08-28 14:10:11.000000000 -0700
@@ -25,9 +25,9 @@
#include <sys/wait.h>
#include <signal.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
-#include <netinet/in.h>
#include "soup-private.h"
#include "soup-address.h"

10
devel/libsoup/patches/patch-libsoup_soup-headers_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-libsoup_soup-headers_c,v 1.1.1.1 2003/11/03 15:44:05 marcm Exp $
--- libsoup/soup-headers.c.orig 2003-08-28 14:00:08.000000000 -0700
+++ libsoup/soup-headers.c 2003-08-28 14:04:08.000000000 -0700
@@ -125,7 +125,7 @@ soup_headers_parse_request (gchar
goto THROW_MALFORMED_HEADER;
$OpenBSD: patch-libsoup_soup-headers_c,v 1.2 2004/06/25 16:16:51 marcm Exp $
--- libsoup/soup-headers.c.orig 2003-09-22 13:10:41.000000000 -0700
+++ libsoup/soup-headers.c 2003-12-09 20:48:19.000000000 -0800
@@ -119,7 +119,7 @@ soup_headers_parse_request (char
return FALSE;
if (sscanf (str,
- "%16s %1024s HTTP/%1u.%1u",

15
devel/libsoup/patches/patch-libsoup_soup-ssl_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-libsoup_soup-ssl_c,v 1.1.1.1 2003/11/03 15:44:05 marcm Exp $
--- libsoup/soup-ssl.c.orig 2003-08-28 13:58:39.000000000 -0700
+++ libsoup/soup-ssl.c 2003-08-28 13:59:37.000000000 -0700
@@ -133,9 +133,9 @@ soup_ssl_get_iochannel_real (GIOChannel
execl (LIBEXECDIR G_DIR_SEPARATOR_S SSL_PROXY_NAME,
LIBEXECDIR G_DIR_SEPARATOR_S SSL_PROXY_NAME,
- NULL);
+ (void *)NULL);
- execlp (SSL_PROXY_NAME, SSL_PROXY_NAME, NULL);
+ execlp (SSL_PROXY_NAME, SSL_PROXY_NAME, (void *)NULL);
g_error ("Error executing SSL Proxy\n");
}

110
devel/libsoup/patches/patch-ltmain_sh
View File

@ -1,94 +1,70 @@
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/11/03 15:44:05 marcm Exp $
--- ltmain.sh.orig 2003-09-12 14:13:55.000000000 -0700
+++ ltmain.sh 2003-11-01 10:42:34.000000000 -0800
@@ -1085,6 +1085,17 @@ compiler."
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1525,6 +1536,19 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.2 2004/06/25 16:16:51 marcm Exp $
--- ltmain.sh.orig 2004-02-12 03:45:26.000000000 -0800
+++ ltmain.sh 2004-05-02 10:11:56.000000000 -0700
@@ -1847,9 +1847,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
+ continue
fi
+ if test "$linkmode" = "lib"; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ deplibs="$deplib $deplibs"
continue
;;
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
%DEPLIBS%)
alldeplibs=yes
continue
@@ -1770,11 +1794,6 @@ compiler."
continue
fi
-l*)
@@ -2262,10 +2265,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4580,40 +4599,6 @@ relink_command=\"$relink_command\""
# This is a shared library
# Warn about portability, can't link against -module's on some systems (darwin)
@@ -5804,40 +5803,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- $echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
;;

12
devel/libsoup/patches/patch-tests_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tests_Makefile_in,v 1.1 2004/06/25 16:16:51 marcm Exp $
--- tests/Makefile.in.orig 2004-04-09 21:30:22.000000000 -0700
+++ tests/Makefile.in 2004-04-09 21:31:53.000000000 -0700
@@ -118,7 +118,7 @@ INCLUDES = \
$(GLIB_CFLAGS)
-LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la
+LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la $(GLIB_LIBS)
noinst_PROGRAMS = \
auth-test \

4
devel/libsoup/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/11/03 15:44:05 marcm Exp $
lib/libsoup-2.0.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/06/25 16:16:51 marcm Exp $
lib/libsoup-${API_VERSION}.so.4.1
DYNLIBDIR(%D/lib)

82
devel/libsoup/pkg/PLIST
View File

@ -1,22 +1,62 @@
@comment $OpenBSD: PLIST,v 1.2 2003/12/15 16:51:04 naddy Exp $
include/soup-2.0/libsoup/soup-address.h
include/soup-2.0/libsoup/soup-context.h
include/soup-2.0/libsoup/soup-error.h
include/soup-2.0/libsoup/soup-headers.h
include/soup-2.0/libsoup/soup-message.h
include/soup-2.0/libsoup/soup-method.h
include/soup-2.0/libsoup/soup-misc.h
include/soup-2.0/libsoup/soup-ntlm.h
include/soup-2.0/libsoup/soup-server-auth.h
include/soup-2.0/libsoup/soup-server.h
include/soup-2.0/libsoup/soup-socket.h
include/soup-2.0/libsoup/soup-uri.h
include/soup-2.0/libsoup/soup.h
lib/libsoup-2.0.a
lib/libsoup-2.0.la
lib/pkgconfig/soup-2.0.pc
libexec/libsoup-ssl-proxy
@comment $OpenBSD: PLIST,v 1.3 2004/06/25 16:16:51 marcm Exp $
include/libsoup-${API_VERSION}/libsoup/soup-address.h
include/libsoup-${API_VERSION}/libsoup/soup-connection.h
include/libsoup-${API_VERSION}/libsoup/soup-headers.h
include/libsoup-${API_VERSION}/libsoup/soup-message-filter.h
include/libsoup-${API_VERSION}/libsoup/soup-message-queue.h
include/libsoup-${API_VERSION}/libsoup/soup-message.h
include/libsoup-${API_VERSION}/libsoup/soup-method.h
include/libsoup-${API_VERSION}/libsoup/soup-misc.h
include/libsoup-${API_VERSION}/libsoup/soup-server-auth.h
include/libsoup-${API_VERSION}/libsoup/soup-server-message.h
include/libsoup-${API_VERSION}/libsoup/soup-server.h
include/libsoup-${API_VERSION}/libsoup/soup-session-async.h
include/libsoup-${API_VERSION}/libsoup/soup-session-sync.h
include/libsoup-${API_VERSION}/libsoup/soup-session.h
include/libsoup-${API_VERSION}/libsoup/soup-soap-message.h
include/libsoup-${API_VERSION}/libsoup/soup-soap-response.h
include/libsoup-${API_VERSION}/libsoup/soup-socket.h
include/libsoup-${API_VERSION}/libsoup/soup-status.h
include/libsoup-${API_VERSION}/libsoup/soup-types.h
include/libsoup-${API_VERSION}/libsoup/soup-uri.h
include/libsoup-${API_VERSION}/libsoup/soup.h
lib/libsoup-${API_VERSION}.a
lib/libsoup-${API_VERSION}.la
lib/pkgconfig/libsoup-${API_VERSION}.pc
share/gtk-doc/html/libsoup/SoupAddress.html
share/gtk-doc/html/libsoup/SoupAuth.html
share/gtk-doc/html/libsoup/SoupAuthBasic.html
share/gtk-doc/html/libsoup/SoupAuthDigest.html
share/gtk-doc/html/libsoup/SoupConnection.html
share/gtk-doc/html/libsoup/SoupConnectionNTLM.html
share/gtk-doc/html/libsoup/SoupMessage.html
share/gtk-doc/html/libsoup/SoupServer.html
share/gtk-doc/html/libsoup/SoupServerMessage.html
share/gtk-doc/html/libsoup/SoupSession.html
share/gtk-doc/html/libsoup/SoupSoapMessage.html
share/gtk-doc/html/libsoup/SoupSocket.html
share/gtk-doc/html/libsoup/ch01.html
share/gtk-doc/html/libsoup/home.png
share/gtk-doc/html/libsoup/index.html
share/gtk-doc/html/libsoup/index.sgml
share/gtk-doc/html/libsoup/left.png
share/gtk-doc/html/libsoup/libsoup-soup-dns.html
share/gtk-doc/html/libsoup/libsoup-soup-headers.html
share/gtk-doc/html/libsoup/libsoup-soup-md5-utils.html
share/gtk-doc/html/libsoup/libsoup-soup-message-private.html
share/gtk-doc/html/libsoup/libsoup-soup-message-queue.html
share/gtk-doc/html/libsoup/libsoup-soup-method.html
share/gtk-doc/html/libsoup/libsoup-soup-misc.html
share/gtk-doc/html/libsoup/libsoup-soup-server-auth.html
share/gtk-doc/html/libsoup/libsoup-soup-ssl.html
share/gtk-doc/html/libsoup/libsoup-soup-status.html
share/gtk-doc/html/libsoup/libsoup-soup-uri.html
share/gtk-doc/html/libsoup/libsoup.devhelp
share/gtk-doc/html/libsoup/right.png
share/gtk-doc/html/libsoup/up.png
%%SHARED%%
@dirrm lib/pkgconfig
@dirrm include/soup-2.0/libsoup
@dirrm include/soup-2.0
@dirrm share/gtk-doc/html/libsoup
@dirrm share/gtk-doc/html
@dirrm share/gtk-doc
@dirrm include/libsoup-${API_VERSION}/libsoup
@dirrm include/libsoup-${API_VERSION}