libreoffice and KDE3

[Baptiste Daroussin]

On Sat, Sep 24, 2011 at 01:46:30AM -0400, Mikhail T. wrote:
> Hello!
> 
> The attached patch adds KDE3 as a config-option (and picks two minor 
> nits). Please, commit or allow me to. Thank you! Yours,
> 
>     -mi
> 

> Index: Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/editors/libreoffice/Makefile,v
> retrieving revision 1.31
> diff -U 2 -r1.31 Makefile
> --- Makefile	23 Sep 2011 22:22:20 -0000	1.31
> +++ Makefile	24 Sep 2011 05:44:44 -0000
> @@ -101,5 +101,4 @@
>  		cups.2:${PORTSDIR}/print/cups-client
>  
> -
>  # dmake can't be used from ports
>  
> @@ -129,10 +128,11 @@
>  
>  OPTIONS=	WEBDAV	"Support webdav protocol" off \
> -		KDE4	"With Qt4/KDE4 vclplug support" off \
> +		KDE3	"With KDE3 support (conflicts with KDE4)" off \
> +		KDE4	"With Qt4/KDE4 vclplug support (not KDE3)" off \
>  		GTK	"With GTK vclplug support" on \
>  		GNOME	"Better integration in gnome environnement" off \
>  		JAVA	"Add Java support (XML Filters, macros)" off \
>  		PYUNO	"Allow to script libreoffice in python" off \
> -		SYSTRAY	"Enable systemtry quickstarter" off \
> +		SYSTRAY	"Enable systemtray quickstarter" off \
>  		MMEDIA	"Enable multimedia backend for impress" off \
>  		SDK	"Build with SDK" off \
> @@ -183,5 +183,4 @@
>  			--disable-build-mozilla \
>  			--without-system-mozilla \
> -			--disable-kde \
>  			--without-stlport \
>  			--disable-nss-module \
> @@ -258,4 +257,13 @@
>  .endif
>  
> +.if defined(WITH_KDE4) && defined(WITH_KDE3)
> +.error Only one of the KDE3 and KDE4 can be turned on
> +.endif
> +.if defined(WITH_KDE3)
> +USE_KDELIBS_VER=3
> +CONFIGURE_ARGS+=	--enable-kde
> +.else
> +CONFIGURE_ARGS+=	--disable-kde
> +.endif
>  .if defined(WITH_KDE4)
>  USE_KDE4=	kdelibs

Thanks let me first run it in my tinderbox :)

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-office/attachments/20110924/8bb2fe57/attachment.pgp