diff --git a/devel/soup/Makefile b/devel/soup/Makefile index da82582af88..5d3f0df4e1f 100644 --- a/devel/soup/Makefile +++ b/devel/soup/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/12/03 19:39:32 marcm Exp $ +# $OpenBSD: Makefile,v 1.2 2003/01/03 21:38:43 marcm Exp $ COMMENT= "a SOAP (Simple Object Access Protocol) implementation in C" -DISTNAME= soup-0.7.4 +DISTNAME= soup-0.7.10 CATEGORIES= devel HOMEPAGE= http://www.gnome.org/ diff --git a/devel/soup/distinfo b/devel/soup/distinfo index 932b700685e..69f10b4850f 100644 --- a/devel/soup/distinfo +++ b/devel/soup/distinfo @@ -1,3 +1,3 @@ -MD5 (soup-0.7.4.tar.bz2) = 848ccf5e7616cd897593bab72bbc9b5a -RMD160 (soup-0.7.4.tar.bz2) = cb304e8d14d9e8322ce951df21261fc8a2a483c8 -SHA1 (soup-0.7.4.tar.bz2) = 4b5ebaa22cff35ae82dde8cc0a44408b65018359 +MD5 (soup-0.7.10.tar.bz2) = baf1ecd6e14ca50544ce889ba363a9be +RMD160 (soup-0.7.10.tar.bz2) = 1c4eda99beb7ffa8db5e1a40d20cc77083c60d03 +SHA1 (soup-0.7.10.tar.bz2) = c383fb880d5e32f6600c8c0757d97edede1e2114 diff --git a/devel/soup/patches/patch-configure b/devel/soup/patches/patch-configure index 4e189f9a511..5e654ac54cb 100644 --- a/devel/soup/patches/patch-configure +++ b/devel/soup/patches/patch-configure @@ -1,45 +1,25 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2002/12/03 19:39:32 marcm Exp $ ---- configure.orig Wed Oct 16 08:48:58 2002 -+++ configure Wed Oct 16 08:54:45 2002 -@@ -3087,6 +3087,16 @@ newos6*) - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -+openbsd*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then -+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ else -+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ fi -+ ;; -+ - osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -@@ -4797,8 +4807,8 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' +$OpenBSD: patch-configure,v 1.2 2003/01/03 21:38:43 marcm Exp $ +--- configure.orig Sun Dec 15 23:25:02 2002 ++++ configure Sun Dec 15 23:25:36 2002 +@@ -3850,8 +3850,8 @@ else hardcode_direct=yes hardcode_shlibpath_var=no - ;; -@@ -5281,10 +5291,9 @@ newsos6) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=yes - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in +@@ -3860,8 +3860,8 @@ else + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + ;; + esac + fi diff --git a/devel/soup/patches/patch-ltmain_sh b/devel/soup/patches/patch-ltmain_sh index 73c4f087c19..a302d49c219 100644 --- a/devel/soup/patches/patch-ltmain_sh +++ b/devel/soup/patches/patch-ltmain_sh @@ -1,7 +1,7 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/12/03 19:39:32 marcm Exp $ ---- ltmain.sh.orig Wed Oct 16 08:47:01 2002 -+++ ltmain.sh Wed Oct 16 08:48:43 2002 -@@ -1037,6 +1037,17 @@ compiler." +$OpenBSD: patch-ltmain_sh,v 1.2 2003/01/03 21:38:43 marcm Exp $ +--- ltmain.sh.orig Tue Dec 3 13:13:50 2002 ++++ ltmain.sh Sun Dec 15 23:27:06 2002 +@@ -1073,6 +1073,17 @@ compiler." continue ;; @@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/12/03 19:39:32 marcm Exp $ -module) module=yes continue -@@ -1473,6 +1484,9 @@ compiler." +@@ -1530,6 +1541,9 @@ compiler." fi continue ;; @@ -29,7 +29,19 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/12/03 19:39:32 marcm Exp $ %DEPLIBS%) alldeplibs=yes continue -@@ -4412,40 +4426,6 @@ relink_command=\"$relink_command\"" +@@ -1775,11 +1789,6 @@ compiler." + continue + fi + +- 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 +@@ -4526,40 +4535,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. test "$show" = ":" && exit 0 diff --git a/devel/soup/patches/patch-src_libsoup_soup-message_c b/devel/soup/patches/patch-src_libsoup_soup-message_c index 59982c60f21..eb21f25372f 100644 --- a/devel/soup/patches/patch-src_libsoup_soup-message_c +++ b/devel/soup/patches/patch-src_libsoup_soup-message_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_libsoup_soup-message_c,v 1.1.1.1 2002/12/03 19:39:32 marcm Exp $ ---- src/libsoup/soup-message.c.orig Fri Nov 22 21:29:02 2002 -+++ src/libsoup/soup-message.c Fri Nov 22 21:29:54 2002 -@@ -907,9 +907,9 @@ typedef struct { +$OpenBSD: patch-src_libsoup_soup-message_c,v 1.2 2003/01/03 21:38:43 marcm Exp $ +--- src/libsoup/soup-message.c.orig Mon Dec 2 08:03:15 2002 ++++ src/libsoup/soup-message.c Sun Dec 15 23:19:34 2002 +@@ -992,9 +992,9 @@ typedef struct { SoupHandlerKind kind; union { @@ -12,7 +12,7 @@ $OpenBSD: patch-src_libsoup_soup-message_c,v 1.1.1.1 2002/12/03 19:39:32 marcm E } data; } SoupHandlerData; -@@ -922,7 +922,7 @@ static SoupHandlerData global_handlers [ +@@ -1007,7 +1007,7 @@ static SoupHandlerData global_handlers [ redirect_handler, NULL, RESPONSE_HEADER_HANDLER, @@ -21,7 +21,7 @@ $OpenBSD: patch-src_libsoup_soup-message_c,v 1.1.1.1 2002/12/03 19:39:32 marcm E }, /* * Handle authorization. -@@ -932,7 +932,7 @@ static SoupHandlerData global_handlers [ +@@ -1017,7 +1017,7 @@ static SoupHandlerData global_handlers [ (SoupCallbackFn) authorize_handler, GINT_TO_POINTER (FALSE), RESPONSE_ERROR_CODE_HANDLER, @@ -30,7 +30,7 @@ $OpenBSD: patch-src_libsoup_soup-message_c,v 1.1.1.1 2002/12/03 19:39:32 marcm E }, /* * Handle proxy authorization. -@@ -942,7 +942,7 @@ static SoupHandlerData global_handlers [ +@@ -1027,7 +1027,7 @@ static SoupHandlerData global_handlers [ (SoupCallbackFn) authorize_handler, GINT_TO_POINTER (TRUE), RESPONSE_ERROR_CODE_HANDLER, diff --git a/devel/soup/pkg/PFRAG.shared b/devel/soup/pkg/PFRAG.shared index 2a4ea9082ad..b19bc956877 100644 --- a/devel/soup/pkg/PFRAG.shared +++ b/devel/soup/pkg/PFRAG.shared @@ -1,4 +1,5 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/12/03 19:39:32 marcm Exp $ -lib/libsoup-apache.so.5.0 -lib/libsoup.so.5.0 +@comment $OpenBSD: PFRAG.shared,v 1.2 2003/01/03 21:38:43 marcm Exp $ +lib/libsoup-apache.so.6.4 +lib/libsoup.so.6.4 +lib/libwsdl.so.6.4 DYNLIBDIR(%D/lib) diff --git a/devel/soup/pkg/PLIST b/devel/soup/pkg/PLIST index 26c447226ff..faf27b8c4a3 100644 --- a/devel/soup/pkg/PLIST +++ b/devel/soup/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2002/12/03 19:39:32 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.2 2003/01/03 21:38:43 marcm Exp $ bin/soup-config bin/soup-httpd bin/soup-ssl-proxy @@ -33,6 +33,8 @@ lib/libsoup-apache.a lib/libsoup-apache.la lib/libsoup.a lib/libsoup.la +lib/libwsdl.a +lib/libwsdl.la lib/pkgconfig/soup.pc lib/soupConf.sh lib/soup_apacheConf.sh