4 files changed, 62 insertions, 26 deletions

diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 991311495bc5..81bb2b1f9cfb 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/devel/libsoup/Makefile,v 1.12 2010/06/24 10:03:53 kwm Exp $
+#   $MCom: ports/devel/libsoup/Makefile,v 1.90 2010/11/16 02:38:21 avl Exp $
 #
 
 PORTNAME=	libsoup
-PORTVERSION=	2.30.2
-PORTREVISION?=	1
+PORTVERSION=	2.32.1
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -20,13 +20,7 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-    		proxy.0:${PORTSDIR}/net/libproxy \
-		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3
-
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehack glib20 libxml2 ltverhack referencehack gconf2
+USE_GNOME=	gnomehack glib20 libxml2 ltverhack referencehack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
@@ -37,18 +31,30 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 PLIST_SUB=	VERSION="2.4"
 
+.include <bsd.port.pre.mk>
+
+.if defined(SOUP_SLAVE)
+LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
+		proxy.0:${PORTSDIR}/net/libproxy \
+		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=--with-gnome
+USE_GNOME+=	gconf2
+.else
+BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+CONFIGURE_ARGS+=--without-gnome
+.endif
+
 .if !defined(WITHOUT_SSL)
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=--disable-ssl
 .endif
 
-.include <bsd.port.pre.mk>
-
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "libsoup has the following configurable option(s):"
-	@${ECHO_MSG} "	WITHOUT_SSL	Disable GnuTLS SSL support"
+	@${ECHO_MSG} "  WITHOUT_SSL     Disable GnuTLS SSL support"
 	@${ECHO_MSG} ""
 
 post-patch:
@@ -56,9 +62,27 @@ post-patch:
 	    	s|" == "|" = "|g' \
 		${WRKSRC}/configure
 
+.if defined(SOUP_SLAVE)
+do-build:
+	cd ${WRKSRC}/libsoup && ${GMAKE} libsoup-gnome-2.4.la
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.a ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${PREFIX}/lib/
+	cd ${WRKSRC}/libsoup && ${GMAKE} install-libsoupgnomeincludeHEADERS
+.endif
+
 post-install:
+.if defined(SOUP_SLAVE)
+	@${MKDIR} ${PREFIX}/libdata/pkgconfig
+	@${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \
+		${PREFIX}/libdata/pkgconfig/
+.else
 	@${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
 	    	${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
+.endif	
 
 .include <bsd.port.post.mk>
 
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index 44dad240d554..e27ede1ff2da 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/libsoup-2.30.2.tar.bz2) = f33b62063e76a9b1d5503363a3ed6a84
-SHA256 (gnome2/libsoup-2.30.2.tar.bz2) = 78ccbce84fccc74a49fb8168eeb409a6429a8a5854f197261d4108b8bb106bf6
-SIZE (gnome2/libsoup-2.30.2.tar.bz2) = 644337
+SHA256 (gnome2/libsoup-2.32.1.tar.bz2) = 8779da1b4d85f443f04ea8301f52c4a1943c10e4dc8d20dbcdb3652921de6b8e
+SIZE (gnome2/libsoup-2.32.1.tar.bz2) = 667140
diff --git a/devel/libsoup/files/patch-libsoup_Makefile.in b/devel/libsoup/files/patch-libsoup_Makefile.in
new file mode 100644
index 000000000000..15a468ce49bc
--- /dev/null
+++ b/devel/libsoup/files/patch-libsoup_Makefile.in
@@ -0,0 +1,19 @@
+--- libsoup/Makefile.in.orig	2010-05-14 16:28:56.000000000 +0200
++++ libsoup/Makefile.in	2010-05-14 16:31:03.000000000 +0200
+@@ -112,7 +112,6 @@
+ 	$(AM_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) $(LDFLAGS) -o \
+ 	$@
+ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES =  \
+-@BUILD_LIBSOUP_GNOME_TRUE@	libsoup-2.4.la $(am__DEPENDENCIES_1) \
+ @BUILD_LIBSOUP_GNOME_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_LIBSOUP_GNOME_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_LIBSOUP_GNOME_TRUE@	$(am__DEPENDENCIES_1) \
+@@ -473,7 +472,7 @@
+ 
+ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
+ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \
+-@BUILD_LIBSOUP_GNOME_TRUE@	libsoup-2.4.la			\
++@BUILD_LIBSOUP_GNOME_TRUE@	-lsoup-2.4			\
+ @BUILD_LIBSOUP_GNOME_TRUE@	$(GLIB_LIBS)			\
+ @BUILD_LIBSOUP_GNOME_TRUE@	$(GCONF_LIBS)			\
+ @BUILD_LIBSOUP_GNOME_TRUE@	$(LIBPROXY_LIBS)		\
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index 2c2f61bacba1..ab9adb28206a 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -36,20 +36,14 @@ include/libsoup-%%VERSION%%/libsoup/soup-uri.h
 include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h
 include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h
 include/libsoup-%%VERSION%%/libsoup/soup.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h
+lib/girepository-1.0/Soup-%%VERSION%%.typelib
 lib/libsoup-%%VERSION%%.a
 lib/libsoup-%%VERSION%%.la
 lib/libsoup-%%VERSION%%.so
 lib/libsoup-%%VERSION%%.so.1
-lib/libsoup-gnome-%%VERSION%%.a
-lib/libsoup-gnome-%%VERSION%%.la
-lib/libsoup-gnome-%%VERSION%%.so
-lib/libsoup-gnome-%%VERSION%%.so.1
 libdata/pkgconfig/libsoup-%%VERSION%%.pc
-libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc
-@dirrm include/libsoup-gnome-%%VERSION%%/libsoup
-@dirrm include/libsoup-gnome-%%VERSION%%
+share/gir-1.0/Soup-%%VERSION%%.gir
 @dirrm include/libsoup-%%VERSION%%/libsoup
 @dirrm include/libsoup-%%VERSION%%
+@dirrmtry lib/girepository-1.0
+@dirrmtry share/gir-1.0