6 files changed, 34 insertions, 36 deletions

diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile
index 4d2a1556dd5a..fcfab8497bce 100644
--- a/devel/ispc/Makefile
+++ b/devel/ispc/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	ispc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.0
-PORTREVISION=	2
+DISTVERSION=	1.12.0-116
+DISTVERSIONSUFFIX=	-g98cd1326
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -16,16 +16,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	only available for x86 architectures
 
+BUILD_DEPENDS=	m4:devel/m4
 LIB_DEPENDS=	libLLVM.so:devel/llvm${LLVM_DEFAULT}
 
-USES=		bison cmake python:build shebangfix
+USES=		bison cmake compiler:c++14-lang python:build shebangfix
 USE_GITHUB=	yes
 SHEBANG_FILES=	*.py
 
 CONFIGURE_ENV=	PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin:${PATH}
 CMAKE_OFF=	ISPC_INCLUDE_EXAMPLES
 
-BINARY_ALIAS=	python=${PYTHON_CMD}
+BINARY_ALIAS=	python=${PYTHON_CMD} m4=${LOCALBASE}/bin/gm4
 
 PLIST_FILES=	bin/ispc \
 		bin/check_isa
@@ -44,8 +45,8 @@ run-examples:
 
 .include <bsd.port.options.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
-LLVM_DEFAULT=	80
-.endif
+#.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+#LLVM_DEFAULT=	80
+#.endif
 
 .include <bsd.port.mk>
diff --git a/devel/ispc/distinfo b/devel/ispc/distinfo
index e8ade9c2dddb..34eb17e50e85 100644
--- a/devel/ispc/distinfo
+++ b/devel/ispc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555776188
-SHA256 (ispc-ispc-v1.11.0_GH0.tar.gz) = f48ef6e8a1fe5ad4fca691583bf7419f4dce1596e7ed850ff99cc017f8711b2f
-SIZE (ispc-ispc-v1.11.0_GH0.tar.gz) = 19369955
+TIMESTAMP = 1580092092
+SHA256 (ispc-ispc-v1.12.0-116-g98cd1326_GH0.tar.gz) = 4fda17a161cac14e32667a1f5f6e1a10f504dbe6fa6e06872794d9df6996a649
+SIZE (ispc-ispc-v1.12.0-116-g98cd1326_GH0.tar.gz) = 19158442
diff --git a/devel/ispc/files/patch-src_ispc.h b/devel/ispc/files/patch-src_ispc.h
index c13f6df3de52..743d2b381125 100644
--- a/devel/ispc/files/patch-src_ispc.h
+++ b/devel/ispc/files/patch-src_ispc.h
@@ -1,11 +1,11 @@
---- src/ispc.h.orig	2019-04-20 16:38:55 UTC
+--- src/ispc.h.orig	2020-01-25 02:15:35 UTC
 +++ src/ispc.h
-@@ -48,6 +48,8 @@
- #define ISPC_IS_WINDOWS
+@@ -49,6 +49,8 @@
+ #define ISPC_HOST_IS_WINDOWS
  #elif defined(__linux__)
- #define ISPC_IS_LINUX
+ #define ISPC_HOST_IS_LINUX
 +#elif defined(__FreeBSD__)
-+#define ISPC_IS_FREEBSD
++#define ISPC_HOST_FREEBSD
  #elif defined(__APPLE__)
- #define ISPC_IS_APPLE
+ #define ISPC_HOST_IS_APPLE
  #endif
diff --git a/devel/ispc/files/patch-src_llvmutil.cpp b/devel/ispc/files/patch-src_llvmutil.cpp
index 4d6cd929cadb..53237378ba1e 100644
--- a/devel/ispc/files/patch-src_llvmutil.cpp
+++ b/devel/ispc/files/patch-src_llvmutil.cpp
@@ -1,9 +1,8 @@
 ISPC devs insist on using dump() functions which LLVM devs consider a debug functionality, and it isn't available in the LLVM packages.
 
---- src/llvmutil.cpp.orig	2019-03-02 06:20:14 UTC
---- src/llvmutil.cpp.orig	2019-04-20 16:08:37 UTC
+--- src/llvmutil.cpp.orig	2020-01-25 02:15:35 UTC
 +++ src/llvmutil.cpp
-@@ -1349,7 +1349,7 @@ static void lDumpValue(llvm::Value *v, s
+@@ -1344,7 +1344,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::
          return;
  
      fprintf(stderr, "  ");
diff --git a/devel/ispc/files/patch-src_opt.cpp b/devel/ispc/files/patch-src_opt.cpp
index 52812081bbbb..de3ecdcbd15f 100644
--- a/devel/ispc/files/patch-src_opt.cpp
+++ b/devel/ispc/files/patch-src_opt.cpp
@@ -1,9 +1,8 @@
 ISPC devs insist on using dump() functions which LLVM devs consider a debug functionality, and it isn't available in the LLVM packages.
 
---- src/opt.cpp.orig	2019-03-02 06:22:00 UTC
---- src/opt.cpp.orig	2019-04-20 16:07:05 UTC
+--- src/opt.cpp.orig	2020-01-25 02:15:35 UTC
 +++ src/opt.cpp
-@@ -175,7 +175,7 @@ static llvm::Pass *CreatePromoteLocalToP
+@@ -144,7 +144,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
                                                                         getenv("FUNC"), strlen(getenv("FUNC")))))) {    \
          fprintf(stderr, "Start of " NAME "\n");                                                                        \
          fprintf(stderr, "---------------\n");                                                                          \
@@ -12,7 +11,7 @@ ISPC devs insist on using dump() functions which LLVM devs consider a debug func
          fprintf(stderr, "---------------\n\n");                                                                        \
      } else /* eat semicolon */
  
-@@ -185,7 +185,7 @@ static llvm::Pass *CreatePromoteLocalToP
+@@ -154,7 +154,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
                                                                         getenv("FUNC"), strlen(getenv("FUNC")))))) {    \
          fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : "");                                   \
          fprintf(stderr, "---------------\n");                                                                          \
@@ -21,7 +20,7 @@ ISPC devs insist on using dump() functions which LLVM devs consider a debug func
          fprintf(stderr, "---------------\n\n");                                                                        \
      } else /* eat semicolon */
  #else
-@@ -505,7 +505,7 @@ void Optimize(llvm::Module *module, int 
+@@ -442,7 +442,7 @@ void Optimize(llvm::Module *module, int optLevel) {
  #ifndef ISPC_NO_DUMPS
      if (g->debugPrint) {
          printf("*** Code going into optimization ***\n");
@@ -30,7 +29,7 @@ ISPC devs insist on using dump() functions which LLVM devs consider a debug func
      }
  #endif
      DebugPassManager optPM;
-@@ -892,7 +892,7 @@ void Optimize(llvm::Module *module, int 
+@@ -655,7 +655,7 @@ void Optimize(llvm::Module *module, int optLevel) {
  #ifndef ISPC_NO_DUMPS
      if (g->debugPrint) {
          printf("\n*****\nFINAL OUTPUT\n*****\n");
@@ -39,7 +38,7 @@ ISPC devs insist on using dump() functions which LLVM devs consider a debug func
      }
  #endif
  }
-@@ -1944,11 +1944,11 @@ lExtractUniformsFromOffset(llvm::Value *
+@@ -1728,11 +1728,11 @@ lExtractUniformsFromOffset(llvm::Value **basePtr, llvm
                             llvm::Value *offsetScale,
                             llvm::Instruction *insertBefore) {
  #if 1
@@ -54,7 +53,7 @@ ISPC devs insist on using dump() functions which LLVM devs consider a debug func
      printf("-----\n");
  #endif
  
-@@ -4394,7 +4394,7 @@ char DebugPass::ID = 0;
+@@ -4217,7 +4217,7 @@ char DebugPass::ID = 0;
  bool DebugPass::runOnModule(llvm::Module &module) {
      fprintf(stderr, "%s", str_output);
      fflush(stderr);
diff --git a/devel/ispc/files/patch-src_util.cpp b/devel/ispc/files/patch-src_util.cpp
index d66390c655f9..c44d234ae07e 100644
--- a/devel/ispc/files/patch-src_util.cpp
+++ b/devel/ispc/files/patch-src_util.cpp
@@ -1,12 +1,11 @@
---- src/util.cpp.orig	2019-04-20 16:26:13 UTC
+--- src/util.cpp.orig	2020-01-25 02:15:35 UTC
 +++ src/util.cpp
-@@ -43,7 +43,9 @@
- #include <malloc.h> // for alloca()
- #endif
- #else
-+#if !defined(ISPC_IS_FREEBSD)
+@@ -41,6 +41,8 @@
+ #ifdef ISPC_HOST_IS_LINUX
  #include <alloca.h>
-+#endif
  #include <unistd.h>
- #endif
- #include <stdio.h>
++#elif defined(ISPC_HOST_IS_FREEBSD)
++#include <unistd.h>
+ #elif defined(ISPC_HOST_IS_WINDOWS)
+ #include <malloc.h>
+ #include <shlwapi.h>