diff options
-rw-r--r-- | misc/openoffice2/distinfo | 4 | ||||
-rw-r--r-- | misc/openoffice2/options.mk | 26 | ||||
-rw-r--r-- | misc/openoffice2/patches/patch-ba | 13 |
3 files changed, 26 insertions, 17 deletions
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo index d842413ff1e..5d4bd196acd 100644 --- a/misc/openoffice2/distinfo +++ b/misc/openoffice2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2007/04/12 05:28:08 hira Exp $ +$NetBSD: distinfo,v 1.14 2007/04/20 14:44:11 hira Exp $ SHA1 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = d1fa827e2c08d7e3d67b2588b1136ed9e774ef42 RMD160 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 1bb07f01e872ed003dbac3e11bc5732904076ae1 @@ -32,7 +32,7 @@ SHA1 (patch-aq) = 41fab8bdc5bc611fd01623ac222189646e42bf22 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad -SHA1 (patch-ba) = 7f4c6ccfa21fec9373e9661354657f3d3338a48c +SHA1 (patch-ba) = 0726d1331395646e2800f04d05f6dc7ec598d630 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5 diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk index 665f1b5b43a..fe7d54ecd4b 100644 --- a/misc/openoffice2/options.mk +++ b/misc/openoffice2/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.7 2007/03/30 13:34:53 hira Exp $ +# $NetBSD: options.mk,v 1.8 2007/04/20 14:44:11 hira Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2 -PKG_SUPPORTED_OPTIONS= cups gnome gtk2 # kde +PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde PKG_OPTIONS_REQUIRED_GROUPS= browser lang PKG_OPTIONS_GROUP.browser= firefox # seamonkey firefox-gtk1 seamonkey-gtk1 OO_SUPPORTED_LANGUAGES= en-US af as-IN be-BY bg br bs ca cs cy da de \ @@ -23,58 +23,58 @@ PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome OPENOFFICE_LANGUAGE= ${PKG_OPTIONS:Mlang-*:S/^lang-//1} .if !empty(PKG_OPTIONS:Mfirefox) -.include "../../www/firefox/buildlink3.mk" CONFIGURE_ARGS+= --with-system-mozilla --with-firefox +.include "../../www/firefox/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mfirefox-gtk1) -.include "../../www/firefox-gtk1/buildlink3.mk" CONFIGURE_ARGS+= --with-system-mozilla --with-firefox +.include "../../www/firefox-gtk1/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mseamonkey) -.include "../../www/seamonkey/buildlink3.mk" CONFIGURE_ARGS+= --with-system-mozilla +.include "../../www/seamonkey/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mseamonkey-gtk1) -.include "../../www/seamonkey-gtk1/buildlink3.mk" CONFIGURE_ARGS+= --with-system-mozilla +.include "../../www/seamonkey-gtk1/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mcups) -.include "../../print/cups/buildlink3.mk" CONFIGURE_ARGS+= --enable-cups +.include "../../print/cups/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-cups .endif .if !empty(PKG_OPTIONS:Mgnome) +CONFIGURE_ARGS+= --enable-gnome-vfs --enable-evolution2 .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" -CONFIGURE_ARGS+= --enable-gnome-vfs --enable-evolution2 .else CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2 .endif .if !empty(PKG_OPTIONS:Mgtk2) -.include "../../x11/gtk2/buildlink3.mk" CONFIGURE_ARGS+= --enable-gtk # *.pc files are needed with NetBSD using native XFree86. -.if ${OPSYS} == "NetBSD" && defined(X11_TYPE) && !empty(X11_TYPE:Mnative) +. if ${OPSYS} == "NetBSD" && defined(X11_TYPE) && !empty(X11_TYPE:Mnative) USE_BUILTIN.Xfixes= no USE_BUILTIN.Xrandr= no USE_BUILTIN.Xrender= no -.endif +. endif +.include "../../x11/gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-gtk .endif -# XXX: Not yet. .if !empty(PKG_OPTIONS:Mkde) -.include "../../x11/kdelibs3/buildlink3.mk" +CONFIGURE_ENV+= KDEDIR=${BUILDLINK_PREFIX.kdelibs:Q} CONFIGURE_ARGS+= --enable-kde --enable-kdeab +.include "../../x11/kdelibs3/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-kde --disable-kdeab .endif diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba index 6744b126a19..0af1a8f3568 100644 --- a/misc/openoffice2/patches/patch-ba +++ b/misc/openoffice2/patches/patch-ba @@ -1,7 +1,7 @@ -$NetBSD: patch-ba,v 1.5 2007/04/12 05:28:08 hira Exp $ +$NetBSD: patch-ba,v 1.6 2007/04/20 14:44:11 hira Exp $ --- config_office/configure.orig 2007-01-19 22:01:19.000000000 +0900 -+++ config_office/configure 2007-04-12 14:18:58.000000000 +0900 ++++ config_office/configure 2007-04-20 06:56:17.000000000 +0900 @@ -2975,11 +2975,11 @@ test_cups=no _os=OSF1 @@ -25,3 +25,12 @@ $NetBSD: patch-ba,v 1.5 2007/04/12 05:28:08 hira Exp $ echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn fi fi +@@ -21383,7 +21383,7 @@ + fi + + KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" +- KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt" ++ KDE_LIBS="-L$kde_libdir -Wl,-R$kde_libdir -L$qt_libdir -Wl,-R$qt_libdir -lkdeui -lkdecore -lqt-mt" + fi + + |