svn commit: r513342 - head/science/InsightToolkit

[Piotr Kubaj]

Author: pkubaj
Date: Mon Sep 30 10:14:18 2019
New Revision: 513342
URL: https://svnweb.freebsd.org/changeset/ports/513342

Log:
  science/InsightToolkit: fix build with GCC-based architectures
  
  Compiling with GCC requires changes in pkg-plist.
  
  Approved by:    tcberner (mentor)
  Differential Revision:  https://reviews.freebsd.org/D21428

Modified:
  head/science/InsightToolkit/Makefile
  head/science/InsightToolkit/pkg-plist

Modified: head/science/InsightToolkit/Makefile
==============================================================================
--- head/science/InsightToolkit/Makefile	Mon Sep 30 10:08:36 2019	(r513341)
+++ head/science/InsightToolkit/Makefile	Mon Sep 30 10:14:18 2019	(r513342)
@@ -14,8 +14,6 @@ COMMENT=	Insight Toolkit
 
 LICENSE=	APACHE20
 
-BROKEN_powerpc64=	fails to package: ITK_COMPILER_INFO_Clang_CXX.h:No such file or directory
-
 BUILD_DEPENDS=	googletest>=0:devel/googletest
 LIB_DEPENDS=	libgdcmCommon.so:devel/gdcm \
 		libexpat.so:textproc/expat2 \
@@ -56,8 +54,16 @@ TESTING_DESC=	Build testing programs (very time consum
 EXAMPLES_CMAKE_ON=	-DBUILD_EXAMPLES:BOOL=ON
 TESTING_CMAKE_ON=	-DBUILD_TESTING:BOOL=ON
 
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+PLIST_SUB+=	CHOSEN_COMPILER_TYPE="GNU"
+.else
+PLIST_SUB+=	CHOSEN_COMPILER_TYPE="Clang"
+.endif
+
 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/.ExternalData/* ${WRKSRC}/.ExternalData/
 	${RM} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/science/InsightToolkit/pkg-plist
==============================================================================
--- head/science/InsightToolkit/pkg-plist	Mon Sep 30 10:08:36 2019	(r513341)
+++ head/science/InsightToolkit/pkg-plist	Mon Sep 30 10:14:18 2019	(r513342)
@@ -138,7 +138,7 @@ include/ITK-%%ITK_VER%%/blas/ztrmm.h
 include/ITK-%%ITK_VER%%/blas/ztrmv.h
 include/ITK-%%ITK_VER%%/blas/ztrsv.h
 include/ITK-%%ITK_VER%%/cached-powers.h
-include/ITK-%%ITK_VER%%/compilers/ITK_COMPILER_INFO_Clang_CXX.h
+include/ITK-%%ITK_VER%%/compilers/ITK_COMPILER_INFO_%%CHOSEN_COMPILER_TYPE%%_CXX.h
 include/ITK-%%ITK_VER%%/compilers/VXL_COMPILER_INFO_AppleClang_CXX.h
 include/ITK-%%ITK_VER%%/compilers/VXL_COMPILER_INFO_Clang_CXX.h
 include/ITK-%%ITK_VER%%/compilers/VXL_COMPILER_INFO_GNU_CXX.h