Date: Mon, 1 Jul 2013 19:13:51 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322139 - head/editors/libreoffice Message-ID: <201307011913.r61JDpKr022628@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Jul 1 19:13:50 2013 New Revision: 322139 URL: http://svnweb.freebsd.org/changeset/ports/322139 Log: Remove broken options to not confuse users. Modified: head/editors/libreoffice/Makefile Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Mon Jul 1 18:40:19 2013 (r322138) +++ head/editors/libreoffice/Makefile Mon Jul 1 19:13:50 2013 (r322139) @@ -108,9 +108,11 @@ CONFIGURE_ARGS+= --disable-dependency-tr CONFIGURE_ARGS+= --disable-epm \ --disable-gnome-vfs \ --disable-gstreamer \ + --disable-gtk3 \ --disable-kde \ --disable-kdeab \ --disable-linkoo \ + --disable-mergelibs \ --disable-zenity \ --enable-cairo-canvas \ --enable-graphite \ @@ -176,12 +178,11 @@ MAN1= libreoffice.1 \ MANCOMPRESSED= yes -OPTIONS_DEFINE= CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MERGELIBS MMEDIA PGSQL \ - SDK SYSTRAY TEST WEBDAV +OPTIONS_DEFINE= CUPS DEBUG GNOME GTK2 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \ + TEST WEBDAV OPTIONS_DEFAULT=CUPS GTK2 JAVA_DESC= Add java support (XML Filters, macros) -MERGELIBS_DESC= Enable linking of big merged library MMEDIA_DESC= Enable multimedia backend for impress PGSQL_DESC= Build with PostgreSQL-SDBC driver SDK_DESC= Build with SDK @@ -226,15 +227,6 @@ CONFIGURE_ARGS+= --enable-gtk CONFIGURE_ARGS+= --disable-gtk .endif -.if ${PORT_OPTIONS:MGTK3} -BROKEN= requires GTK+ 3.2 and later -USE_GNOME+= gtk30 desktopfileutils -INSTALLS_ICONS= yes -CONFIGURE_ARGS+= --enable-gtk3 -.else -CONFIGURE_ARGS+= --disable-gtk3 -.endif - .if ${PORT_OPTIONS:MJAVA} # XXX jni.h from GNU classpath causes ABI conflicts. CONFLICTS_BUILD= classpath-[0-9]* @@ -291,13 +283,6 @@ CONFIGURE_ARGS+= --enable-kde4 CONFIGURE_ARGS+= --disable-kde4 .endif -.if ${PORT_OPTIONS:MMERGELIBS} -BROKEN= mergelibs causes runtime problems -CONFIGURE_ARGS+= --enable-mergelibs -.else -CONFIGURE_ARGS+= --disable-mergelibs -.endif - .if ${PORT_OPTIONS:MMMEDIA} USE_GSTREAMER= yes CONFIGURE_ARGS+= --enable-gstreamer-0-10 @@ -413,7 +398,7 @@ post-install: \( -type f -o -type l \) -print >> ${PLISTF} .endfor -.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK3} +.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME} @${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database >/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database >/dev/null || ${TRUE}" >> ${TMPPLIST} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307011913.r61JDpKr022628>