summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2010-02-17 18:32:18 +0000
committertnn <tnn@pkgsrc.org>2010-02-17 18:32:18 +0000
commit00090167b320b11d0b314d1f9104cc910664a153 (patch)
treea37fc7d365eb1be504380c399bc3269033be55b0 /www
parent4abd112581e22436f7d0dd7ac75a2992e6473b48 (diff)
downloadpkgsrc-00090167b320b11d0b314d1f9104cc910664a153.tar.gz
Update to firefox-3.5.8 and xulrunner-1.9.1.8.
Security and bugfix release. (no MFSAs released at time of writing) While here drop defunct debug option from firefox and reduce diff to wip/
Diffstat (limited to 'www')
-rw-r--r--www/firefox/Makefile7
-rw-r--r--www/firefox/options.mk10
2 files changed, 5 insertions, 12 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 65d0e4fda66..5e5abe539fa 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2010/01/31 21:02:48 tnn Exp $
+# $NetBSD: Makefile,v 1.70 2010/02/17 18:32:18 tnn Exp $
.include "../../devel/xulrunner/dist.mk"
PKGNAME= firefox-${FIREFOX_VER}
-PKGREVISION= 1
CATEGORIES= www
MAINTAINER= tnn@NetBSD.org
@@ -51,8 +50,8 @@ post-install:
rm -f ${DESTDIR}${PREFIX}/bin/firefox
${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
-BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=${MOZ_BRANCH}.${MOZ_BRANCH_MINOR}
-BUILD_DEPENDS+= xulrunner-${MOZ_BRANCH}.${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner
+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)
diff --git a/www/firefox/options.mk b/www/firefox/options.mk
index dec91332e21..ed685375161 100644
--- a/www/firefox/options.mk
+++ b/www/firefox/options.mk
@@ -1,18 +1,12 @@
-# $NetBSD: options.mk,v 1.7 2009/09/16 19:06:18 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2010/02/17 18:32:18 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
-PKG_SUPPORTED_OPTIONS= debug official-mozilla-branding
+PKG_SUPPORTED_OPTIONS= official-mozilla-branding
PLIST_VARS+= branding
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug
-.else
-CONFIGURE_ARGS+= --disable-debug
-.endif
-
.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
CONFIGURE_ARGS+= --enable-official-branding
PLIST.branding= yes