diff -urN /poudriere/ports/default/editors/openoffice-4/Makefile editors/openoffice-4/Makefile --- /poudriere/ports/default/editors/openoffice-4/Makefile 2013-11-06 12:31:22.240469531 +0100 +++ editors/openoffice-4/Makefile 2014-01-09 12:50:03.254249811 +0100 @@ -32,11 +32,15 @@ WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= GCONF GNOMEVFS CCACHE +OPTIONS_DEFINE= GCONF GNOMEVFS CCACHE DBUS OPTIONS_DEFAULT=GCONF GNOMEVFS GNOMEVFS_DESC= Enable GNOME Virtual File System CCACHE_DESC= Mimimize compile time of C/C++ programs +DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +DBUS_ENABLE= dbus + NO_STAGE= yes .include "${.CURDIR}/files/Makefile.localized" @@ -60,6 +64,14 @@ CONFIGURE_ARGS+=--disable-gnome-vfs .endif + +.if ${PORT_OPTIONS:MDBUS} +CONFIGURE_ARGS+=--enable-dbus \ +.else +# +.endif + + ONLY_FOR_ARCHS= i386 amd64 .if ${ARCH} == amd64 @@ -195,7 +207,6 @@ --with-package-format="archive" \ --enable-gstreamer \ --enable-wiki-publisher \ - --enable-dbus \ --enable-opengl \ --enable-category-b \ --enable-lockdown \ @@ -206,8 +217,8 @@ --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ --without-fonts \ --with-system-serf -# --with-system-jpeg -# --enable-pdfimport +# --with-system-jpeg \ +# --enable-pdfimport \ # --without-stlport --disable-mozilla \ # --with-system-graphite \