CVS commit: pkgsrc/devel/nspr

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Fri Apr 23 16:03:15 UTC 2021

Modified Files:
        pkgsrc/devel/nspr: Makefile distinfo
        pkgsrc/devel/nspr/patches: patch-nspr_pr_include_md___netbsd.cfg

Log Message:
nspr: Fix support for NetBSD/aarch64eb. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/devel/nspr/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/nspr/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg

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

Modified files:

Index: pkgsrc/devel/nspr/Makefile
diff -u pkgsrc/devel/nspr/Makefile:1.110 pkgsrc/devel/nspr/Makefile:1.111
--- pkgsrc/devel/nspr/Makefile:1.110    Tue Mar 30 16:29:34 2021
+++ pkgsrc/devel/nspr/Makefile  Fri Apr 23 16:03:15 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2021/03/30 16:29:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.111 2021/04/23 16:03:15 rin Exp $
 
 DISTNAME=      nspr-${NSPR_RELEASE:S/.0$//}
 NSPR_RELEASE=  4.30.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}
 

Index: pkgsrc/devel/nspr/distinfo
diff -u pkgsrc/devel/nspr/distinfo:1.60 pkgsrc/devel/nspr/distinfo:1.61
--- pkgsrc/devel/nspr/distinfo:1.60     Tue Mar 30 16:29:34 2021
+++ pkgsrc/devel/nspr/distinfo  Fri Apr 23 16:03:15 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2021/03/30 16:29:34 ryoon Exp $
+$NetBSD: distinfo,v 1.61 2021/04/23 16:03:15 rin Exp $
 
 SHA1 (nspr-4.30.tar.gz) = 58761ad70dc57f2d5600dd70684791cf36cac02b
 RMD160 (nspr-4.30.tar.gz) = 739d829e6dff607362c9bae7fa563e9ed0814553
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = a3d2cef788393b84e833d9
 SHA1 (patch-ae) = 28474b852325a37fb2a30717e9f7ffb77dad5deb
 SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24
 SHA1 (patch-ba) = 141b354b9ec0423a9c671d5eaca05cf16daac312
-SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = c7a652afc962e83cca49f451f6692bbc43644403
+SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = d859aed2b165d25bfb1f95903ee7725d1d358097
 SHA1 (patch-nspr_pr_include_md___pth.h) = ef97e3a9c2dbde85a7c36152807217f962d2b4fa
 SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 52e0e2bb1d1ddb282f92ce2df2c69684c0634dbe
 SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 1aaa1048399cc7a82a67b98ea2368033cb597ac6

Index: pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
diff -u pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg:1.1 pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg:1.2
--- pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg:1.1 Sat May 12 09:01:08 2018
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg     Fri Apr 23 16:03:15 2021
@@ -1,13 +1,22 @@
-$NetBSD: patch-nspr_pr_include_md___netbsd.cfg,v 1.1 2018/05/12 09:01:08 jmcneill Exp $
+$NetBSD: patch-nspr_pr_include_md___netbsd.cfg,v 1.2 2021/04/23 16:03:15 rin Exp $
 
---- nspr/pr/include/md/_netbsd.cfg.orig        2018-03-05 15:50:28.000000000 +0000
-+++ nspr/pr/include/md/_netbsd.cfg
-@@ -203,7 +203,7 @@
+Support NetBSD/aarch64{,eb}.
+
+--- nspr/pr/include/md/_netbsd.cfg.orig        2021-03-16 23:53:01.000000000 +0900
++++ nspr/pr/include/md/_netbsd.cfg     2021-04-24 00:52:11.369243612 +0900
+@@ -203,9 +203,14 @@
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
  
 -#elif defined(__amd64__)
 +#elif defined(__amd64__) || defined(__aarch64__)
++#ifndef __AARCH64EB__
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
++#else
++#undef  IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#endif
  #define HAVE_ALIGNED_DOUBLES
+ #define HAVE_ALIGNED_LONGLONGS
+ #define IS_64