lang/halide: Update 2019_08_27-2023-g48f9a1c75 -> 2019_08_27-2654-g664dc4993

4 files changed, 36 insertions, 22 deletions

diff --git a/lang/halide/Makefile b/lang/halide/Makefile
index d7805c797bab..f03e7cf49e2b 100644
--- a/lang/halide/Makefile
+++ b/lang/halide/Makefile
@@ -2,14 +2,10 @@
 
 PORTNAME=	halide
 DISTVERSIONPREFIX=	release_
-DISTVERSION=	2019_08_27-2023
-DISTVERSIONSUFFIX=	-g48f9a1c75
-PORTREVISION=	1
+DISTVERSION=	2019_08_27-2654
+DISTVERSIONSUFFIX=	-g664dc4993
 CATEGORIES=	lang
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES=	49c7ee068327af7e1dc71cdd37afb61f3132097f.patch:-p1 # FreeBSD compatibility patches
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Halide, a language for fast and portable data-parallel computation
 
@@ -40,15 +36,7 @@ NATIVE_DESC=	Build with native optimizations (-march=native)
 post-patch-NATIVE-off:
 	@${REINPLACE_CMD} -e 's| -march=native | |' ${WRKSRC}/apps/linear_algebra/Makefile
 
-post-install: # see https://github.com/halide/Halide/issues/4952
-.for f in tools tutorial CODE_OF_CONDUCT.md README.md README_cmake.md README_rungen.md README_webassembly.md
-	@${RM} -r ${STAGEDIR}${PREFIX}/${f}
-.endfor
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake
-	@${MV} ${STAGEDIR}${PREFIX}/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${MV} ${STAGEDIR}${PREFIX}/halide_config.make ${STAGEDIR}${DATADIR}
-	@${MV} ${STAGEDIR}${PREFIX}/bin/libHalide.so ${STAGEDIR}${PREFIX}/lib
-	@${RMDIR} ${STAGEDIR}${PREFIX}/bin
+post-install:
+	${RM} -r ${STAGEDIR}${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/lang/halide/distinfo b/lang/halide/distinfo
index 3d49d8c8ca43..0a37cbf76b61 100644
--- a/lang/halide/distinfo
+++ b/lang/halide/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1590106455
-SHA256 (halide-Halide-release_2019_08_27-2023-g48f9a1c75_GH0.tar.gz) = b5f81d384dc4b5492330c2d319869e7e996eeec4f9c7eae478716d6f0ec055ef
-SIZE (halide-Halide-release_2019_08_27-2023-g48f9a1c75_GH0.tar.gz) = 30713606
+TIMESTAMP = 1599405904
+SHA256 (halide-Halide-release_2019_08_27-2654-g664dc4993_GH0.tar.gz) = d0f24dcf7d9adc80ab24b9098b65f89911943a3fca30d6f4bfcc59c608fbc78a
+SIZE (halide-Halide-release_2019_08_27-2654-g664dc4993_GH0.tar.gz) = 30730902
 SHA256 (49c7ee068327af7e1dc71cdd37afb61f3132097f.patch) = 7ea547f64f5aed0c039901968263b34067391ebe395fdf0f3026aab11efef897
 SIZE (49c7ee068327af7e1dc71cdd37afb61f3132097f.patch) = 7860
diff --git a/lang/halide/files/patch-packaging_CMakeLists.txt b/lang/halide/files/patch-packaging_CMakeLists.txt
new file mode 100644
index 000000000000..6938b5243d1f
--- /dev/null
+++ b/lang/halide/files/patch-packaging_CMakeLists.txt
@@ -0,0 +1,22 @@
+--- packaging/CMakeLists.txt.orig	2020-09-06 15:39:31 UTC
++++ packaging/CMakeLists.txt
+@@ -22,16 +22,16 @@ install(TARGETS Halide Halide_Generator Halide_RunGenM
+         EXPORT Halide_Targets
+ 
+         RUNTIME
+-        DESTINATION ${CMAKE_INSTALL_BINDIR}/${CONFIG_DIR}
++        DESTINATION ${CMAKE_INSTALL_BINDIR}
+         COMPONENT Halide_Runtime
+ 
+         LIBRARY
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CONFIG_DIR}
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         COMPONENT Halide_Runtime
+         NAMELINK_COMPONENT Halide_Development
+ 
+         ARCHIVE
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CONFIG_DIR}
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         COMPONENT Halide_Development
+ 
+         INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/lang/halide/pkg-plist b/lang/halide/pkg-plist
index ff5589b3ad90..fc7848d772ea 100644
--- a/lang/halide/pkg-plist
+++ b/lang/halide/pkg-plist
@@ -12,7 +12,11 @@ include/HalideRuntimeOpenCL.h
 include/HalideRuntimeOpenGL.h
 include/HalideRuntimeOpenGLCompute.h
 include/HalideRuntimeQurt.h
-lib/cmake/halide.cmake
-lib/cmake/halide_config.cmake
+lib/cmake/Halide/Halide-Interfaces.cmake
+lib/cmake/Halide/Halide-Targets-shared-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Halide/Halide-Targets-shared.cmake
+lib/cmake/Halide/HalideConfig.cmake
+lib/cmake/Halide/HalideConfigVersion.cmake
+lib/cmake/Halide/HalideGeneratorHelpers.cmake
+lib/cmake/Halide/HalideTargetHelpers.cmake
 lib/libHalide.so
-%%DATADIR%%/halide_config.make