diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/libsoup24/Makefile | 11 | ||||
-rw-r--r-- | net/libsoup24/PLIST | 23 | ||||
-rw-r--r-- | net/libsoup24/distinfo | 11 | ||||
-rw-r--r-- | net/libsoup24/patches/patch-aa | 13 | ||||
-rw-r--r-- | net/libsoup24/patches/patch-ba | 13 | ||||
-rw-r--r-- | net/libsoup24/patches/patch-bb | 13 |
6 files changed, 61 insertions, 23 deletions
diff --git a/net/libsoup24/Makefile b/net/libsoup24/Makefile index 3e829111dcb..6749f9fdf19 100644 --- a/net/libsoup24/Makefile +++ b/net/libsoup24/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2009/01/13 15:28:40 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2009/03/16 12:49:02 jmcneill Exp $ -DISTNAME= libsoup-2.24.3 +DISTNAME= libsoup-2.25.91 PKGNAME= ${DISTNAME:S/libsoup/libsoup24/} CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/2.24/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/2.25/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= recht@NetBSD.org @@ -16,10 +16,13 @@ USE_TOOLS+= pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= libsoup.pc.in +PKGCONFIG_OVERRIDE+= libsoup-2.4.pc.in +PKGCONFIG_OVERRIDE+= libsoup-gnome-2.4.pc.in +.include "../../databases/sqlite3/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.15.3 .include "../../devel/glib2/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../www/libproxy/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libsoup24/PLIST b/net/libsoup24/PLIST index 1e3de40547f..01d96112d92 100644 --- a/net/libsoup24/PLIST +++ b/net/libsoup24/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2008/10/24 21:54:56 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/03/16 12:49:02 jmcneill Exp $ include/libsoup-2.4/libsoup/soup-address.h include/libsoup-2.4/libsoup/soup-auth-domain-basic.h include/libsoup-2.4/libsoup/soup-auth-domain-digest.h include/libsoup-2.4/libsoup/soup-auth-domain.h include/libsoup-2.4/libsoup/soup-auth.h +include/libsoup-2.4/libsoup/soup-cookie-jar-text.h include/libsoup-2.4/libsoup/soup-cookie-jar.h include/libsoup-2.4/libsoup/soup-cookie.h include/libsoup-2.4/libsoup/soup-date.h @@ -16,7 +17,9 @@ include/libsoup-2.4/libsoup/soup-message-headers.h include/libsoup-2.4/libsoup/soup-message.h include/libsoup-2.4/libsoup/soup-method.h include/libsoup-2.4/libsoup/soup-misc.h +include/libsoup-2.4/libsoup/soup-multipart.h include/libsoup-2.4/libsoup/soup-portability.h +include/libsoup-2.4/libsoup/soup-proxy-resolver.h include/libsoup-2.4/libsoup/soup-server.h include/libsoup-2.4/libsoup/soup-session-async.h include/libsoup-2.4/libsoup/soup-session-feature.h @@ -29,23 +32,35 @@ include/libsoup-2.4/libsoup/soup-uri.h include/libsoup-2.4/libsoup/soup-value-utils.h include/libsoup-2.4/libsoup/soup-xmlrpc.h include/libsoup-2.4/libsoup/soup.h +include/libsoup-gnome-2.4/libsoup/soup-cookie-jar-sqlite.h +include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h +include/libsoup-gnome-2.4/libsoup/soup-gnome.h lib/libsoup-2.4.la +lib/libsoup-gnome-2.4.la lib/pkgconfig/libsoup-2.4.pc +lib/pkgconfig/libsoup-gnome-2.4.pc share/gtk-doc/html/libsoup-2.4/SoupAddress.html share/gtk-doc/html/libsoup-2.4/SoupAuth.html share/gtk-doc/html/libsoup-2.4/SoupAuthDomain.html share/gtk-doc/html/libsoup-2.4/SoupAuthDomainBasic.html share/gtk-doc/html/libsoup-2.4/SoupAuthDomainDigest.html share/gtk-doc/html/libsoup-2.4/SoupCookieJar.html +share/gtk-doc/html/libsoup-2.4/SoupCookieJarSqlite.html +share/gtk-doc/html/libsoup-2.4/SoupCookieJarText.html share/gtk-doc/html/libsoup-2.4/SoupLogger.html share/gtk-doc/html/libsoup-2.4/SoupMessage.html +share/gtk-doc/html/libsoup-2.4/SoupProxyResolver.html share/gtk-doc/html/libsoup-2.4/SoupServer.html share/gtk-doc/html/libsoup-2.4/SoupSession.html share/gtk-doc/html/libsoup-2.4/SoupSessionAsync.html +share/gtk-doc/html/libsoup-2.4/SoupSessionFeature.html share/gtk-doc/html/libsoup-2.4/SoupSessionSync.html share/gtk-doc/html/libsoup-2.4/SoupSocket.html share/gtk-doc/html/libsoup-2.4/ch01.html share/gtk-doc/html/libsoup-2.4/ch02.html +share/gtk-doc/html/libsoup-2.4/ch03.html +share/gtk-doc/html/libsoup-2.4/ch04.html +share/gtk-doc/html/libsoup-2.4/ch05.html share/gtk-doc/html/libsoup-2.4/home.png share/gtk-doc/html/libsoup-2.4/index.html share/gtk-doc/html/libsoup-2.4/index.sgml @@ -54,14 +69,18 @@ share/gtk-doc/html/libsoup-2.4/left.png share/gtk-doc/html/libsoup-2.4/libsoup-2.4.devhelp share/gtk-doc/html/libsoup-2.4/libsoup-2.4.devhelp2 share/gtk-doc/html/libsoup-2.4/libsoup-24-GValue-Support.html +share/gtk-doc/html/libsoup-2.4/libsoup-24-HTML-Form-Support.html share/gtk-doc/html/libsoup-2.4/libsoup-24-Soup-Miscellaneous-Utilities.html share/gtk-doc/html/libsoup-2.4/libsoup-24-SoupCookie.html share/gtk-doc/html/libsoup-2.4/libsoup-24-SoupMessageBody.html share/gtk-doc/html/libsoup-2.4/libsoup-24-SoupMessageHeaders.html +share/gtk-doc/html/libsoup-2.4/libsoup-24-SoupMultipart.html share/gtk-doc/html/libsoup-2.4/libsoup-24-SoupURI.html share/gtk-doc/html/libsoup-2.4/libsoup-24-XMLRPC-Support.html +share/gtk-doc/html/libsoup-2.4/libsoup-24-soup-gnome-features.html share/gtk-doc/html/libsoup-2.4/libsoup-24-soup-method.html share/gtk-doc/html/libsoup-2.4/libsoup-24-soup-status.html +share/gtk-doc/html/libsoup-2.4/libsoup-build-howto.html share/gtk-doc/html/libsoup-2.4/libsoup-client-howto.html share/gtk-doc/html/libsoup-2.4/libsoup-porting-2.2-2.4.html share/gtk-doc/html/libsoup-2.4/libsoup-server-howto.html @@ -69,5 +88,7 @@ share/gtk-doc/html/libsoup-2.4/right.png share/gtk-doc/html/libsoup-2.4/style.css share/gtk-doc/html/libsoup-2.4/up.png @dirrm share/gtk-doc/html/libsoup-2.4 +@dirrm include/libsoup-gnome-2.4/libsoup +@dirrm include/libsoup-gnome-2.4 @dirrm include/libsoup-2.4/libsoup @dirrm include/libsoup-2.4 diff --git a/net/libsoup24/distinfo b/net/libsoup24/distinfo index e697ed3eff1..10f4bacc9aa 100644 --- a/net/libsoup24/distinfo +++ b/net/libsoup24/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.6 2009/01/20 09:01:54 sketch Exp $ +$NetBSD: distinfo,v 1.7 2009/03/16 12:49:02 jmcneill Exp $ -SHA1 (libsoup-2.24.3.tar.bz2) = b63cf9c0bc20264c59e84dea73eb76862be9329c -RMD160 (libsoup-2.24.3.tar.bz2) = 9000d0355e65879f4031278bead9a4ad61a2bdea -Size (libsoup-2.24.3.tar.bz2) = 661415 bytes -SHA1 (patch-aa) = 51d9068480bc2be8671ad4eecdafc1d029fbe96e +SHA1 (libsoup-2.25.91.tar.bz2) = 996d41f4d508e5810ca495470b3fa5b9383cda85 +RMD160 (libsoup-2.25.91.tar.bz2) = 861750b3102d2c7a8948079f73380daeb6c0ac73 +Size (libsoup-2.25.91.tar.bz2) = 715351 bytes SHA1 (patch-ab) = 70b4cfc4df6608042e0c5f5a548e1a8deb79c118 +SHA1 (patch-ba) = 7fa2ffb63809b6cb35da79b8228cd74c16be00a1 +SHA1 (patch-bb) = 15af9033d2350f4a46bccbc28ba31d78aa7e20b5 diff --git a/net/libsoup24/patches/patch-aa b/net/libsoup24/patches/patch-aa deleted file mode 100644 index 07550bb3ec5..00000000000 --- a/net/libsoup24/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2009/01/20 09:01:54 sketch Exp $ - ---- libsoup/soup-session-feature.h.orig Tue Jan 20 08:44:20 2009 -+++ libsoup/soup-session-feature.h Tue Jan 20 08:50:15 2009 -@@ -18,7 +18,7 @@ - #define SOUP_SESSION_FEATURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SOUP_TYPE_SESSION_FEATURE, SoupSessionFeatureInterface)) - - /* dummy struct for gtk-doc */ --struct _SoupSessionFeature {}; -+struct _SoupSessionFeature {char nouse;}; - - typedef struct { - GTypeInterface parent; diff --git a/net/libsoup24/patches/patch-ba b/net/libsoup24/patches/patch-ba new file mode 100644 index 00000000000..4b817b92d79 --- /dev/null +++ b/net/libsoup24/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1 2009/03/16 12:49:02 jmcneill Exp $ + +--- configure.orig 2009-03-03 20:07:51.000000000 -0500 ++++ configure +@@ -23620,7 +23620,7 @@ _ACEOF + fi + else + have_apache=0 +- if test "$APACHE_HTTPD" == "no" -o -z "$APACHE_MODULE_DIR"; then ++ if test "$APACHE_HTTPD" = "no" -o -z "$APACHE_MODULE_DIR"; then + MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES apache" + else + MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES mod_ssl" diff --git a/net/libsoup24/patches/patch-bb b/net/libsoup24/patches/patch-bb new file mode 100644 index 00000000000..33fc2791a29 --- /dev/null +++ b/net/libsoup24/patches/patch-bb @@ -0,0 +1,13 @@ +$NetBSD: patch-bb,v 1.1 2009/03/16 12:49:02 jmcneill Exp $ + +--- configure.in.orig 2009-02-16 17:29:28.000000000 -0500 ++++ configure.in +@@ -306,7 +306,7 @@ if test "$APACHE_HTTPD" != "no" -a -n "$ + fi + else + have_apache=0 +- if test "$APACHE_HTTPD" == "no" -o -z "$APACHE_MODULE_DIR"; then ++ if test "$APACHE_HTTPD" = "no" -o -z "$APACHE_MODULE_DIR"; then + MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES apache" + else + MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES mod_ssl" |