Update to 3.0.7

4 files changed, 16 insertions, 99 deletions

diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile
index 1d6b3f91e79d..f33dd8ef3ed3 100644
--- a/textproc/luceneplusplus/Makefile
+++ b/textproc/luceneplusplus/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	lucene++
-PORTVERSION=	3.0.6
-PORTREVISION=	1
+PORTVERSION=	3.0.7
 CATEGORIES=	textproc
 
 MAINTAINER=	arved@FreeBSD.org
@@ -16,9 +15,9 @@ LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
 USE_GITHUB=	yes
 GH_ACCOUNT=	luceneplusplus
 GH_PROJECT=	LucenePlusPlus
-GH_TAGNAME=	rel_3.0.6
-GH_COMMIT=	c9c09bc
-USES=		cmake
+GH_TAGNAME=	rel_3.0.7
+GH_COMMIT=	4d28f9f
+USES=		cmake:outsource
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/luceneplusplus/distinfo b/textproc/luceneplusplus/distinfo
index 1ac40155d3e9..b9bc0d298710 100644
--- a/textproc/luceneplusplus/distinfo
+++ b/textproc/luceneplusplus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lucene++-3.0.6.tar.gz) = 8e0b574901ef98ef7a15b3799e818dc2ad32af4c13cb0307a4f36b2c04dac3eb
-SIZE (lucene++-3.0.6.tar.gz) = 1529259
+SHA256 (lucene++-3.0.7.tar.gz) = 48ff3b7c2a3dff5941144f04cb011b95dbcf164302139c38e05b087f321ea908
+SIZE (lucene++-3.0.7.tar.gz) = 2013982
diff --git a/textproc/luceneplusplus/files/patch-CMakeLists.txt b/textproc/luceneplusplus/files/patch-CMakeLists.txt
index d91bbd96aa3e..ff82cbb84f6e 100644
--- a/textproc/luceneplusplus/files/patch-CMakeLists.txt
+++ b/textproc/luceneplusplus/files/patch-CMakeLists.txt
@@ -1,33 +1,11 @@
---- CMakeLists.txt.orig	2014-04-19 20:26:40.000000000 +0200
-+++ CMakeLists.txt	2014-12-03 14:38:24.000000000 +0100
-@@ -49,7 +49,6 @@
- # bootstrap
- ####################################
- 
--find_package(Subversion REQUIRED)
- find_package(Threads REQUIRED)
- find_package(Boost COMPONENTS
-   date_time
-@@ -113,13 +112,10 @@
-   ${CMAKE_CURRENT_BINARY_DIR}/include
- )
- 
--include(CMakeExternal.txt)
- enable_testing()
- 
- add_subdirectory(src/core)
- add_subdirectory(src/contrib)
--add_subdirectory(src/demo)
--add_subdirectory(src/test)
- 
- #################################
- # install pkg-config file
-@@ -135,7 +131,7 @@
+--- 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 @@
      FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc
-     ${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc
--    DESTINATION ${LIB_DESTINATION}/pkgconfig)
-+    DESTINATION libdata/pkgconfig)
+     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc"
+     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc"
+-    DESTINATION "${LIB_DESTINATION}/pkgconfig")
++    DESTINATION "libdata/pkgconfig")
  endif()
  
- ####################################
+ #################################
diff --git a/textproc/luceneplusplus/pkg-plist b/textproc/luceneplusplus/pkg-plist
index db7e04d07301..0669cd026550 100644
--- a/textproc/luceneplusplus/pkg-plist
+++ b/textproc/luceneplusplus/pkg-plist
@@ -216,7 +216,6 @@ include/lucene++/LuceneContrib.h
 include/lucene++/LuceneException.h
 include/lucene++/LuceneFactory.h
 include/lucene++/LuceneHeaders.h
-include/lucene++/LuceneInc.h
 include/lucene++/LuceneObject.h
 include/lucene++/LuceneSignal.h
 include/lucene++/LuceneSync.h
@@ -452,71 +451,12 @@ include/lucene++/WhitespaceTokenizer.h
 include/lucene++/WildcardQuery.h
 include/lucene++/WildcardTermEnum.h
 include/lucene++/WordlistLoader.h
-include/lucene++/_BooleanQuery.h
-include/lucene++/_ByteFieldSource.h
-include/lucene++/_CachingSpanFilter.h
-include/lucene++/_CachingWrapperFilter.h
-include/lucene++/_CheckIndex.h
-include/lucene++/_ConcurrentMergeScheduler.h
-include/lucene++/_ConstantScoreQuery.h
-include/lucene++/_CustomScoreQuery.h
-include/lucene++/_DirectoryReader.h
-include/lucene++/_DisjunctionMaxQuery.h
-include/lucene++/_DocIdBitSet.h
-include/lucene++/_DocIdSet.h
-include/lucene++/_FieldCache.h
-include/lucene++/_FieldCacheRangeFilter.h
-include/lucene++/_FieldCacheSanityChecker.h
-include/lucene++/_FieldCacheTermsFilter.h
-include/lucene++/_FieldValueHitQueue.h
-include/lucene++/_FilterManager.h
-include/lucene++/_FilteredDocIdSet.h
-include/lucene++/_FilteredQuery.h
-include/lucene++/_FuzzyQuery.h
-include/lucene++/_IndexReader.h
-include/lucene++/_IndexWriter.h
-include/lucene++/_IntFieldSource.h
-include/lucene++/_MMapDirectory.h
-include/lucene++/_MatchAllDocsQuery.h
-include/lucene++/_MultiPhraseQuery.h
-include/lucene++/_MultiSearcher.h
-include/lucene++/_MultiTermQuery.h
-include/lucene++/_MultipleTermPositions.h
-include/lucene++/_NativeFSLockFactory.h
-include/lucene++/_NearSpansUnordered.h
-include/lucene++/_NoLockFactory.h
-include/lucene++/_NumericRangeQuery.h
-include/lucene++/_OrdFieldSource.h
-include/lucene++/_ParallelReader.h
-include/lucene++/_PayloadTermQuery.h
-include/lucene++/_PhraseQuery.h
-include/lucene++/_QueryWrapperFilter.h
-include/lucene++/_ReverseOrdFieldSource.h
-include/lucene++/_ScorerDocQueue.h
-include/lucene++/_SegmentInfos.h
-include/lucene++/_SegmentReader.h
-include/lucene++/_Similarity.h
-include/lucene++/_SimpleFSDirectory.h
-include/lucene++/_SimpleFSLockFactory.h
-include/lucene++/_SingleInstanceLockFactory.h
-include/lucene++/_SnapshotDeletionPolicy.h
-include/lucene++/_SortedVIntList.h
-include/lucene++/_SpanFirstQuery.h
-include/lucene++/_SpanNotQuery.h
-include/lucene++/_SpanOrQuery.h
-include/lucene++/_StandardAnalyzer.h
-include/lucene++/_StopAnalyzer.h
-include/lucene++/_TermQuery.h
-include/lucene++/_TimeLimitingCollector.h
-include/lucene++/_TopFieldCollector.h
-include/lucene++/_TopScoreDocCollector.h
-include/lucene++/_ValueSourceQuery.h
 include/lucene++/targetver.h
 lib/liblucene++-contrib.so
 lib/liblucene++-contrib.so.0
-lib/liblucene++-contrib.so.3.0.6
+lib/liblucene++-contrib.so.3.0.7
 lib/liblucene++.so
 lib/liblucene++.so.0
-lib/liblucene++.so.3.0.6
+lib/liblucene++.so.3.0.7
 libdata/pkgconfig/liblucene++-contrib.pc
 libdata/pkgconfig/liblucene++.pc