Index: science/InsightToolkit/Makefile
===================================================================
--- science/InsightToolkit/Makefile
+++ science/InsightToolkit/Makefile
@@ -13,8 +13,6 @@
 
 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 \
@@ -55,8 +53,16 @@
 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>
Index: science/InsightToolkit/files/patch-Modules_ThirdParty_VNL_src_vxl_vcl_vcl__compiler.h
===================================================================
--- science/InsightToolkit/files/patch-Modules_ThirdParty_VNL_src_vxl_vcl_vcl__compiler.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h.orig	2018-12-16 00:16:56 UTC
-+++ Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-@@ -86,6 +86,9 @@
- #  else
- #   define VCL_GCC_70
- #  endif
-+#  elif (__GNUC__==8) || (__GNUC__==9)
-+#   define VCL_GCC_7
-+#   define VCL_GCC_73
- # else
- #  error "Dunno about this gcc"
- # endif
Index: science/InsightToolkit/pkg-plist
===================================================================
--- science/InsightToolkit/pkg-plist
+++ science/InsightToolkit/pkg-plist
@@ -138,7 +138,7 @@
 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