Update to 4.2.5.

1 files changed, 77 insertions, 115 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 8a8a5f9cddfd..ede5ec5c85f1 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	Full integrated office productivity suite
 
@@ -13,12 +13,12 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		${LOCALBASE}/libdata/pkgconfig/cppunit.pc:${PORTSDIR}/devel/cppunit \
 		dmake:${PORTSDIR}/devel/dmake \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		mdds>=0.9.0:${PORTSDIR}/devel/mdds \
 		gpatch:${PORTSDIR}/devel/patch \
 		ucpp:${PORTSDIR}/devel/ucpp \
 		vigra-config:${PORTSDIR}/graphics/vigra \
 		bash:${PORTSDIR}/shells/bash \
+		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		gsed:${PORTSDIR}/textproc/gsed
 
 LIB_DEPENDS=	libicutu.so:${PORTSDIR}/devel/icu \
@@ -28,8 +28,9 @@ LIB_DEPENDS=	libicutu.so:${PORTSDIR}/devel/icu \
 		libcairo.so:${PORTSDIR}/graphics/cairo \
 		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libcdr-0.0.so:${PORTSDIR}/graphics/libcdr \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
+		libcdr-0.0.so:${PORTSDIR}/graphics/libcdr \
+		libfreehand-0.0.so:${PORTSDIR}/graphics/libfreehand00 \
 		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
 		libpng15.so:${PORTSDIR}/graphics/png \
 		libpoppler.so:${PORTSDIR}/graphics/poppler \
@@ -40,21 +41,20 @@ LIB_DEPENDS=	libicutu.so:${PORTSDIR}/devel/icu \
 		libnss3.so:${PORTSDIR}/security/nss \
 		libclucene-core.so:${PORTSDIR}/textproc/clucene \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libmwaw-0.2.so:${PORTSDIR}/textproc/libmwaw \
-		libodfgen-0.0.so:${PORTSDIR}/textproc/libodfgen \
 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libhyphen.so:${PORTSDIR}/textproc/hyphen \
+		libabw-0.0.so:${PORTSDIR}/textproc/libabw00 \
+		libe-book-0.0.so:${PORTSDIR}/textproc/libe-book00 \
 		libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat \
+		libmwaw-0.2.so:${PORTSDIR}/textproc/libmwaw \
+		libodfgen-0.0.so:${PORTSDIR}/textproc/libodfgen \
 		libvisio-0.0.so:${PORTSDIR}/textproc/libvisio \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libwpd-0.9.so:${PORTSDIR}/textproc/libwpd \
 		libwps-0.2.so:${PORTSDIR}/textproc/libwps \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
+		libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libmythes-1.2.so:${PORTSDIR}/textproc/mythes \
-		librdf.so:${PORTSDIR}/textproc/redland \
-		libabw-0.0.so:${PORTSDIR}/textproc/libabw00 \
-		libfreehand-0.0.so:${PORTSDIR}/graphics/libfreehand00 \
-		libe-book-0.0.so:${PORTSDIR}/textproc/libe-book00
+		librdf.so:${PORTSDIR}/textproc/redland
 
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/lib/X11/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
@@ -79,9 +79,7 @@ WANT_GNOME=	yes
 DISTFILES+=	${PORTNAME}-${LOVERSION}${EXTRACT_SUFX}
 DISTFILES+=	${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX}
 
-EXTRA_PATCHES+=	${FILESDIR}/extra-icu53.diff:-p1 \
-		${FILESDIR}/extra-icu53-crash.diff:-p1 \
-		${FILESDIR}/extra-fix-ldl:-p1
+EXTRA_PATCHES+=	${FILESDIR}/extra-fix-ldl:-p1
 
 EXTRACT_ONLY:=	${DISTFILES}
 
@@ -113,12 +111,13 @@ CONFIGURE_ARGS+=	--disable-dependency-tracking \
 			--with-vendor="FreeBSD ports ${PKGVERSION}"
 
 CONFIGURE_ARGS+=	--disable-epm \
+			--disable-firebird-sdbc \
 			--disable-gnome-vfs \
 			--disable-gstreamer \
 			--disable-kde \
 			--disable-kdeab \
 			--disable-mergelibs \
-			--disable-firebird-sdbc \
+			--disable-packagekit \
 			--enable-cairo-canvas \
 			--enable-graphite \
 			--enable-python=system \
@@ -161,11 +160,13 @@ CONFIGURE_ARGS+=	--disable-epm \
 			--with-system-mdds \
 			--with-system-mesa-headers \
 			--with-system-mythes \
+			--with-system-neon \
 			--with-system-nss \
 			--with-system-openldap \
 			--with-system-openssl \
 			--with-system-orcus \
 			--with-system-poppler \
+			--with-system-postgresql \
 			--with-system-redland \
 			--with-system-ucpp \
 			--with-system-vigra \
@@ -193,55 +194,18 @@ WEBDAV_DESC=	Enable webdav protocol
 CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
 CUPS_CONFIGURE_ENABLE=	cups
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-IGNORE=			known as broken
-CONFIGURE_ARGS+=	--enable-debug \
-			--enable-dbgutil \
-			--enable-crashdump
-.else
-CONFIGURE_ARGS+=	--enable-release-build
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG} || ${PORT_OPTIONS:MVERBOSE}
-CONFIGURE_ARGS+=	--enable-verbose
-.endif
+DEBUG_CONFIGURE_ON=	--enable-crashdump --enable-dbgutil --enable-debug
+DEBUG_CONFIGURE_OFF=	--enable-release-build
 
-.if ${PORT_OPTIONS:MGNOME}
-LIB_DEPENDS+=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-USE_GNOME+=		gconf2
-CONFIGURE_ARGS+=	--enable-dbus --enable-gconf --enable-gio \
-			--enable-lockdown
-.else
-CONFIGURE_ARGS+=	--disable-dbus --disable-gconf --disable-gio \
-			--disable-lockdown
-.endif
+GNOME_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+GNOME_USE=	GNOME=gconf2
+GNOME_CONFIGURE_ENABLE=	dbus gconf gio lockdown
 
-.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=	--enable-gtk
-.else
-CONFIGURE_ARGS+=	--disable-gtk
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-USE_GNOME+=	gtk30
-CONFIGURE_ARGS+=	--enable-gtk3
-.else
-CONFIGURE_ARGS+=	--disable-gtk3
-.endif
-
-.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
-USES+=		desktop-file-utils
-INSTALLS_ICONS=	yes
-.endif
+GTK3_USE=		GNOME=gtk30
+GTK3_CONFIGURE_ENABLE=	gtk3
 
-.if ${PORT_OPTIONS:MJAVA}
-# XXX jni.h from GNU classpath causes ABI conflicts.
-CONFLICTS_BUILD=	classpath-[0-9]*
-#additionnal distfiles needed for java
-DISTFILES+=	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
+JAVA_CATEGORIES=	java
+JAVA_DISTFILES=	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
 		2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz:src \
 		2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz:src \
 		3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \
@@ -261,79 +225,77 @@ DISTFILES+=	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
 		ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz:src \
 		eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \
 		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src
-
+JAVA_BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
+			${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit
+# XXX jni.h from GNU classpath causes ABI conflicts.
+JAVA_CONFLICTS_BUILD=	classpath-[0-9]*
+JAVA_CONFIGURE_ON=	--enable-ext-wiki-publisher \
+			--enable-report-builder \
+			--with-ant-home=${LOCALBASE}/share/java/apache-ant \
+			--with-jdk-home=${JAVA_HOME} \
+			--with-junit=${JAVAJARDIR}/junit.jar
+JAVA_CONFIGURE_OFF=	--without-java
 # LibreOffice works only with Java 6 -- which may not be the default
 # if you specify the JAVA_VENDOR variable
-CATEGORIES+=	java
-USE_JAVA=	yes
 JAVA_BUILD=	yes
 JAVA_VERSION=	1.6
-BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant \
-		${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit
+JAVA_USE=	JAVA=yes
 
-CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
-			--enable-report-builder \
-			--enable-scripting-beanshell \
-			--enable-scripting-javascript \
-			--with-ant-home=${LOCALBASE}/share/java/apache-ant/ \
-			--with-jdk-home=${JAVA_HOME} \
-			--with-junit=${JAVAJARDIR}/junit.jar
+KDE4_USE=	KDE4=kdelibs QT4=moc_build QT4=qmake_build
+KDE4_CONFIGURE_ENABLE=	kde4
+KDE4_CONFIGURE_ENV=	KDE4DIR="${KDE4_PREFIX}" \
+			QT4DIR="${QT_PREFIX}" \
+			QT4INC="${QT_INCDIR}" \
+			QT4LIB="${QT_LIBDIR}"
 
-.else
-CONFIGURE_ARGS+=	--without-java
-.endif
+MMEDIA_USE=	GSTREAMER=yes
+MMEDIA_CONFIGURE_ENABLE=	gstreamer-0-10
 
-.if ${PORT_OPTIONS:MKDE4}
-USE_KDE4=	kdelibs
-USE_QT4+=	moc_build qmake_build
-CONFIGURE_ENV+=		QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}"
-CONFIGURE_ARGS+=	--enable-kde4
-.else
-CONFIGURE_ARGS+=	--disable-kde4
-.endif
+PGSQL_USE=	PGSQL=yes
+PGSQL_CONFIGURE_ENABLE=	postgresql-sdbc
+PGSQL_CONFIGURE_WITH=	gssapi krb5
 
-.if ${PORT_OPTIONS:MMMEDIA}
-USE_GSTREAMER=	yes
-CONFIGURE_ARGS+=	--enable-gstreamer-0-10
-.else
-CONFIGURE_ARGS+=	--disable-gstreamer-0-10
+SDK_DISTFILES=	185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
+SDK_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+SDK_CONFIGURE_ENABLE=	odk
+SDK_CONFIGURE_ON=	--with-doxygen=${LOCALBASE}/bin/doxygen
+SDK_CONFIGURE_OFF=	--without-doxygen
+
+SYSTRAY_CONFIGURE_ENABLE=	systray
+
+TEST_CONFIGURE_ENABLE=	cve-tests
+
+WEBDAV_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon29
+WEBDAV_CONFIGURE_ENABLE=	neon
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDEBUG}
+IGNORE=			is broken with DEBUG option
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-WANT_PGSQL_VER=	90+
-CONFIGURE_ARGS+=	--enable-postgresql-sdbc --with-system-postgresql
-.else
-CONFIGURE_ARGS+=	--disable-postgresql-sdbc \
-			--without-gssapi --without-krb5
+.if ${PORT_OPTIONS:MDEBUG} || ${PORT_OPTIONS:MVERBOSE}
+CONFIGURE_ARGS+=	--enable-verbose
 .endif
 
-.if ${PORT_OPTIONS:MSDK}
-DISTFILES+=	185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-CONFIGURE_ARGS+=	--enable-odk --with-doxygen=${LOCALBASE}/bin/doxygen
+.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2}
+USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=	--enable-gtk
 .else
-CONFIGURE_ARGS+=	--disable-odk --without-doxygen
+CONFIGURE_ARGS+=	--disable-gtk
 .endif
 
-.if ${PORT_OPTIONS:MSYSTRAY}
-CONFIGURE_ARGS+=	--enable-systray
-.else
-CONFIGURE_ARGS+=	--disable-systray
+.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
+USES+=		desktop-file-utils
+INSTALLS_ICONS=	yes
 .endif
 
-.if ${PORT_OPTIONS:MTEST}
-CONFIGURE_ARGS+=	--enable-cve-tests
-.else
-EXTRA_PATCHES+=		${FILESDIR}/disable-cppunittester
-CONFIGURE_ARGS+=	--disable-cve-tests
+.if ${PORT_OPTIONS:MPGSQL}
+WANT_PGSQL_VER=	90+
 .endif
 
-.if ${PORT_OPTIONS:MWEBDAV}
-CONFIGURE_ARGS+=	--enable-neon --with-system-neon
-LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon29
-.else
-CONFIGURE_ARGS+=	--disable-neon
+.if empty(PORT_OPTIONS:MTEST)
+EXTRA_PATCHES+=		${FILESDIR}/disable-cppunittester
 .endif
 
 .include <bsd.port.pre.mk>