diff options
| author | hira <hira@pkgsrc.org> | 2007-02-28 22:41:45 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2007-02-28 22:41:45 +0000 |
| commit | 4a3baa6fbb8757862643b861d623a7d6f8d4c45c (patch) | |
| tree | e7ccff25efa2f95625f5c67da68602c95007201f /misc | |
| parent | c97bf4739fa3de84557d167031163965a90e8122 (diff) | |
| download | pkgsrc-4a3baa6fbb8757862643b861d623a7d6f8d4c45c.tar.gz | |
Re-enable gtk2 option. I've succeeded to build without gtk2.
gtk2 is still enabled by default because official build using it.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2/Makefile | 4 | ||||
| -rw-r--r-- | misc/openoffice2/options.mk | 19 |
2 files changed, 10 insertions, 13 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index cede6a5af54..d8eb264e39f 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/02/27 21:23:43 hira Exp $ +# $NetBSD: Makefile,v 1.4 2007/02/28 22:41:45 hira Exp $ # OO_VER= 2.1.0 @@ -52,7 +52,6 @@ ONLY_FOR_PLATFORM= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-binfilter -CONFIGURE_ARGS+= --enable-gtk CONFIGURE_ARGS+= --disable-ldap # `portable' supports all platforms. @@ -129,7 +128,6 @@ ARCH= ${MACHINE_ARCH:C/i[3-6]86/i386/g} .include "../../graphics/freetype2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk index f309c366fe0..8d4ba798594 100644 --- a/misc/openoffice2/options.mk +++ b/misc/openoffice2/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.3 2007/02/28 13:01:55 hira Exp $ +# $NetBSD: options.mk,v 1.4 2007/02/28 22:41:45 hira Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2 -PKG_SUPPORTED_OPTIONS= cups gnome-vfs2 # kde gtk2 +PKG_SUPPORTED_OPTIONS= cups gnome-vfs2 gtk2 # kde PKG_OPTIONS_REQUIRED_GROUPS= browser lang PKG_OPTIONS_GROUP.browser= firefox firefox-gtk1 seamonkey seamonkey-gtk1 OO_SUPPORTED_LANGUAGES= en-US af as-IN be-BY bg br bs ca cs cy da de \ @@ -14,7 +14,7 @@ OO_SUPPORTED_LANGUAGES= en-US af as-IN be-BY bg br bs ca cs cy da de \ .for l in ${OO_SUPPORTED_LANGUAGES} PKG_OPTIONS_GROUP.lang+= lang-${l} .endfor -PKG_SUGGESTED_OPTIONS= lang-en-US firefox +PKG_SUGGESTED_OPTIONS= gtk2 lang-en-US firefox .include "../../mk/bsd.options.mk" @@ -57,13 +57,12 @@ CONFIGURE_ARGS+= --enable-gnome-vfs CONFIGURE_ARGS+= --disable-gnome-vfs .endif -# Disabling it causes build error. -#.if !empty(PKG_OPTIONS:Mgtk2) -#.include "../../x11/gtk2/buildlink3.mk" -#CONFIGURE_ARGS+= --enable-gtk -#.else -#CONFIGURE_ARGS+= --disable-gtk -#.endif +.if !empty(PKG_OPTIONS:Mgtk2) +.include "../../x11/gtk2/buildlink3.mk" +CONFIGURE_ARGS+= --enable-gtk +.else +CONFIGURE_ARGS+= --disable-gtk +.endif # XXX: Not yet. .if !empty(PKG_OPTIONS:Mkde) |