subread: Replace MACOS with __APPLE__ in all patches

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Tue Mar 30 19:37:58 2021 -0500
Changeset:	40a5ab871602c009fcaba66184c98fe815dc209f

Modified Files:
	subread/distinfo
	subread/patches/patch-HelperFunctions.c
	subread/patches/patch-gene-algorithms.c
	subread/patches/patch-input-files.c
	subread/patches/patch-long-hashtable.c

Log Message:
subread: Replace MACOS with __APPLE__ in all patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=40a5ab871602c009fcaba66184c98fe815dc209f

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

diffstat:
 subread/distinfo                        |  8 +++----
 subread/patches/patch-HelperFunctions.c | 30 +++++++++++++++++++++----
 subread/patches/patch-gene-algorithms.c | 39 ++++++++++++++++++++++++++++++++-
 subread/patches/patch-input-files.c     |  5 +++--
 subread/patches/patch-long-hashtable.c  |  8 ++++---
 5 files changed, 76 insertions(+), 14 deletions(-)

diffs:
diff --git a/subread/distinfo b/subread/distinfo
index 396c4efbbe..982a978122 100644
--- a/subread/distinfo
+++ b/subread/distinfo
@@ -4,11 +4,11 @@ SHA1 (subread-2.0.2-source.tar.gz) = 1f5eb1ffa0184e21321fb9e40a9f02dd94bb19ff
 RMD160 (subread-2.0.2-source.tar.gz) = 2cfa127a7bea963d67330edee2ca226f9d6dde49
 SHA512 (subread-2.0.2-source.tar.gz) = 549164aadcd1e05cd1f941a4c10d6e19f904d2d75dae8391bbf3003a26e13f6a14cc22618662c2baf804b4d020a58e7ba0b0be9b4ff1181ad981a24270ffb64e
 Size (subread-2.0.2-source.tar.gz) = 23295764 bytes
-SHA1 (patch-HelperFunctions.c) = e46a1020b9106c79f5dcabb4594c75b7479e2dff
+SHA1 (patch-HelperFunctions.c) = 88242fbc972f69b4dbdae10c6262f6f196c27784
 SHA1 (patch-core-junction.c) = 481cd069aa42d673bbc10c80bb9548547e808b0c
-SHA1 (patch-gene-algorithms.c) = 19d3c0ad564175b413ebbeb513bd6332c9409daf
-SHA1 (patch-input-files.c) = 49a695b02d3fe37c66001cb728a282f588f795ab
-SHA1 (patch-long-hashtable.c) = 3180660daf6ed94a785f47972c117370ce310ef5
+SHA1 (patch-gene-algorithms.c) = 66440339de135b83089b2238c3f2ec8f68fe215b
+SHA1 (patch-input-files.c) = 878e9adea01bcab8fd19472819dcbd0c61c2994e
+SHA1 (patch-long-hashtable.c) = 4d0d1a04e4306517151a5081aca507a822db4f8a
 SHA1 (patch-longread-one_LRMsorted-hashtable.c) = f08066fab9cb83da77a289b269395693ab80393a
 SHA1 (patch-longread-one_Makefile) = 48e06a0d3987aa47aefa17fcfdb395f647bc4141
 SHA1 (patch-longread-one_longread-mapping.c) = c82876cdb1186eba2afd9b684a58c8013d0143bb
diff --git a/subread/patches/patch-HelperFunctions.c b/subread/patches/patch-HelperFunctions.c
index 9d269bdb53..69554099f7 100644
--- a/subread/patches/patch-HelperFunctions.c
+++ b/subread/patches/patch-HelperFunctions.c
@@ -2,9 +2,18 @@ $NetBSD$
 
 # Use predefined macros
 
---- HelperFunctions.c.orig	2020-06-04 23:58:40 UTC
+--- HelperFunctions.c.orig	2021-03-31 00:32:33.690802862 +0000
 +++ HelperFunctions.c
-@@ -845,7 +845,7 @@ int strcmp_number(char * s1, char * s2)
+@@ -26,7 +26,7 @@
+ #include <pthread.h>
+ 
+ 
+-#ifdef MACOS
++#ifdef __APPLE__
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -846,10 +846,10 @@ int strcmp_number(char * s1, char * s2)
  
  int mac_str(char * str_buff)
  {
@@ -12,8 +21,12 @@ $NetBSD$
 +#if defined(__FreeBSD__) || defined(__MINGW32__)
  	return 1;
  #else
- #ifdef MACOS
-@@ -2703,7 +2703,7 @@ void main(){
+-#ifdef MACOS
++#ifdef __APPLE__
+     int         mib[6], x1, ret = 1;
+ 	size_t		len;
+     char            *buf;
+@@ -2705,7 +2705,7 @@ void main(){
  
  int get_free_total_mem(size_t * total, size_t * free_mem){
  
@@ -22,3 +35,12 @@ $NetBSD$
      return -1;
  #endif
  
+@@ -2717,7 +2717,7 @@ int get_free_total_mem(size_t * total, s
+ 	(*free_mem) = statex.ullAvailPhys;
+ 	return 0;
+ #else
+-#ifdef MACOS
++#ifdef __APPLE__
+     mach_msg_type_number_t count = HOST_VM_INFO_COUNT;
+     vm_statistics_data_t vmstat;
+     int page_size = getpagesize();
diff --git a/subread/patches/patch-gene-algorithms.c b/subread/patches/patch-gene-algorithms.c
index 9b6ab3427c..02e96f37a6 100644
--- a/subread/patches/patch-gene-algorithms.c
+++ b/subread/patches/patch-gene-algorithms.c
@@ -3,6 +3,7 @@ $NetBSD$
 # Use prefefined macros
 
 --- gene-algorithms.c.orig	2021-03-30 13:51:05 UTC
+--- gene-algorithms.c.orig	2021-03-27 07:38:08.000000000 +0000
 +++ gene-algorithms.c
 @@ -29,7 +29,7 @@
  #include <sys/stat.h>
@@ -13,7 +14,43 @@ $NetBSD$
  #include <sys/timeb.h>
  #endif
  
-@@ -1568,7 +1568,7 @@ int load_offsets(gene_offset_t* offsets , const char i
+@@ -45,7 +45,7 @@ void non_func(const char * fmt, ...)
+ 
+ void subread_lock_release(subread_lock_t * lock)
+ {
+-	#ifdef MACOS
++	#ifdef __APPLE__
+ 	pthread_mutex_unlock(lock);
+ 	#else
+ 	pthread_spin_unlock(lock);
+@@ -54,7 +54,7 @@ void subread_lock_release(subread_lock_t
+ void subread_lock_occupy(subread_lock_t * lock)
+ {
+ 
+-	#ifdef MACOS
++	#ifdef __APPLE__
+ 	pthread_mutex_lock(lock);
+ 	#else
+ 	pthread_spin_lock(lock);
+@@ -62,7 +62,7 @@ void subread_lock_occupy(subread_lock_t 
+ }
+ 
+ void subread_destroy_lock(subread_lock_t * lock) {
+-	#ifdef MACOS
++	#ifdef __APPLE__
+ 	pthread_mutex_destroy(lock);
+ 	#else
+ 	pthread_spin_destroy(lock);
+@@ -71,7 +71,7 @@ void subread_destroy_lock(subread_lock_t
+ 
+ void subread_init_lock(subread_lock_t * lock)
+ {
+-	#ifdef MACOS
++	#ifdef __APPLE__
+ 	pthread_mutex_init(lock, NULL);
+ 	#else
+ 	pthread_spin_init(lock, PTHREAD_PROCESS_PRIVATE);
+@@ -1568,7 +1568,7 @@ int load_offsets(gene_offset_t* offsets 
  
  double miltime(){
  	double ret;
diff --git a/subread/patches/patch-input-files.c b/subread/patches/patch-input-files.c
index 21d0b7ec66..ce35de2eff 100644
--- a/subread/patches/patch-input-files.c
+++ b/subread/patches/patch-input-files.c
@@ -3,13 +3,14 @@ $NetBSD$
 # Use predefined macros
 
 --- input-files.c.orig	2020-06-05 00:33:03 UTC
+--- input-files.c.orig	2021-03-27 07:38:08.000000000 +0000
 +++ input-files.c
-@@ -48,7 +48,7 @@ FILE * f_subr_open(const char * fname, const char * mo
+@@ -48,7 +48,7 @@ FILE * f_subr_open(const char * fname, c
  #ifdef __MINGW32__
  		return fopen64(fname, mode);
  #else
 -#if defined(__LP64__) || defined(_LP64) || defined(MACOS) 
-+#if defined(__LP64__) || defined(_LP64) || defined(MACOS) || defined(__FreeBSD__)
++#if defined(__LP64__) || defined(_LP64) || defined(__APPLE__) || defined(__FreeBSD__)
  		return fopen(fname, mode);
  #else
  		return fopen64(fname, mode);
diff --git a/subread/patches/patch-long-hashtable.c b/subread/patches/patch-long-hashtable.c
index 957b778b72..8edf9fa456 100644
--- a/subread/patches/patch-long-hashtable.c
+++ b/subread/patches/patch-long-hashtable.c
@@ -2,13 +2,15 @@ $NetBSD$
 
 # Use predefined macros
 
---- long-hashtable.c.orig	2020-06-04 23:59:33 UTC
+--- long-hashtable.c.orig	2021-03-31 00:35:27.202818216 +0000
 +++ long-hashtable.c
-@@ -22,7 +22,7 @@
+@@ -21,8 +21,8 @@
+ #include <stdlib.h>
  #include <string.h>
  
- #ifndef MACOS
+-#ifndef MACOS
 -#ifndef FREEBSD
++#ifndef __APPLE__
 +#ifndef __FreeBSD__
  #include <malloc.h>
  #endif