Index: head/textproc/luceneplusplus/Makefile
===================================================================
--- head/textproc/luceneplusplus/Makefile	(revision 414440)
+++ head/textproc/luceneplusplus/Makefile	(revision 414441)
@@ -1,34 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	lucene++
 PORTVERSION=	3.0.7
 DISTVERSIONPREFIX=	rel_
 CATEGORIES=	textproc
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	C++ port of the Lucene library
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LGPL.license
 
 BROKEN_powerpc64=	Does not build
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	luceneplusplus
 GH_PROJECT=	LucenePlusPlus
 USES=		cmake:outsource compiler
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == gcc
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt
-.endif
+post-patch:
+	${REINPLACE_CMD} "/cotire/d" ${WRKSRC}/src/contrib/CMakeLists.txt \
+		${WRKSRC}/src/core/CMakeLists.txt \
+		${WRKSRC}/src/test/CMakeLists.txt
 
 post-install:
 	cd ${WRKSRC}/include &&${INSTALL_DATA} *.h \
 		${STAGEDIR}${PREFIX}/include/lucene++/
 
 .include <bsd.port.post.mk>
Index: head/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt
===================================================================
--- head/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt	(revision 414440)
+++ head/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt	(nonexistent)
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2015-01-30 17:14:22.000000000 +0100
-+++ CMakeLists.txt	2015-05-26 18:05:53.000000000 +0200
-@@ -20,6 +20,8 @@
- ####################################
- include(cotire)
- 
-+set_property(GLOBAL PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
-+
- # if setup using the Toolchain-llvm.cmake file, then use llvm...
- if(ENABLE_LLVM)
-   include(Toolchain-llvm)

Property changes on: head/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/textproc/luceneplusplus/files/patch-CMakeLists.txt
===================================================================
--- head/textproc/luceneplusplus/files/patch-CMakeLists.txt	(revision 414440)
+++ head/textproc/luceneplusplus/files/patch-CMakeLists.txt	(revision 414441)
@@ -1,11 +1,19 @@
---- CMakeLists.txt.orig	2015-02-25 13:04:40.000000000 +0100
-+++ CMakeLists.txt	2015-02-25 13:05:18.000000000 +0100
-@@ -168,7 +168,7 @@
+--- CMakeLists.txt.orig	2015-01-30 17:14:22.000000000 +0100
++++ CMakeLists.txt	2016-04-29 17:50:01.000000000 +0200
+@@ -18,7 +18,6 @@
+ ####################################
+ # pre-compiled headers support
+ ####################################
+-include(cotire)
+ 
+ # if setup using the Toolchain-llvm.cmake file, then use llvm...
+ if(ENABLE_LLVM)
+@@ -168,7 +167,7 @@
      FILES
      "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc"
      "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc"
 -    DESTINATION "${LIB_DESTINATION}/pkgconfig")
 +    DESTINATION "libdata/pkgconfig")
  endif()
  
  #################################