summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/options.mk7
2 files changed, 5 insertions, 6 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index fa09b5b4367..d20337ee42e 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.229 2015/10/10 01:58:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.230 2015/10/16 12:58:16 jmcneill Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 41.0
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR= .1
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/options.mk b/www/firefox/options.mk
index f1b00fe39f7..8e816017822 100644
--- a/www/firefox/options.mk
+++ b/www/firefox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2015/07/03 10:25:40 ryoon Exp $
+# $NetBSD: options.mk,v 1.27 2015/10/16 12:58:16 jmcneill Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
@@ -29,12 +29,11 @@ CONFIGURE_ARGS+= --disable-alsa
.include "../../devel/libgnomeui/buildlink3.mk"
#.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-gio --enable-dbus --enable-gnomeui
+CONFIGURE_ARGS+= --enable-dbus --enable-gnomeui
CONFIGURE_ARGS+= --enable-libnotify
-CONFIGURE_ARGS+= --enable-extensions=gio
PLIST.gnome= yes
.else
-CONFIGURE_ARGS+= --disable-gio --disable-dbus --disable-gnomeui
+CONFIGURE_ARGS+= --disable-dbus --disable-gnomeui
CONFIGURE_ARGS+= --disable-libnotify
.endif