diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-08-12 05:41:30 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-08-12 05:41:30 +0000 |
| commit | c84fee737239d728af2d5c874577c6b7ceea40ed (patch) | |
| tree | 7280bd205011c6aa271a6529b471a083d3f6fef0 /www | |
| parent | 8953c972336dbfb48736bce6d20cd4784a2ee9ce (diff) | |
| download | pkgsrc-c84fee737239d728af2d5c874577c6b7ceea40ed.tar.gz | |
Bump PKGREVISION.
* Fix merge mistake.
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox/Makefile | 3 | ||||
| -rw-r--r-- | www/firefox/distinfo | 4 | ||||
| -rw-r--r-- | www/firefox/patches/patch-browser_app_nsBrowserApp.cpp | 10 |
3 files changed, 5 insertions, 12 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 96f63bb70b9..b33e1e78631 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.221 2015/08/11 23:48:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.222 2015/08/12 05:41:30 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 40.0 @@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR= DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} +PKGREVISION= 1 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/distinfo b/www/firefox/distinfo index 9c7bcf732bd..b93a1221001 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.210 2015/08/11 23:48:17 ryoon Exp $ +$NetBSD: distinfo,v 1.211 2015/08/12 05:41:30 ryoon Exp $ SHA1 (firefox-40.0.source.tar.bz2) = 48483e5738182f8567e2b6d2e29bd6bc1812d3eb RMD160 (firefox-40.0.source.tar.bz2) = 046cd9d0ce0952238b60bb7351e2009a101a74d9 @@ -11,7 +11,7 @@ SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df SHA1 (patch-b2g_installer_package-manifest.in) = daf8468729a96875d346643d4f9df54a39a4bdd7 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 -SHA1 (patch-browser_app_nsBrowserApp.cpp) = b7dd345b88dd03716f725c790364d06475aaf6bb +SHA1 (patch-browser_app_nsBrowserApp.cpp) = 2957fa349b34d41b273be689a97cfbc613cead02 SHA1 (patch-browser_installer_package-manifest.in) = aee56636fc83ea6441c5303ef0297971b41516d1 SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07 SHA1 (patch-build_autoconf_nss.m4) = 970fcd9aeede2347651c516d5211c4555dd28a4d diff --git a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp index 514fa9e5540..d900ce4a78c 100644 --- a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp +++ b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.7 2015/05/12 22:48:54 ryoon Exp $ +$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.8 2015/08/12 05:41:30 ryoon Exp $ * Replace XP_MACOSX with XP_DARWIN as the former is not defined when the toolkit is not cocoa. @@ -26,11 +26,3 @@ $NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.7 2015/05/12 22:48:54 ryoon Exp return mach_absolute_time(); #elif defined(HAVE_CLOCK_MONOTONIC) struct timespec ts; -@@ -606,6 +608,7 @@ int main(int argc, char* argv[]) - TriggerQuirks(); - #endif - -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); - int gotCounters; - #if defined(XP_UNIX) - struct rusage initialRUsage; |