ports/141033: [PATCH] allow to build devel/libsoup without gnome

Tue May 11 12:20:03 UTC 2010

The following reply was made to PR ports/141033; it has been noted by GNATS.

From: Baptiste Daroussin <baptiste.daroussin at gmail.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/141033: [PATCH] allow to build devel/libsoup without
 gnome
Date: Tue, 11 May 2010 14:12:45 +0200

 --Dxnq1zWXvFF0Q93v
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline

 Sorry for being so long to reply. Here is another try : 

 libsoup-without-gnome : a patch to have a libsoup version build without gnome
 libsoup-gnome.shar : a new ports for libsoup-gnome specific files
 libchamplain-newlibsoup-gnome: a patch for libchamplain which is the only ports
 that I found directly depending on libsoup-gnome

 Hope this time the way to do it is better I use the libgsf example as an
 inspiration.

 regards,
 Bapt

 --Dxnq1zWXvFF0Q93v
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=libchamplain-newlibsoup-gnome

 diff -rnu libchamplain.orig/Makefile libchamplain/Makefile
 --- libchamplain.orig/Makefile	2010-05-11 11:21:58.000000000 +0200
 +++ libchamplain/Makefile	2010-05-11 14:08:09.660243550 +0200
 @@ -16,7 +16,7 @@

  LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
  		clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
 -		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup
 +		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome

  USE_BZIP2=	yes
  USE_GNOME=	pkgconfig gtk20 gnomehack ltverhack:1

 --Dxnq1zWXvFF0Q93v
 Content-Type: application/x-shar
 Content-Disposition: attachment; filename="libsoup-gnome.shar"
 Content-Transfer-Encoding: quoted-printable

 # This is a shell archive.  Save it in a file, remove anything before=0A# t=
 his line, and then unpack it by entering "sh file".  Note, it may=0A# creat=
 e directories; files and directories will be owned by you and=0A# have defa=
 ult permissions.=0A#=0A# This archive contains:=0A#=0A#	libsoup-gnome=0A#	l=
 ibsoup-gnome/pkg-plist=0A#	libsoup-gnome/pkg-descr=0A#	libsoup-gnome/Makefi=
 le=0A#=0Aecho c - libsoup-gnome=0Amkdir -p libsoup-gnome > /dev/null 2>&1=
 =0Aecho x - libsoup-gnome/pkg-plist=0Ased 's/^X//' >libsoup-gnome/pkg-plist=
  << '48269dd8d6326244bf766b344180d0b7'=0AXinclude/libsoup-gnome-%%VERSION%%=
 /libsoup/soup-cookie-jar-sqlite.h=0AXinclude/libsoup-gnome-%%VERSION%%/libs=
 oup/soup-gnome-features.h=0AXinclude/libsoup-gnome-%%VERSION%%/libsoup/soup=
 -gnome.h=0AXlib/libsoup-gnome-%%VERSION%%.a=0AXlib/libsoup-gnome-%%VERSION%=
 %.la=0AXlib/libsoup-gnome-%%VERSION%%.so=0AXlib/libsoup-gnome-%%VERSION%%.s=
 o.1=0AXlibdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc=0AX at dirrm include/lib=
 soup-gnome-%%VERSION%%/libsoup=0AX at dirrm include/libsoup-gnome-%%VERSION%%=
 =0A48269dd8d6326244bf766b344180d0b7=0Aecho x - libsoup-gnome/pkg-descr=0Ase=
 d 's/^X//' >libsoup-gnome/pkg-descr << '7bf64085210b54ef5d484bf8a1661bec'=
 =0AXSoup is a SOAP (Simple Object Access Protocol) implementation in C. =0A=
 X=0AXIt provides a queued asynchronous callback-based mechanism for sending=
  and=0AXservicing SOAP requests, and a WSDL (Web Service Definition Languag=
 e) for C=0AXcompilers which generates client stubs and server skeletons for=
  easily=0AXcalling and implementing SOAP methods.  It uses GLib and is desi=
 gned to work=0AXwell with GTK applications.=0AX=0AXFeatures:=0AX  * Complet=
 ely Asynchronous=0AX  * Connection cache=0AX  * HTTP chunked transfer and p=
 ersistent connections=0AX  * Authenticated HTTP, SOCKS4, and SOCKS5 proxy s=
 upport=0AX  * SSL Support using OpenSSL=0AX  * Apache module server support=
 =0AX  * Client digest authentication=0A7bf64085210b54ef5d484bf8a1661bec=0Ae=
 cho x - libsoup-gnome/Makefile=0Ased 's/^X//' >libsoup-gnome/Makefile << '2=
 917fc1a699062c7391bcfb0d2a36996'=0AX# New ports collection makefile for:	li=
 bsoup=0AX# Date created:				12 March 2003=0AX# Whom:					Joe Marcus Clarke =
 <marcus at FreeBSD.org>=0AX#=0AX# $FreeBSD: ports/devel/libsoup/Makefile,v 1.7=
 6 2010/05/10 21:18:11 kwm Exp $=0AX#   $MCom: ports/devel/libsoup/Makefile,=
 v 1.81 2010/04/27 18:17:04 kwm Exp $=0AX#=0AX=0AXCATEGORIES=3D	devel gnome=
 =0AXPKGNAMESUFFIX=3D 	-gnome=0AX=0AXMAINTAINER=3D	gnome at FreeBSD.org=0AXCOMM=
 ENT=3D	A GNOME wrapper for libsoup=0AX=0AXMASTERDIR=3D	${.CURDIR}/../libsou=
 p=0AXDESCR=3D	${.CURDIR}/pkg-descr=0AXPLIST=3D	${.CURDIR}/pkg-plist=0AX=0AX=
 USE_GNOME=3D	gnomehack glib20 libxml2 ltverhack referencehack gconf2=0AX=0A=
 XLIB_DEPENDS+=3D	soup-2.4.1:${PORTSDIR}/devel/libsoup \=0AX		gnome-keyring.=
 0:${PORTSDIR}/security/gnome-keyring \=0AX		sqlite3.8:${PORTSDIR}/databases=
 /sqlite3=0AX=0AXCONFIGURE_ARGS=3D	--with-html-dir=3D${PREFIX}/share/doc \=
 =0AX		--disable-gtk-doc --with-gnome=0AX=0AXCONFIGURE_ENV=3D	CPPFLAGS=3D"-I=
 ${LOCALBASE}/include" \=0AX		LDFLAGS=3D"-L${LOCALBASE}/lib"=0AX=0AXSOUP_SLA=
 VE=3D 	yes=0AX=0AXdo-install:=0AX	@${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/=
 libsoup-gnome-${VERSION}.a \=0AX		${PREFIX}/lib/=0AX	@${INSTALL_DATA} ${WRK=
 SRC}/libsoup/.libs/libsoup-gnome-${VERSION}.la \=0AX		${PREFIX}/lib/=0AX	@$=
 {INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-${VERSION}.so \=0AX		$=
 {PREFIX}/lib/=0AX	@${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-${=
 VERSION}.so.1 \=0AX		${PREFIX}/lib/=0AX	@${MKDIR} ${PREFIX}/libdata/pkgconf=
 ig=0AX	@${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-${VERSION}.pc \=0AX		${PREF=
 IX}/libdata/pkgconfig/=0AX	@${MKDIR} ${PREFIX}/include/libsoup-gnome-${VERS=
 ION}/libsoup=0AX	@${INSTALL_DATA} ${WRKSRC}/libsoup/soup-cookie-jar-sqlite.=
 h \=0AX		${PREFIX}/include/libsoup-gnome-${VERSION}/libsoup/=0AX	@${INSTALL=
 _DATA} ${WRKSRC}/libsoup/soup-gnome.h \=0AX		${PREFIX}/include/libsoup-gnom=
 e-${VERSION}/libsoup/=0AX	@${INSTALL_DATA} ${WRKSRC}/libsoup/soup-gnome-fea=
 tures.h \=0AX		${PREFIX}/include/libsoup-gnome-${VERSION}/libsoup/=0AX=0AX.=
 include "${MASTERDIR}/Makefile"=0AX=0AX=0A2917fc1a699062c7391bcfb0d2a36996=
 =0Aexit=0A=0A
 --Dxnq1zWXvFF0Q93v
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=libsoup-without-gnome

 diff -rnu libsoup.orig/Makefile libsoup/Makefile
 --- libsoup.orig/Makefile	2010-05-11 11:21:37.000000000 +0200
 +++ libsoup/Makefile	2010-05-11 13:54:05.847226341 +0200
 @@ -9,7 +9,7 @@
  PORTNAME=	libsoup
  PORTVERSION=	2.30.1
  PORTREVISION?=	0
 -CATEGORIES=	devel gnome
 +CATEGORIES=	devel
  MASTER_SITES=	GNOME
  DIST_SUBDIR=	gnome2

 @@ -20,21 +20,19 @@

  .if !defined(REFERENCE_PORT)

 -LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 -    		proxy.0:${PORTSDIR}/net/libproxy \
 -		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
 -		sqlite3.8:${PORTSDIR}/databases/sqlite3
 +LIB_DEPENDS+=	proxy.0:${PORTSDIR}/net/libproxy

 -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
 -CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 -		--disable-gtk-doc
 -CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 +CONFIGURE_ARGS?=	--with-html-dir=${PREFIX}/share/doc \
 +		--disable-gtk-doc --without-gnome
 +CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include" \
  		LDFLAGS="-L${LOCALBASE}/lib"

 -PLIST_SUB=	VERSION="2.4"
 +VERSION=	2.4
 +PLIST_SUB=	VERSION="${VERSION}"

  .if !defined(WITHOUT_SSL)
  LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
 Only in libsoup: Makefile~
 diff -rnu libsoup.orig/pkg-plist libsoup/pkg-plist
 --- libsoup.orig/pkg-plist	2010-05-11 11:21:37.000000000 +0200
 +++ libsoup/pkg-plist	2010-05-11 11:36:50.940486608 +0200
 @@ -36,20 +36,10 @@
  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/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
 - at dirrm include/libsoup-gnome-%%VERSION%%/libsoup
 - at dirrm include/libsoup-gnome-%%VERSION%%
  @dirrm include/libsoup-%%VERSION%%/libsoup
  @dirrm include/libsoup-%%VERSION%%
 Only in libsoup: pkg-plist~

 --Dxnq1zWXvFF0Q93v--