Unbreak editors/openoffice-* build when GCONF and GNOMEVFS are disabled

There is a missing dependency on devel/dbus-glib that causes the
openoffice build to fail when the GCONF and GNOMEVFS options are
disabled. When these options are enabled, one of the dependencies
added by these options brings along dbus-glib so the default build
succeeds.

There is a configure knob to control whether or not dbus-glib is
used, so follow the lead of the libreoffice port and rename the
GCONF option to GNOME and bundle both Gconf and DBUS handling under
the GNOME option.

Borrow the MMEDIA option from the libreoffice port and use that to
control the using of gstreamer.

Add a couple of missing p5-* build dependencies.

Add the --enable-gtk, --disable-kde, --disable-kde4 configure flags
so that the port does not try to build with KDE if it is installed
because compilation fails.

USE_AUTOTOOLS=autoconf -> USES=autoreconf:autoconf

PR:		199865
Reported by:	pi
Differential Revision:	https://reviews.freebsd.org/D2441
Reviewed by:	pi, pfg
Approved by:	mat (mentor)

2 files changed, 44 insertions, 28 deletions

diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index fc3d881c133c..33eb28cc3ef3 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -26,6 +26,8 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww			\
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser	\
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
 		zip:${PORTSDIR}/archivers/zip				\
 		ant:${PORTSDIR}/devel/apache-ant			\
@@ -89,10 +91,8 @@ NO_LATEST_LINK=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	autoconf
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
-USE_GSTREAMER=	yes
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	openjdk
@@ -100,26 +100,34 @@ JAVA_VERSION=	1.6+
 USE_PERL5=	build
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
-USES=		bison compiler cpe desktop-file-utils gmake perl5 pkgconfig python \
-		tar:bzip2
+USES=		autoreconf:autoconf bison compiler cpe desktop-file-utils \
+		gmake perl5 pkgconfig python tar:bzip2
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
-OPTIONS_DEFINE=			CUPS GCONF GNOMEVFS CCACHE
-OPTIONS_DEFAULT=		CUPS GCONF GNOMEVFS
-GNOMEVFS_DESC=			Enable GNOME Virtual File System
-CCACHE_DESC=			Mimimize compile time of C/C++ programs
+OPTIONS_DEFINE=		CUPS GNOME GNOMEVFS MMEDIA CCACHE
+OPTIONS_DEFAULT=	CUPS GNOME GNOMEVFS MMEDIA
+GNOME_DESC=		GConf + screensaver presentation control via DBUS
+GNOMEVFS_DESC=		GNOME Virtual File System
+MMEDIA_DESC=		Multimedia backend for impress
+CCACHE_DESC=		Mimimize compile time of C/C++ programs
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups-client
 
-GCONF_USE=			GNOME=gconf2
-GCONF_CONFIGURE_ENABLE=		gconf
+GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
+GNOME_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+GNOME_USE=			GNOME=gconf2
 
-GNOMEVFS_USE=			GNOME=gnomevfs2
 GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
+GNOMEVFS_CONFIGURE_OFF=		--enable-gio
+GNOMEVFS_CONFIGURE_ON=		--disable-gio
+GNOMEVFS_USE=			GNOME=gnomevfs2
+
+MMEDIA_CONFIGURE_ENABLE=	gstreamer
+MMEDIA_USE=			GSTREAMER=yes
 
 .include <bsd.port.pre.mk>
 
@@ -193,7 +201,6 @@ CONFIGURE_ARGS+=							\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--enable-crashdump				\
-			--enable-dbus					\
 			--with-system-dicts				\
 			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
@@ -201,7 +208,7 @@ CONFIGURE_ARGS+=							\
 			--without-fonts					\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--with-gperf=${LOCALBASE}/bin/gperf		\
-			--enable-gstreamer				\
+			--enable-gtk					\
 			--with-system-hunspell				\
 			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--with-system-hyphen				\
@@ -209,9 +216,10 @@ CONFIGURE_ARGS+=							\
 			--with-system-jpeg				\
 			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
 			--with-system-libtextcat			\
+			--disable-kde					\
+			--disable-kde4					\
 			--with-system-libxml				\
 			--with-system-libxslt				\
-			--enable-lockdown				\
 			--with-system-lucene				\
 			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
 			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index a1e4fee33f18..d19af575ffa7 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -28,6 +28,8 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww			\
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser	\
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
 		zip:${PORTSDIR}/archivers/zip				\
 		ant:${PORTSDIR}/devel/apache-ant			\
@@ -101,10 +103,8 @@ NO_LATEST_LINK=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	autoconf
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
-USE_GSTREAMER=	yes
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	openjdk
@@ -112,26 +112,34 @@ JAVA_VERSION=	1.6+
 USE_PERL5=	build
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
-USES=		bison compiler cpe desktop-file-utils gmake perl5 pkgconfig python \
-		tar:${TARTYPE}
+USES=		autoreconf:autoconf bison compiler cpe desktop-file-utils \
+		gmake perl5 pkgconfig python tar:${TARTYPE}
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
-OPTIONS_DEFINE=			CUPS GCONF GNOMEVFS CCACHE
-OPTIONS_DEFAULT=		CUPS GCONF GNOMEVFS
-GNOMEVFS_DESC=			Enable GNOME Virtual File System
-CCACHE_DESC=			Mimimize compile time of C/C++ programs
+OPTIONS_DEFINE=		CUPS GNOME GNOMEVFS MMEDIA CCACHE
+OPTIONS_DEFAULT=	CUPS GNOME GNOMEVFS MMEDIA
+GNOME_DESC=		GConf + screensaver presentation control via DBUS
+GNOMEVFS_DESC=		GNOME Virtual File System
+MMEDIA_DESC=		Multimedia backend for impress
+CCACHE_DESC=		Mimimize compile time of C/C++ programs
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups-client
 
-GCONF_USE=			GNOME=gconf2
-GCONF_CONFIGURE_ENABLE=		gconf
+GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
+GNOME_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+GNOME_USE=			GNOME=gconf2
 
-GNOMEVFS_USE=			GNOME=gnomevfs2
 GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
+GNOMEVFS_CONFIGURE_OFF=		--enable-gio
+GNOMEVFS_CONFIGURE_ON=		--disable-gio
+GNOMEVFS_USE=			GNOME=gnomevfs2
+
+MMEDIA_CONFIGURE_ENABLE=	gstreamer
+MMEDIA_USE=			GSTREAMER=yes
 
 .include <bsd.port.pre.mk>
 
@@ -207,7 +215,6 @@ CONFIGURE_ARGS+=							\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--enable-crashdump				\
-			--enable-dbus					\
 			--with-system-dicts				\
 			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
@@ -216,7 +223,7 @@ CONFIGURE_ARGS+=							\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--with-gperf=${LOCALBASE}/bin/gperf		\
 			--with-system-graphite				\
-			--enable-gstreamer				\
+			--enable-gtk					\
 			--with-system-hunspell				\
 			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--with-system-hyphen				\
@@ -224,9 +231,10 @@ CONFIGURE_ARGS+=							\
 			--with-system-jpeg				\
 			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
 			--with-system-libtextcat			\
+			--disable-kde					\
+			--disable-kde4					\
 			--with-system-libxml				\
 			--with-system-libxslt				\
-			--enable-lockdown				\
 			--with-system-lucene				\
 			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
 			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \