Update this to 2.2.0 and add an ssl flavor. Too bad this missed release.

devel/libsoup/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2004/08/09 06:15:27 marcm Exp $
+# $OpenBSD: Makefile,v 1.4 2004/09/15 04:20:24 marcm Exp $
 
-COMMENT=		"a SOAP (Simple Object Access Protocol) implementation in C"
+COMMENT=		"a SOAP implementation in C"
 
-DISTNAME=		libsoup-2.1.12
+DISTNAME=		libsoup-2.2.0
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.gnome.org/
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libsoup/2.1/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libsoup/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 LIB_DEPENDS=		glib-2.0.0.0,gobject-2.0.0.0,gthread-2.0.0.0::devel/glib2 \
@@ -27,12 +27,20 @@ USE_GMAKE=		Yes
 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
 
+FLAVORS=		ssl
+FLAVOR?=
+
+.if ${FLAVOR:L:Mssl}
+CONFIGURE_ARGS+=	--enable-ssl
+LIB_DEPENDS+=		gnutls.12::security/gnutls
+.else
+CONFIGURE_ARGS+=	--disable-ssl
+.endif
+
 .include <bsd.port.mk>

devel/libsoup/distinfo

@@ -1,3 +1,3 @@
-MD5 (libsoup-2.1.12.tar.bz2) = f8f1d8a34f17e45088caae6dd029a084
-RMD160 (libsoup-2.1.12.tar.bz2) = 1adf783fc2cd2faf3aac9cf6f51cd767b17b030c
-SHA1 (libsoup-2.1.12.tar.bz2) = df805d8eb1883bb564e998b9057234c860c7ddaa
+MD5 (libsoup-2.2.0.tar.bz2) = c47b1985e4e55a0916db6888a7374a92
+RMD160 (libsoup-2.2.0.tar.bz2) = c1ed988191c26f4cab48b5297c996bf0e91f1531
+SHA1 (libsoup-2.2.0.tar.bz2) = 22fa922b5b52b0a3cdffa05b83e3c5f373ff2f62

devel/libsoup/patches/patch-ltmain_sh

@@ -1,7 +1,7 @@
-$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
+$OpenBSD: patch-ltmain_sh,v 1.3 2004/09/15 04:20:24 marcm Exp $
+--- ltmain.sh.orig	Mon Jul 26 02:48:07 2004
++++ ltmain.sh	Sun Sep  5 20:05:23 2004
+@@ -1844,9 +1844,12 @@ EOF
  	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"
  	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -16,7 +16,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2004/06/25 16:16:51 marcm Exp $
  	  continue
  	  ;;
  	-l*)
-@@ -2262,10 +2265,6 @@ EOF
+@@ -2259,10 +2262,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

devel/libsoup/patches/patch-tests_Makefile_in

@@ -1,12 +1,12 @@
-$OpenBSD: patch-tests_Makefile_in,v 1.2 2004/08/09 06:15:27 marcm Exp $
---- tests/Makefile.in.orig	Mon Jul 19 05:58:38 2004
-+++ tests/Makefile.in	Sun Aug  1 14:43:03 2004
-@@ -119,7 +119,7 @@ INCLUDES = \
- 	$(GLIB_CFLAGS)
- 
- 
+$OpenBSD: patch-tests_Makefile_in,v 1.3 2004/09/15 04:20:24 marcm Exp $
+--- tests/Makefile.in.orig	Thu Aug 26 13:33:27 2004
++++ tests/Makefile.in	Sun Sep  5 20:07:08 2004
+@@ -154,7 +154,7 @@ LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBGNUTLS_LIBS_STATIC = @LIBGNUTLS_LIBS_STATIC@
+ LIBOBJS = @LIBOBJS@
 -LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la
 +LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la $(GLIB_LIBS)
- 
- noinst_PROGRAMS = \
- 	auth-test	\
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@

devel/libsoup/pkg/PFRAG.shared

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/09 06:15:27 marcm Exp $
-@lib lib/libsoup-${API_VERSION}.so.5.0
+@comment $OpenBSD: PFRAG.shared,v 1.4 2004/09/15 04:20:24 marcm Exp $
+@lib lib/libsoup-${API_VERSION}.so.7.0