CVS commit: pkgsrc/www/firefox52

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Thu Apr  1 15:28:10 UTC 2021

Modified Files:
        pkgsrc/www/firefox52: distinfo
        pkgsrc/www/firefox52/patches: patch-aa

Log Message:
Avoid a gnu specific regex in a sed invocation during autoconfigury,
now the pkg builds again on NetBSD-current.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/firefox52/patches/patch-aa

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

Modified files:

Index: pkgsrc/www/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.25 pkgsrc/www/firefox52/distinfo:1.26
--- pkgsrc/www/firefox52/distinfo:1.25  Wed Nov 11 11:15:38 2020
+++ pkgsrc/www/firefox52/distinfo       Thu Apr  1 15:28:10 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2020/11/11 11:15:38 nia Exp $
+$NetBSD: distinfo,v 1.26 2021/04/01 15:28:10 martin Exp $
 
 SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
 RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
 SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
 Size (firefox-52.9.0esr.source.tar.xz) = 214087304 bytes
-SHA1 (patch-aa) = 0ca132012a7005a506cdecc0167d4c7782aee244
+SHA1 (patch-aa) = 31ba818e5f507c0ebdddd178b4801ab81e1bbbe5
 SHA1 (patch-ao) = 8b7125ef3b193fca4d03386142887b2f8d5015c5
 SHA1 (patch-as) = b596132c7b6902c4f7ddb901e28e1437b99bb428
 SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86

Index: pkgsrc/www/firefox52/patches/patch-aa
diff -u pkgsrc/www/firefox52/patches/patch-aa:1.3 pkgsrc/www/firefox52/patches/patch-aa:1.4
--- pkgsrc/www/firefox52/patches/patch-aa:1.3   Fri Jun 14 08:11:35 2019
+++ pkgsrc/www/firefox52/patches/patch-aa       Thu Apr  1 15:28:10 2021
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2019/06/14 08:11:35 nia Exp $
+$NetBSD: patch-aa,v 1.4 2021/04/01 15:28:10 martin Exp $
 
 * MOZ_ENABLE_PROFILER_SPS is not for users, Disable it
 * Disable libjpeg-turbo check
 * Add system libraries option
 * Add OSS audio support
 * Add Sun audio support
+* Fix GNU specific sed call by using a portable regex instead
 
---- old-configure.in.orig      2017-09-11 20:13:47.000000000 +0000
-+++ old-configure.in
+--- old-configure.in.orig      2017-09-11 22:13:47.000000000 +0200
++++ old-configure.in   2021-03-31 20:45:25.040426765 +0200
 @@ -2159,11 +2159,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
@@ -252,3 +253,12 @@ $NetBSD: patch-aa,v 1.3 2019/06/14 08:11
  dnl Check for pixman and cairo
  dnl ========================================================
  
+@@ -5916,7 +6106,7 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ 
+ # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS
+ # and $NSPR_LIBS.
+-ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`"
++ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[[^[:space:]]]* *//'`"
+ 
+ if test "$_INTL_API" = no; then
+     ac_configure_args="$ac_configure_args --without-intl-api"