diff options
| author | tnn <tnn> | 2009-09-13 19:10:10 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2009-09-13 19:10:10 +0000 |
| commit | 26c74227be82ac0b7bf85bbf9fd29b8acf0bb8aa (patch) | |
| tree | b3cd8b15225a632e0c7c086732c0197fb93e3d0e /devel/xulrunner | |
| parent | cb7787d1a0714b9fd736354af57164f1171f114b (diff) | |
| download | pkgsrc-26c74227be82ac0b7bf85bbf9fd29b8acf0bb8aa.tar.gz | |
export gnome dependencies in bl3.mk when gnome option is on
Diffstat (limited to 'devel/xulrunner')
| -rw-r--r-- | devel/xulrunner/Makefile | 7 | ||||
| -rw-r--r-- | devel/xulrunner/buildlink3.mk | 11 | ||||
| -rw-r--r-- | devel/xulrunner/options.mk | 8 |
3 files changed, 14 insertions, 12 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index e3394b84823..d2ed7007df5 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2009/09/13 13:39:41 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2009/09/13 19:10:10 tnn Exp $ # DISTNAME= xulrunner-${XULRUNNER_VER}-source PKGNAME= ${DISTNAME:S/-source//} XULRUNNER_VER= 1.9.1.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel www MASTER_SITES= ${MASTER_SITE_MOZILLA:=xulrunner/releases/${XULRUNNER_VER}/source/} EXTRACT_SUFX= .tar.bz2 @@ -48,8 +48,7 @@ CONFIGURE_ARGS+= --enable-libxul CONFIGURE_ARGS+= --disable-tests --disable-pedantic CONFIGURE_ARGS+= --enable-crypto CONFIGURE_ARGS+= --enable-optimize=-O2 --with-pthreads -CONFIGURE_ARGS+= --disable-gnomevfs --disable-gnomeui -CONFIGURE_ARGS+= --disable-dbus --disable-javaxpcom +CONFIGURE_ARGS+= --disable-javaxpcom CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 CONFIGURE_ARGS+= --enable-svg --enable-mathml CONFIGURE_ARGS+= --enable-system-cairo diff --git a/devel/xulrunner/buildlink3.mk b/devel/xulrunner/buildlink3.mk index a7fe25f48c4..aa2612efbdc 100644 --- a/devel/xulrunner/buildlink3.mk +++ b/devel/xulrunner/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:56:54 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/09/13 19:10:10 tnn Exp $ BUILDLINK_TREE+= xulrunner @@ -9,9 +9,12 @@ BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=1.9.1nb4 BUILDLINK_ABI_DEPENDS.xulrunner?= xulrunner>=1.9.1.2nb3 BUILDLINK_PKGSRCDIR.xulrunner?= ../../devel/xulrunner -#.include "../../net/libIDL/buildlink3.mk" -#.include "../../x11/gtk2/buildlink3.mk" -#.include "../../x11/libXt/buildlink3.mk" +pkgbase := xulrunner +.include "../../mk/pkg-build-options.mk" +.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome) +. include "../../devel/libgnomeui/buildlink3.mk" +. include "../../sysutils/gnome-vfs/buildlink3.mk" +.endif .endif # XULRUNNER_BUILDLINK3_MK BUILDLINK_TREE+= -xulrunner diff --git a/devel/xulrunner/options.mk b/devel/xulrunner/options.mk index df1817169dd..707017c9c11 100644 --- a/devel/xulrunner/options.mk +++ b/devel/xulrunner/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2009/09/13 17:56:56 tnn Exp $ +# $NetBSD: options.mk,v 1.5 2009/09/13 19:10:10 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xulrunner PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome @@ -21,12 +21,12 @@ NANOJIT_ARCH.sparc= Sparc .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mgnome) -.include "../../devel/libgnome/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" -CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus +CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui PLIST.gnome= yes .else -CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus +CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui .endif .if !empty(PKG_OPTIONS:Mmozilla-jemalloc) |