Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_148721191739760"
MIME-Version: 1.0
Date: Thu, 16 Feb 2017 02:25:17 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/www/firefox
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20170216022517.37AF8FBE3@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_148721191739760
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Thu Feb 16 02:25:17 UTC 2017

Modified Files:
	pkgsrc/www/firefox: distinfo
	pkgsrc/www/firefox/patches: patch-as
Added Files:
	pkgsrc/www/firefox/patches: patch-build_moz.configure_memory.configure

Log Message:
firefox: add some configure bits for DragonflyBSD lost in the passage of
time. PR pkg/51695


To generate a diff of this commit:
cvs rdiff -u -r1.272 -r1.273 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/firefox/patches/patch-as
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_148721191739760
Content-Disposition: inline
Content-Length: 4000
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.272 pkgsrc/www/firefox/distinfo:1.273
--- pkgsrc/www/firefox/distinfo:1.272	Sat Feb 11 08:27:33 2017
+++ pkgsrc/www/firefox/distinfo	Thu Feb 16 02:25:16 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.272 2017/02/11 08:27:33 ryoon Exp $
+$NetBSD: distinfo,v 1.273 2017/02/16 02:25:16 maya Exp $
 
 SHA1 (firefox-51.0.1.source.tar.xz) = b73255fd4f90fd0c1b107b566679da2df3f31cf1
 RMD160 (firefox-51.0.1.source.tar.xz) = 6acc6fc8e3e317842d75b0233a24b0f19c9d3f34
@@ -6,7 +6,7 @@ SHA512 (firefox-51.0.1.source.tar.xz) = 
 Size (firefox-51.0.1.source.tar.xz) = 202142716 bytes
 SHA1 (patch-aa) = 42dbb30745fc0e40cf582376c8fbfcd0715fcf5e
 SHA1 (patch-ao) = 1564bc503670dc07ec8b9b43927f0c5879f3a44d
-SHA1 (patch-as) = d01c9173f1055cbafff4b08bcd5bbbc2eca63044
+SHA1 (patch-as) = 632ebd35287f8f97d18721d39a0514d4cdbb12cc
 SHA1 (patch-browser_app_nsBrowserApp.cpp) = f109f5430e1b9fd11f8263d756bea0572b8ffa20
 SHA1 (patch-browser_components_nsBrowserGlue.js) = 01eef808fadc361215e60e44d79cfc8a4336107f
 SHA1 (patch-browser_installer_package-manifest.in) = d1f003f9ac65e12eb04b1d19a4d9a780bded9fd9
@@ -14,6 +14,7 @@ SHA1 (patch-browser_themes_shared_icon-c
 SHA1 (patch-build_autoconf_toolchain.m4) = f7f5ad59a7cefbc7989e99f10b48520f1bd4bad1
 SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86
 SHA1 (patch-build_moz.configure_init.configure) = f2df0c6b92aa825a61f6a4ee1f70f5443c61858e
+SHA1 (patch-build_moz.configure_memory.configure) = 46237c1415eff3f99d4889a6300ec96af925f0a6
 SHA1 (patch-build_moz.configure_old.configure) = 143e1d0b416b33ae92950f347898cf6ed22d0f6f
 SHA1 (patch-build_moz.configure_toolchain.configure) = f02501a573b65f3e9c793c6146f26dd1d3e19222
 SHA1 (patch-build_pgo_profileserver.py) = 48ad50f716eda2157cbc225298f6672f164b4207

Index: pkgsrc/www/firefox/patches/patch-as
diff -u pkgsrc/www/firefox/patches/patch-as:1.21 pkgsrc/www/firefox/patches/patch-as:1.22
--- pkgsrc/www/firefox/patches/patch-as:1.21	Wed Jan 25 13:24:51 2017
+++ pkgsrc/www/firefox/patches/patch-as	Thu Feb 16 02:25:17 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.21 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-as,v 1.22 2017/02/16 02:25:17 maya Exp $
 
 * Treat DragonFly like FreeBSD.
 * Add system ICU support
@@ -15,3 +15,21 @@ $NetBSD: patch-as,v 1.21 2017/01/25 13:2
  dnl Special win32 checks
  dnl ========================================================
  
+@@ -1053,7 +1056,7 @@ dnl Checks for header files.
+ dnl ========================================================
+ AC_HEADER_DIRENT
+ case "$target_os" in
+-freebsd*)
++freebsd*|*-*-dragonfly*)
+ # for stuff like -lXshm
+     CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+     ;;
+@@ -1184,7 +1187,7 @@ then
+     fi
+ 
+ 	case "$target" in
+-	    *-*-freebsd*)
++	    *-*-freebsd*|*-*-dragonfly*)
+ 			AC_DEFINE(_REENTRANT)
+ 			AC_DEFINE(_THREAD_SAFE)
+ 			dnl -pthread links in -lpthread, so don't specify it explicitly.

Added files:

Index: pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure
diff -u /dev/null pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure:1.1
--- /dev/null	Thu Feb 16 02:25:17 2017
+++ pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure	Thu Feb 16 02:25:17 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_moz.configure_memory.configure,v 1.1 2017/02/16 02:25:17 maya Exp $
+
+Recognise DragonflyBSD
+
+--- build/moz.configure/memory.configure.orig	2017-01-16 16:16:51.000000000 +0000
++++ build/moz.configure/memory.configure
+@@ -66,7 +66,7 @@ def jemalloc_os_define(jemalloc, jemallo
+             return 'MOZ_MEMORY_LINUX'
+         if target.kernel == 'Darwin':
+             return 'MOZ_MEMORY_DARWIN'
+-        if target.kernel in ('kFreeBSD', 'FreeBSD', 'NetBSD'):
++        if target.kernel in ('kFreeBSD', 'FreeBSD', 'NetBSD', 'DragonFly'):
+             return 'MOZ_MEMORY_BSD'
+         die('--enable-jemalloc is not supported on %s', target.kernel)
+ 


--_----------=_148721191739760--