Make soup optional in gtkhtml. In doing this, we have to make sure soup is

a dependency of Evolution, so don't count on getting it from gtkhtml.

The reason for this is fear that the underlying soup protocol, SOAP is
inherently insecure.  Thus far, however, there have been no advisories or
exploits, and the one soup user, Evolution does not appear to have any
SOAP-based security holes.  See the following for more information:

http://www.xml.com/pub/a/2002/02/27/security-lather.html
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnservice/html/service11212001.asp

Requested by:	Scott A. Moberly <smoberly@karamazov.org>

5 files changed, 28 insertions, 11 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 8e978b1dc92d..610fe292a2bd 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -20,7 +20,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \
-		nss3.1:${PORTSDIR}/security/nss
+		nss3.1:${PORTSDIR}/security/nss \
+		soup.5:${PORTSDIR}/devel/soup
 
 .if defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 8e978b1dc92d..610fe292a2bd 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -20,7 +20,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \
-		nss3.1:${PORTSDIR}/security/nss
+		nss3.1:${PORTSDIR}/security/nss \
+		soup.5:${PORTSDIR}/devel/soup
 
 .if defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 0fe4de245fe3..276edc0ce996 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -14,8 +14,7 @@ DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell \
-		soup.5:${PORTSDIR}/devel/soup
+LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -32,6 +31,12 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 VERSION=	${PORTNAME}-${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP)
+LIB_DEPENDS+=	soup.5:${PORTSDIR}/devel/soup
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -47,4 +52,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \
 		${PREFIX}/etc/gtkhtmlConf.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 0fe4de245fe3..276edc0ce996 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -14,8 +14,7 @@ DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell \
-		soup.5:${PORTSDIR}/devel/soup
+LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -32,6 +31,12 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 VERSION=	${PORTNAME}-${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP)
+LIB_DEPENDS+=	soup.5:${PORTSDIR}/devel/soup
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -47,4 +52,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \
 		${PREFIX}/etc/gtkhtmlConf.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 0fe4de245fe3..276edc0ce996 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -14,8 +14,7 @@ DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell \
-		soup.5:${PORTSDIR}/devel/soup
+LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -32,6 +31,12 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 VERSION=	${PORTNAME}-${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP)
+LIB_DEPENDS+=	soup.5:${PORTSDIR}/devel/soup
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -47,4 +52,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \
 		${PREFIX}/etc/gtkhtmlConf.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>