diff options
author | tnn <tnn@pkgsrc.org> | 2010-02-17 18:32:18 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2010-02-17 18:32:18 +0000 |
commit | 00090167b320b11d0b314d1f9104cc910664a153 (patch) | |
tree | a37fc7d365eb1be504380c399bc3269033be55b0 | |
parent | 4abd112581e22436f7d0dd7ac75a2992e6473b48 (diff) | |
download | pkgsrc-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/
-rw-r--r-- | devel/xulrunner/Makefile | 4 | ||||
-rw-r--r-- | devel/xulrunner/dist.mk | 6 | ||||
-rw-r--r-- | devel/xulrunner/distinfo | 8 | ||||
-rw-r--r-- | www/firefox/Makefile | 7 | ||||
-rw-r--r-- | www/firefox/options.mk | 10 |
5 files changed, 14 insertions, 21 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index 83bc86f1cec..f7dacddcb65 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2010/01/31 20:54:44 tnn Exp $ +# $NetBSD: Makefile,v 1.37 2010/02/17 18:32:18 tnn Exp $ .include "dist.mk" -PKGNAME= xulrunner-${MOZ_BRANCH}.${MOZ_BRANCH_MINOR} +PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} CATEGORIES= devel www MAINTAINER= tnn@NetBSD.org diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk index ebc878187f7..a5939e9ba38 100644 --- a/devel/xulrunner/dist.mk +++ b/devel/xulrunner/dist.mk @@ -1,4 +1,4 @@ -# $NetBSD: dist.mk,v 1.6 2010/01/31 20:54:44 tnn Exp $ +# $NetBSD: dist.mk,v 1.7 2010/02/17 18:32:18 tnn Exp $ # # used by devel/nspr/Makefile # used by devel/nss/Makefile @@ -6,9 +6,9 @@ # used by www/firefox/Makefile DISTNAME= firefox-${FIREFOX_VER}.source -FIREFOX_VER= 3.5.${MOZ_BRANCH_MINOR} +FIREFOX_VER= 3.5${MOZ_BRANCH_MINOR} MOZ_BRANCH= 1.9.1 -MOZ_BRANCH_MINOR= 7 +MOZ_BRANCH_MINOR= .8 MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index c9eff164744..1f33e1d7458 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.23 2010/01/26 16:22:59 tron Exp $ +$NetBSD: distinfo,v 1.24 2010/02/17 18:32:18 tnn Exp $ -SHA1 (firefox-3.5.7.source.tar.bz2) = 7605d89b3d3e458db74dea4d227dd86d0d12ba1b -RMD160 (firefox-3.5.7.source.tar.bz2) = 2e908275d4ed7ede77b28b1dbd9d7904dbe05622 -Size (firefox-3.5.7.source.tar.bz2) = 46919155 bytes +SHA1 (firefox-3.5.8.source.tar.bz2) = 4bfb9a274113fb9ee590c00da69d995dc500d4cc +RMD160 (firefox-3.5.8.source.tar.bz2) = 97a4394d895fc0d8e7be34c090ebe75540108a90 +Size (firefox-3.5.8.source.tar.bz2) = 46954234 bytes SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d 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 |