diff options
| author | hira <hira@pkgsrc.org> | 2007-02-27 20:26:26 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2007-02-27 20:26:26 +0000 |
| commit | 9137a937e45e031bd1b946ea9c0adc44a1ccddd5 (patch) | |
| tree | 9892f4aa804ed236fd9f5278d718438e164bf20c /misc | |
| parent | 707d166476dcc43a33bacb7b9003df00ffb9d507 (diff) | |
| download | pkgsrc-9137a937e45e031bd1b946ea9c0adc44a1ccddd5.tar.gz | |
- Enable gtk2.
- Add pkg-config to USE_TOOLS.
Bump PKGREVISION.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2/Makefile | 7 | ||||
| -rw-r--r-- | misc/openoffice2/options.mk | 17 |
2 files changed, 14 insertions, 10 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index 15675c73344..f38a015443a 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ +# $NetBSD: Makefile,v 1.2 2007/02/27 20:26:26 hira Exp $ # OO_VER= 2.1.0 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice2-${OO_VER} +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} DIST_SUBDIR= ${DISTNAME} @@ -33,7 +34,7 @@ USE_LANGUAGES+= c c++ .include "../../mk/bsd.prefs.mk" -USE_TOOLS+= gmake imake perl tar +USE_TOOLS+= gmake imake perl pkg-config tar PTHREAD_OPTS+= require PTHREAD_AUTO_VARS= yes @@ -47,6 +48,7 @@ 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. @@ -123,6 +125,7 @@ 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 a7cff30132c..f0ad4a6961e 100644 --- a/misc/openoffice2/options.mk +++ b/misc/openoffice2/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ +# $NetBSD: options.mk,v 1.2 2007/02/27 20:26:26 hira Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2 -PKG_SUPPORTED_OPTIONS= cups gtk2 gnome-vfs2 # kde +PKG_SUPPORTED_OPTIONS= cups gnome-vfs2 # kde gtk2 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 \ @@ -57,12 +57,13 @@ CONFIGURE_ARGS+= --enable-gnome-vfs CONFIGURE_ARGS+= --disable-gnome-vfs .endif -.if !empty(PKG_OPTIONS:Mgtk2) -.include "../../x11/gtk2/buildlink3.mk" -CONFIGURE_ARGS+= --enable-gtk -.else -CONFIGURE_ARGS+= --disable-gtk -.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 # XXX: Not yet. .if !empty(PKG_OPTIONS:Mkde) |