From a68d2c83b1695948f7eec9c3646f135e0800b21f Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 11 May 2008 12:26:13 +0000 Subject: [PATCH] - revert previous update for now, caused some fallout --- devel/libsoup/Makefile | 59 ++++++------ devel/libsoup/distinfo | 10 +- devel/libsoup/patches/patch-tests_Makefile_in | 8 +- devel/libsoup/pkg/PFRAG.shared | 4 +- devel/libsoup/pkg/PLIST | 95 +++++++++---------- 5 files changed, 85 insertions(+), 91 deletions(-) diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 6da032becab..0d0b6eb7285 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -1,48 +1,43 @@ -# $OpenBSD: Makefile,v 1.21 2008/04/30 11:22:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.22 2008/05/11 12:26:13 jasper Exp $ -COMMENT= SOAP implementation in C +COMMENT= SOAP implementation in C -GNOME_PROJECT= libsoup -GNOME_VERSION= 2.4.1 -PKGNAME= ${DISTNAME}p0 -SHARED_LIBS += soup-2.4 0.0 # .1.0 -API_VERSION= 2.4 -CATEGORIES= devel +GNOME_PROJECT= libsoup +GNOME_VERSION= 2.2.103 +SHARED_LIBS += soup-2.2 13.1 # .13.0 +API_VERSION= 2.2 +CATEGORIES= devel # LGPL -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes +WANTLIB= m pcre z -WANTLIB= m pcre z +LIB_DEPENDS= glib-2.0,gobject-2.0,gthread-2.0::devel/glib2 \ + xml2.>=7::textproc/libxml -LIB_DEPENDS= gio-2.0,glib-2.0,gobject-2.0,gthread-2.0,gmodule-2.0::devel/glib2 \ - xml2.>=7::textproc/libxml +MODULES= devel/gettext \ + x11/gnome -MODULES= devel/gettext \ - x11/gnome +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --disable-gtk-doc +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +SUBST_VARS= API_VERSION -# XXX because of the subsitution, "make plist" will break packaging; -# make sure you use libsoup-${API_VERSION}.so.${LIBsoup-XX_VERSION} in -# PFRAG.shared, where XX is the expanded value of ${API_VERSION} -SUBST_VARS= API_VERSION - -FLAVORS= ssl +FLAVORS= ssl FLAVOR?= .if ${FLAVOR:L:Mssl} -CONFIGURE_ARGS+= --enable-ssl -LIB_DEPENDS+= gnutls.>=12::security/gnutls -WANTLIB+= gcrypt gpg-error +CONFIGURE_ARGS+= --enable-ssl +LIB_DEPENDS+= gnutls.>=12::security/gnutls +WANTLIB+= gcrypt gpg-error .else -CONFIGURE_ARGS+= --disable-ssl +CONFIGURE_ARGS+= --disable-ssl .endif .include diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index 00999084fab..a6e97e57542 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,5 +1,5 @@ -MD5 (libsoup-2.4.1.tar.bz2) = 0PyRzLnaQB6eQNL0YSvayQ== -RMD160 (libsoup-2.4.1.tar.bz2) = jjh3qpKQiagqquw65tDWPkzILMo= -SHA1 (libsoup-2.4.1.tar.bz2) = pjoRJKv/oaM1ZCx4zoemBhYjYdw= -SHA256 (libsoup-2.4.1.tar.bz2) = d0CUdGdI+wyJhSEN4JlKzNxwlcIi+6QsViPiE3RDts0= -SIZE (libsoup-2.4.1.tar.bz2) = 627890 +MD5 (libsoup-2.2.103.tar.bz2) = GuPBWzXz2ZnSA+I2HkRVng== +RMD160 (libsoup-2.2.103.tar.bz2) = SiGBhrF4sGzN9cjLvzuauz2mt/o= +SHA1 (libsoup-2.2.103.tar.bz2) = RiBSkXev68GKie8YmBl8oFW7YdU= +SHA256 (libsoup-2.2.103.tar.bz2) = tg4mcXTJ3d+Xp6Fj6/U1ftL66bssHXpeH6WXMO3EPVE= +SIZE (libsoup-2.2.103.tar.bz2) = 495377 diff --git a/devel/libsoup/patches/patch-tests_Makefile_in b/devel/libsoup/patches/patch-tests_Makefile_in index f014b177b47..f030fa5d24d 100644 --- a/devel/libsoup/patches/patch-tests_Makefile_in +++ b/devel/libsoup/patches/patch-tests_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-tests_Makefile_in,v 1.7 2008/04/29 17:30:33 jasper Exp $ ---- tests/Makefile.in.orig Mon Feb 25 20:45:04 2008 -+++ tests/Makefile.in Fri Mar 7 21:31:56 2008 -@@ -213,7 +213,7 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ +$OpenBSD: patch-tests_Makefile_in,v 1.8 2008/05/11 12:26:14 jasper Exp $ +--- tests/Makefile.in.orig Sun Oct 28 18:37:11 2007 ++++ tests/Makefile.in Wed Oct 31 17:28:17 2007 +@@ -189,7 +189,7 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/devel/libsoup/pkg/PFRAG.shared b/devel/libsoup/pkg/PFRAG.shared index 92ec3139ed4..97bbb55f307 100644 --- a/devel/libsoup/pkg/PFRAG.shared +++ b/devel/libsoup/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.9 2008/04/30 11:05:22 bernd Exp $ -@lib lib/libsoup-${API_VERSION}.so.${LIBsoup-2.4_VERSION} +@comment $OpenBSD: PFRAG.shared,v 1.10 2008/05/11 12:26:14 jasper Exp $ +@lib lib/libsoup-${API_VERSION}.so.${LIBsoup-2.2_VERSION} diff --git a/devel/libsoup/pkg/PLIST b/devel/libsoup/pkg/PLIST index 489903bcbdd..e88c5df2470 100644 --- a/devel/libsoup/pkg/PLIST +++ b/devel/libsoup/pkg/PLIST @@ -1,33 +1,31 @@ -@comment $OpenBSD: PLIST,v 1.9 2008/04/29 17:30:33 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.10 2008/05/11 12:26:14 jasper Exp $ %%SHARED%% include/libsoup-${API_VERSION}/ include/libsoup-${API_VERSION}/libsoup/ include/libsoup-${API_VERSION}/libsoup/soup-address.h -include/libsoup-${API_VERSION}/libsoup/soup-auth-domain-basic.h -include/libsoup-${API_VERSION}/libsoup/soup-auth-domain-digest.h -include/libsoup-${API_VERSION}/libsoup/soup-auth-domain.h -include/libsoup-${API_VERSION}/libsoup/soup-auth.h +include/libsoup-${API_VERSION}/libsoup/soup-connection.h include/libsoup-${API_VERSION}/libsoup/soup-date.h -include/libsoup-${API_VERSION}/libsoup/soup-enum-types.h -include/libsoup-${API_VERSION}/libsoup/soup-form.h include/libsoup-${API_VERSION}/libsoup/soup-headers.h -include/libsoup-${API_VERSION}/libsoup/soup-logger.h -include/libsoup-${API_VERSION}/libsoup/soup-message-body.h -include/libsoup-${API_VERSION}/libsoup/soup-message-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-portability.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-value-utils.h -include/libsoup-${API_VERSION}/libsoup/soup-xmlrpc.h +include/libsoup-${API_VERSION}/libsoup/soup-xmlrpc-message.h +include/libsoup-${API_VERSION}/libsoup/soup-xmlrpc-response.h include/libsoup-${API_VERSION}/libsoup/soup.h lib/libsoup-${API_VERSION}.a lib/libsoup-${API_VERSION}.la @@ -35,39 +33,40 @@ lib/pkgconfig/ lib/pkgconfig/libsoup-${API_VERSION}.pc share/gtk-doc/ share/gtk-doc/html/ -share/gtk-doc/html/libsoup-${API_VERSION}/ -share/gtk-doc/html/libsoup-${API_VERSION}/SoupAddress.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupAuth.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupAuthDomain.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupAuthDomainBasic.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupAuthDomainDigest.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupMessage.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupServer.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupSession.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupSessionAsync.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupSessionSync.html -share/gtk-doc/html/libsoup-${API_VERSION}/SoupSocket.html -share/gtk-doc/html/libsoup-${API_VERSION}/ch01.html -share/gtk-doc/html/libsoup-${API_VERSION}/ch02.html -share/gtk-doc/html/libsoup-${API_VERSION}/home.png -share/gtk-doc/html/libsoup-${API_VERSION}/index.html -share/gtk-doc/html/libsoup-${API_VERSION}/index.sgml -share/gtk-doc/html/libsoup-${API_VERSION}/ix01.html -share/gtk-doc/html/libsoup-${API_VERSION}/left.png -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-${API_VERSION}.devhelp -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-${API_VERSION}.devhelp2 -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-GValue-Support.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-Soup-Miscellaneous-Utilities.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-SoupLogger.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-SoupMessageBody.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-SoupMessageHeaders.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-SoupURI.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-XMLRPC-Support.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-soup-method.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-24-soup-status.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-client-howto.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-porting-2.2-${API_VERSION}.html -share/gtk-doc/html/libsoup-${API_VERSION}/libsoup-server-howto.html -share/gtk-doc/html/libsoup-${API_VERSION}/right.png -share/gtk-doc/html/libsoup-${API_VERSION}/style.css -share/gtk-doc/html/libsoup-${API_VERSION}/up.png +share/gtk-doc/html/libsoup/ +share/gtk-doc/html/libsoup/SoupAddress.html +share/gtk-doc/html/libsoup/SoupAuth.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/SoupSessionAsync.html +share/gtk-doc/html/libsoup/SoupSessionSync.html +share/gtk-doc/html/libsoup/SoupSoapMessage.html +share/gtk-doc/html/libsoup/SoupSoapResponse.html +share/gtk-doc/html/libsoup/SoupSocket.html +share/gtk-doc/html/libsoup/SoupXmlrpcMessage.html +share/gtk-doc/html/libsoup/SoupXmlrpcResponse.html +share/gtk-doc/html/libsoup/ch01.html +share/gtk-doc/html/libsoup/ch02.html +share/gtk-doc/html/libsoup/ch03.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/ix01.html +share/gtk-doc/html/libsoup/left.png +share/gtk-doc/html/libsoup/libsoup-Soup-Miscellaneous-Utilities.html +share/gtk-doc/html/libsoup/libsoup-SoupMessageFilter.html +share/gtk-doc/html/libsoup/libsoup-SoupUri.html +share/gtk-doc/html/libsoup/libsoup-client-howto.html +share/gtk-doc/html/libsoup/libsoup-server-howto.html +share/gtk-doc/html/libsoup/libsoup-soup-dns.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.devhelp +share/gtk-doc/html/libsoup/libsoup.devhelp2 +share/gtk-doc/html/libsoup/right.png +share/gtk-doc/html/libsoup/style.css +share/gtk-doc/html/libsoup/up.png