canu: Upstream Makefile hacks for building on Darwin

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri May 19 09:48:37 2023 -0500
Changeset:	95303744b3ecb4d76fa51013190be69b00220dce

Modified Files:
	canu/Makefile
	canu/distinfo
	canu/patches/patch-Makefile

Log Message:
canu: Upstream Makefile hacks for building on Darwin

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

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

diffstat:
 canu/Makefile               | 11 -----------
 canu/distinfo               |  2 +-
 canu/patches/patch-Makefile | 12 ++++++++----
 3 files changed, 9 insertions(+), 16 deletions(-)

diffs:
diff --git a/canu/Makefile b/canu/Makefile
index d766493d9c..de60311462 100644
--- a/canu/Makefile
+++ b/canu/Makefile
@@ -13,17 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	gnuplot>0:../../graphics/gnuplot
 
-# Makefile compiles directly into ${DESTDIR}${PREFIX}
-SUBST_CLASSES+=		optimize
-SUBST_STAGE.optimize=	pre-configure
-SUBST_SED.optimize+=	-e 's|-g3||g'
-SUBST_SED.optimize+=	-e 's|-O3||g'
-SUBST_SED.optimize+=	-e 's|-O4||g'
-SUBST_SED.optimize+=	-e 's|-funroll-loops||g'
-SUBST_SED.optimize+=	-e 's|-fexpensive-optimizations||g'
-SUBST_SED.optimize+=	-e 's|-finline-functions||g'
-SUBST_FILES.optimize+=	Makefile
-
 SUBST_CLASSES+=		perl
 SUBST_STAGE.perl=	pre-configure
 SUBST_SED.perl+=	-e 's|$$FindBin::RealBin/../lib/site_perl|${PREFIX}/${SITE_PERL_REL}|g'
diff --git a/canu/distinfo b/canu/distinfo
index 8897dd33f9..231b1b15f8 100644
--- a/canu/distinfo
+++ b/canu/distinfo
@@ -3,7 +3,7 @@ $NetBSD$
 BLAKE2s (canu-2.2.tar.xz) = 5b585a2e0a31c2181817798b5f267dd4cf43c3ffeba4b0a04ffc8021a4603aed
 SHA512 (canu-2.2.tar.xz) = af08874a319dd5fd6bbe666c8a5d0a43b7c0caaaca3a3cbf4d3fe022d6d6b8c14cd967c2e26f4fbf571129be240dcb65e92fe61fad1e51d554f15254d0b6ce8f
 Size (canu-2.2.tar.xz) = 2400192 bytes
-SHA1 (patch-Makefile) = 8a42be006f16fe20289fa80a68f1abdf61bea1b0
+SHA1 (patch-Makefile) = 54a3a216948fea81cfeb6ce91458126adc2ad8da
 SHA1 (patch-pipelines_canu_Defaults.pm) = 5ecea8ebac667499916b0243f34dc25838992444
 SHA1 (patch-pipelines_canu_Execution.pm) = 75c019a93f5b6a4491191b4f32931ac0b8435421
 SHA1 (patch-utgcns_libboost_boost_smart__ptr_detail_shared__count.hpp) = fd219645141ebe9d6f23153a2a2b0f56abc103af
diff --git a/canu/patches/patch-Makefile b/canu/patches/patch-Makefile
index e278fad2dd..f19e4528d1 100644
--- a/canu/patches/patch-Makefile
+++ b/canu/patches/patch-Makefile
@@ -1,6 +1,6 @@
 $NetBSD$
 
-# Disable Darwin clang block since pkgsrc provides a workaround
+# Portability
 
 --- Makefile.orig	2021-08-04 00:21:51.000000000 +0000
 +++ Makefile
@@ -19,7 +19,7 @@ $NetBSD$
    endif
  
    ifeq ($(BUILDJEMALLOC), 1)
-@@ -497,25 +497,6 @@ endef
+@@ -497,27 +497,8 @@ endef
  ifeq (${OSTYPE}, Darwin)
    $(foreach suffix,mp-9 9  mp-8 8  mp-7 7,$(eval $(call TEST_COMPILER,${suffix})))
  
@@ -42,9 +42,13 @@ $NetBSD$
 -     $(error unsupported compiler)
 -  endif
 -
-   CXXFLAGS += -fopenmp -pthread -fPIC -m64 -Wno-format
-   LDFLAGS  += -fopenmp -pthread -lm
+-  CXXFLAGS += -fopenmp -pthread -fPIC -m64 -Wno-format
+-  LDFLAGS  += -fopenmp -pthread -lm
++  CXXFLAGS += -std=c++11 -Xpreprocessor -fopenmp -pthread -fPIC -m64 -Wno-format
++  LDFLAGS  += -L${PREFIX}/lib -lomp -pthread -lm
  endif
+ 
+ 
 @@ -559,11 +540,45 @@ else
    #LDFLAGS   += -lprofiler