diff options
| author | tnn <tnn@pkgsrc.org> | 2010-11-17 10:15:53 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2010-11-17 10:15:53 +0000 |
| commit | 5f4b1b654c4204e3e49e0afa03d905dfcd78f7d8 (patch) | |
| tree | ea8d6c13c1c1ba06969c0d174e0c2b55503b8746 /misc | |
| parent | 1a674f054851b059b1865e9d53da34c6d4483a2c (diff) | |
| download | pkgsrc-5f4b1b654c4204e3e49e0afa03d905dfcd78f7d8.tar.gz | |
committed previous from the wrong tree, we should only bl3 gdk-pixbuf2-xlib
if the gtk2 option is enabled.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice3/Makefile | 3 | ||||
| -rw-r--r-- | misc/openoffice3/options.mk | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index f49a561cdf4..688fc6eb96e 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2010/11/17 10:13:47 tnn Exp $ +# $NetBSD: Makefile,v 1.48 2010/11/17 10:15:53 tnn Exp $ OO_VER= 3.1.1 OO_TAG= OOO310_m19 @@ -201,7 +201,6 @@ post-install: .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk index 89592ef13e1..8985a15eb6b 100644 --- a/misc/openoffice3/options.mk +++ b/misc/openoffice3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.21 2010/03/16 15:58:54 tnn Exp $ +# $NetBSD: options.mk,v 1.22 2010/11/17 10:15:53 tnn Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 @@ -84,6 +84,7 @@ CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2 --disable-gconf .if !empty(PKG_OPTIONS:Mgtk2) CONFIGURE_ARGS+= --enable-gtk +.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-gtk |