CVS commit: pkgsrc/www/firefox52

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Sep 26 07:45:28 UTC 2026

Modified Files:
        pkgsrc/www/firefox52: Makefile distinfo
Added Files:
        pkgsrc/www/firefox52/patches: patch-build_autoconf_nss.m4

Log Message:
www/firefox52: Fix build with recent devel/nss


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/www/firefox52/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox52/patches/patch-build_autoconf_nss.m4

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/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.114 pkgsrc/www/firefox52/Makefile:1.115
--- pkgsrc/www/firefox52/Makefile:1.114 Wed Sep  2 19:04:58 2026
+++ pkgsrc/www/firefox52/Makefile       Sat Sep 26 07:45:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2026/09/02 19:04:58 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2026/09/26 07:45:27 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
@@ -21,6 +21,14 @@ LICENSE=     mpl-1.1
 
 MOZILLA_DIR=   # empty
 
+BUILDLINK_TRANSFORM+=  l:smime:smime3
+BUILDLINK_TRANSFORM+=  l:nss:nss3
+BUILDLINK_TRANSFORM+=  l:nssutil:nssutil3
+BUILDLINK_TRANSFORM+=  l:ssl:ssl3
+BUILDLINK_TRANSFORM+=  rm:-lcrmf
+LDFLAGS+=              -lsmime3 -lnss3 -lnssutil3 -lssl3
+CONFIGURE_ENV+=                MOZ_SYSTEM_NSS=1
+
 # Note: when updating remember to conditionalise about-background.png in PLIST
 CONFIGURE_ARGS+=       --enable-application=browser
 

Index: pkgsrc/www/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.39 pkgsrc/www/firefox52/distinfo:1.40
--- pkgsrc/www/firefox52/distinfo:1.39  Sun Sep 20 17:21:58 2026
+++ pkgsrc/www/firefox52/distinfo       Sat Sep 26 07:45:27 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2026/09/20 17:21:58 wiz Exp $
+$NetBSD: distinfo,v 1.40 2026/09/26 07:45:27 ryoon Exp $
 
 BLAKE2s (firefox-52.9.0esr.source.tar.xz) = 68da851ecfe1b03231157bf79732865d3cf81b7c10128a2e2a9e6e7be3963348
 SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
@@ -9,6 +9,7 @@ Size (icudt58b.dat.gz) = 10711741 bytes
 SHA1 (patch-aa) = 31ba818e5f507c0ebdddd178b4801ab81e1bbbe5
 SHA1 (patch-ao) = 8b7125ef3b193fca4d03386142887b2f8d5015c5
 SHA1 (patch-as) = 03cc0f37718188613285093fc80116ac7c2ea38a
+SHA1 (patch-build_autoconf_nss.m4) = 78b9b053bdcdb1b25a484aebcb0d08fe1f2b308b
 SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86
 SHA1 (patch-build_moz.configure_init.configure) = f2df0c6b92aa825a61f6a4ee1f70f5443c61858e
 SHA1 (patch-build_moz.configure_keyfiles.configure) = dd46c7c29464f374eed3f0762f4653d42032c261

Added files:

Index: pkgsrc/www/firefox52/patches/patch-build_autoconf_nss.m4
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-build_autoconf_nss.m4:1.1
--- /dev/null   Sat Sep 26 07:45:28 2026
+++ pkgsrc/www/firefox52/patches/patch-build_autoconf_nss.m4    Sat Sep 26 07:45:28 2026
@@ -0,0 +1,65 @@
+$NetBSD: patch-build_autoconf_nss.m4,v 1.1 2026/09/26 07:45:28 ryoon Exp $
+
+* Remove broken NSS version check. pkgsrc/devel/nss is new enough.
+
+--- build/autoconf/nss.m4.orig 2017-04-11 02:13:08.000000000 +0000
++++ build/autoconf/nss.m4
+@@ -34,56 +34,10 @@ AC_ARG_WITH(nss-exec-prefix,
+ 
+       unset ac_cv_path_NSS_CONFIG
+       AC_PATH_PROG(NSS_CONFIG, nss-config, no)
+-      min_nss_version=ifelse([$1], ,3.0.0,$1)
+       AC_MSG_CHECKING(for NSS - version >= $min_nss_version)
+ 
+-      no_nss=""
+-      if test "$NSS_CONFIG" = "no"; then
+-              no_nss="yes"
+-      else
+-              NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+-              NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+-
+-              nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+-                      sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'`
+-              nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+-                      sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'`
+-              nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+-                      sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'`
+-              if test -z "$nss_config_micro_version"; then
+-                      nss_config_micro_version="0"
+-              fi
+-
+-              min_nss_major_version=`echo $min_nss_version | \
+-                      sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'`
+-              min_nss_minor_version=`echo $min_nss_version | \
+-                      sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'`
+-              min_nss_micro_version=`echo $min_nss_version | \
+-                      sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'`
+-              if test -z "$min_nss_micro_version"; then
+-                      min_nss_micro_version="0"
+-              fi
+-
+-              if test "$nss_config_major_version" -lt "$min_nss_major_version"; then
+-                      no_nss="yes"
+-              elif test "$nss_config_major_version" -eq "$min_nss_major_version" &&
+-                   test "$nss_config_minor_version" -lt "$min_nss_minor_version"; then
+-                      no_nss="yes"
+-              elif test "$nss_config_major_version" -eq "$min_nss_major_version" &&
+-                   test "$nss_config_minor_version" -eq "$min_nss_minor_version" &&
+-                   test "$nss_config_micro_version" -lt "$min_nss_micro_version"; then
+-                      no_nss="yes"
+-              fi
+-      fi
+-
+-      if test -z "$no_nss"; then
+-              AC_MSG_RESULT(yes)
+-              ifelse([$2], , :, [$2])     
+-      else
+-              AC_MSG_RESULT(no)
+-              ifelse([$3], , :, [$3])
+-      fi
+-
++      NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
++      NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+ 
+       AC_SUBST_LIST(NSS_CFLAGS)
+       AC_SUBST_LIST(NSS_LIBS)