diff options
| author | tnn <tnn> | 2010-12-29 22:38:49 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2010-12-29 22:38:49 +0000 |
| commit | 498b19ec45e1140cc74232298d976b6338ce35dc (patch) | |
| tree | 65d1d03edd543d82f9fbb2a89307505543ed3a8c | |
| parent | b13136b30f4b0421474dbf11386e6c5264566c6c (diff) | |
| download | pkgsrc-498b19ec45e1140cc74232298d976b6338ce35dc.tar.gz | |
fix installation w/ gnome option enabled
| -rw-r--r-- | www/firefox/Makefile | 4 | ||||
| -rw-r--r-- | www/firefox/PLIST | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 500698259c8..65d23dd8f24 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2010/12/11 14:46:29 tnn Exp $ +# $NetBSD: Makefile,v 1.81 2010/12/29 22:38:49 tnn Exp $ .include "../../devel/xulrunner/dist.mk" PKGNAME= firefox-${FIREFOX_VER} @@ -53,10 +53,8 @@ post-install: BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=${MOZ_BRANCH}${MOZ_BRANCH_MINOR} BUILD_DEPENDS+= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner .include "../../devel/xulrunner/buildlink3.mk" -PLIST_VARS+= gnome .if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome) CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui -PLIST.gnome= yes .else CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui .endif diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 558ede40784..7f6f1e987fd 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.40 2010/03/16 15:57:03 tnn Exp $ +@comment $NetBSD: PLIST,v 1.41 2010/12/29 22:38:49 tnn Exp $ bin/firefox lib/firefox/.autoreg lib/firefox/LICENSE @@ -25,7 +25,6 @@ lib/firefox/components/components.list lib/firefox/components/fuelApplication.js lib/firefox/components/libbrowsercomps.so lib/firefox/components/libbrowserdirprovider.so -${PLIST.gnome}lib/firefox/components/libnkgnomevfs.so lib/firefox/components/nsBrowserContentHandler.js lib/firefox/components/nsBrowserGlue.js lib/firefox/components/nsMicrosummaryService.js |