8 files changed, 60 insertions, 89 deletions

diff --git a/devel/stxxl/Makefile b/devel/stxxl/Makefile
index ada17b9ea8d5..813a91d6726a 100644
--- a/devel/stxxl/Makefile
+++ b/devel/stxxl/Makefile
@@ -2,46 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	stxxl
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4.1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Standard Template Library for Extra Large Data Sets
 
-USES=		gmake
-ALL_TARGET=	library_g++
+LICENSE=	BSL
+LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
-MAKE_ENV+=	COMPILER_GCC="${CXX}" OPT="${CXXFLAGS}" \
-		PTHREAD_FLAG="-lpthread"
+USES=		cmake:outsource
+CMAKE_ARGS=	-DINSTALL_PKGCONFIG_DIR:STRING="libdata/pkgconfig" \
+		-DUSE_GNU_PARALLEL:BOOL=OFF # may be enabled for future versions of clang with openmp support
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT=OPTIMIZED_CFLAGS
+OPTIONS_DEFINE=	DOCS
 
-OPTIMIZED_CFLAGS_CXXFLAGS=	-O3
-
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${OSVERSION} >= 1000000
-	@${REINPLACE_CMD} -i '' -e 's|std::tr1::|std::|' \
-		${WRKSRC}/include/stxxl/bits/compat/type_traits.h \
-		${WRKSRC}/include/stxxl/bits/compat/shared_ptr.h \
-		${WRKSRC}/include/stxxl/bits/compat_hash_map.h
-.endif
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
-	cd ${WRKSRC}/include && ${COPYTREE_SHARE} "${PORTNAME} ${PORTNAME}.h" \
-		${STAGEDIR}${PREFIX}/include
-	${RM} -f ${STAGEDIR}${PREFIX}/include/stxxl/bits/mng/config.h.orig
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-
-regression-test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tests_g++
-	cd ${WRKSRC}/misc && ${SH} run-all-tests
+post-install:
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS CHANGELOG README TODO" \
+		${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/devel/stxxl/distinfo b/devel/stxxl/distinfo
index 122cedae0e3c..25a0ee99f814 100644
--- a/devel/stxxl/distinfo
+++ b/devel/stxxl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stxxl-1.3.1.tar.gz) = e852c925cdce9a7b0fc6bbc76923dbabe7d103a39b03b7d7350eafa48cc801ae
-SIZE (stxxl-1.3.1.tar.gz) = 922088
+SHA256 (stxxl-1.4.1.tar.gz) = 92789d60cd6eca5c37536235eefae06ad3714781ab5e7eec7794b1c10ace67ac
+SIZE (stxxl-1.4.1.tar.gz) = 1394997
diff --git a/devel/stxxl/files/patch-include-stxxl-bits-mng-config.h b/devel/stxxl/files/patch-include-stxxl-bits-mng-config.h
deleted file mode 100644
index 01e7c477e175..000000000000
--- a/devel/stxxl/files/patch-include-stxxl-bits-mng-config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/stxxl/bits/mng/config.h.orig	2011-03-08 18:03:38.000000000 +0300
-+++ include/stxxl/bits/mng/config.h	2013-09-24 00:15:43.592520759 +0400
-@@ -21,6 +21,8 @@
- #include <stxxl/bits/singleton.h>
- #include <stxxl/bits/verbose.h>
- 
-+#include <unistd.h>
-+
- 
- __STXXL_BEGIN_NAMESPACE
- 
diff --git a/devel/stxxl/files/patch-misc-run-all-tests b/devel/stxxl/files/patch-misc-run-all-tests
deleted file mode 100644
index 0f864cfaded6..000000000000
--- a/devel/stxxl/files/patch-misc-run-all-tests
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/run-all-tests.orig	2011-03-10 15:20:33.000000000 +0300
-+++ misc/run-all-tests	2013-09-24 00:30:50.829520907 +0400
-@@ -17,7 +17,6 @@
- 
- 
- ulimit -t 7200
--set -o pipefail
- 
- stxxl=stxxl
- test -n "$1" && stxxl="$1"
diff --git a/devel/stxxl/files/patch-utils-malloc.cpp b/devel/stxxl/files/patch-utils-malloc.cpp
deleted file mode 100644
index 68584e5e5898..000000000000
--- a/devel/stxxl/files/patch-utils-malloc.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/malloc.cpp.orig	2011-02-24 15:12:15.000000000 +0300
-+++ utils/malloc.cpp	2013-09-24 00:18:58.433519194 +0400
-@@ -18,6 +18,7 @@
- #include <cstdlib>
- #include <stxxl/bits/verbose.h>
- 
-+#include <unistd.h>
- 
- void print_malloc_stats()
- {
diff --git a/devel/stxxl/files/patch-utils-mlock.cpp b/devel/stxxl/files/patch-utils-mlock.cpp
deleted file mode 100644
index 1288a49d9f51..000000000000
--- a/devel/stxxl/files/patch-utils-mlock.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/mlock.cpp.orig	2010-08-31 16:22:17.000000000 +0400
-+++ utils/mlock.cpp	2013-09-23 21:47:56.854519111 +0400
-@@ -17,6 +17,7 @@
- #include <cstring>
- #include <iostream>
- #include <sys/mman.h>
-+#include <unistd.h>
- 
- int main(int argc, char ** argv)
- {
diff --git a/devel/stxxl/pkg-descr b/devel/stxxl/pkg-descr
index 004e351ea508..77f4575e8ede 100644
--- a/devel/stxxl/pkg-descr
+++ b/devel/stxxl/pkg-descr
@@ -1,10 +1,8 @@
-STXXL: Standard Template Library for Extra Large Data Sets.
-
-The core of STXXL is an implementation of the C++ standard template
-library STL for external memory (out-of-core) computations, i. e.,
-STXXL implements containers and algorithms that can process huge
-volumes of data that only fit on disks. While the closeness to the
-STL supports ease of use and compatibility with existing applications,
-another design priority is high performance.
+STXXL is an implementation of the C++ standard template library STL
+for external memory (out-of-core) computations, i. e. STXXL implements
+containers and algorithms that can process huge volumes of data
+that only fit on disks.  While the closeness to the STL supports
+ease of use and compatibility with existing applications, another
+design priority is high performance.
 
 WWW: http://stxxl.sourceforge.net/
diff --git a/devel/stxxl/pkg-plist b/devel/stxxl/pkg-plist
index 275c41b8a43c..f26fad8b521d 100644
--- a/devel/stxxl/pkg-plist
+++ b/devel/stxxl/pkg-plist
@@ -1,3 +1,4 @@
+bin/stxxl_tool
 include/stxxl.h
 include/stxxl/algorithm
 include/stxxl/aligned_alloc
@@ -15,30 +16,38 @@ include/stxxl/bits/algo/sort.h
 include/stxxl/bits/algo/sort_base.h
 include/stxxl/bits/algo/sort_helper.h
 include/stxxl/bits/algo/stable_ksort.h
+include/stxxl/bits/common/addressable_queues.h
 include/stxxl/bits/common/aligned_alloc.h
+include/stxxl/bits/common/binary_buffer.h
+include/stxxl/bits/common/cmdline.h
+include/stxxl/bits/common/condition_variable.h
+include/stxxl/bits/common/counting_ptr.h
 include/stxxl/bits/common/error_handling.h
 include/stxxl/bits/common/exceptions.h
 include/stxxl/bits/common/exithandler.h
+include/stxxl/bits/common/external_shared_ptr.h
 include/stxxl/bits/common/is_sorted.h
 include/stxxl/bits/common/log.h
 include/stxxl/bits/common/mutex.h
 include/stxxl/bits/common/new_alloc.h
+include/stxxl/bits/common/onoff_switch.h
 include/stxxl/bits/common/rand.h
 include/stxxl/bits/common/seed.h
 include/stxxl/bits/common/semaphore.h
 include/stxxl/bits/common/settings.h
 include/stxxl/bits/common/simple_vector.h
 include/stxxl/bits/common/state.h
-include/stxxl/bits/common/switch.h
 include/stxxl/bits/common/timer.h
 include/stxxl/bits/common/tmeta.h
 include/stxxl/bits/common/tuple.h
 include/stxxl/bits/common/types.h
+include/stxxl/bits/common/uint_types.h
 include/stxxl/bits/common/utils.h
-include/stxxl/bits/compat/shared_ptr.h
+include/stxxl/bits/compat/hash_map.h
 include/stxxl/bits/compat/type_traits.h
-include/stxxl/bits/compat_hash_map.h
-include/stxxl/bits/compat_unique_ptr.h
+include/stxxl/bits/compat/unique_ptr.h
+include/stxxl/bits/config.h
+include/stxxl/bits/config.h.in
 include/stxxl/bits/containers/btree/btree.h
 include/stxxl/bits/containers/btree/iterator.h
 include/stxxl/bits/containers/btree/iterator_map.h
@@ -47,7 +56,16 @@ include/stxxl/bits/containers/btree/node.h
 include/stxxl/bits/containers/btree/node_cache.h
 include/stxxl/bits/containers/btree/root_node.h
 include/stxxl/bits/containers/deque.h
+include/stxxl/bits/containers/hash_map/block_cache.h
+include/stxxl/bits/containers/hash_map/hash_map.h
+include/stxxl/bits/containers/hash_map/iterator.h
+include/stxxl/bits/containers/hash_map/iterator_map.h
+include/stxxl/bits/containers/hash_map/tuning.h
+include/stxxl/bits/containers/hash_map/util.h
 include/stxxl/bits/containers/map.h
+include/stxxl/bits/containers/matrix.h
+include/stxxl/bits/containers/matrix_arithmetic.h
+include/stxxl/bits/containers/matrix_low_level.h
 include/stxxl/bits/containers/pager.h
 include/stxxl/bits/containers/pq_ext_merger.h
 include/stxxl/bits/containers/pq_helpers.h
@@ -55,7 +73,10 @@ include/stxxl/bits/containers/pq_losertree.h
 include/stxxl/bits/containers/pq_mergers.h
 include/stxxl/bits/containers/priority_queue.h
 include/stxxl/bits/containers/queue.h
+include/stxxl/bits/containers/sequence.h
+include/stxxl/bits/containers/sorter.h
 include/stxxl/bits/containers/stack.h
+include/stxxl/bits/containers/unordered_map.h
 include/stxxl/bits/containers/vector.h
 include/stxxl/bits/defines.h
 include/stxxl/bits/deprecated.h
@@ -67,14 +88,15 @@ include/stxxl/bits/io/disk_queues.h
 include/stxxl/bits/io/file.h
 include/stxxl/bits/io/fileperblock_file.h
 include/stxxl/bits/io/io.h
-include/stxxl/bits/io/iobase.h
 include/stxxl/bits/io/iostats.h
+include/stxxl/bits/io/linuxaio_file.h
+include/stxxl/bits/io/linuxaio_queue.h
+include/stxxl/bits/io/linuxaio_request.h
 include/stxxl/bits/io/mem_file.h
 include/stxxl/bits/io/mmap_file.h
 include/stxxl/bits/io/request.h
 include/stxxl/bits/io/request_interface.h
 include/stxxl/bits/io/request_operations.h
-include/stxxl/bits/io/request_ptr.h
 include/stxxl/bits/io/request_queue.h
 include/stxxl/bits/io/request_queue_impl_1q.h
 include/stxxl/bits/io/request_queue_impl_qwqr.h
@@ -93,13 +115,15 @@ include/stxxl/bits/mng/adaptor.h
 include/stxxl/bits/mng/bid.h
 include/stxxl/bits/mng/block_alloc.h
 include/stxxl/bits/mng/block_alloc_interleaved.h
+include/stxxl/bits/mng/block_manager.h
 include/stxxl/bits/mng/block_prefetcher.h
+include/stxxl/bits/mng/block_scheduler.h
 include/stxxl/bits/mng/buf_istream.h
+include/stxxl/bits/mng/buf_istream_reverse.h
 include/stxxl/bits/mng/buf_ostream.h
 include/stxxl/bits/mng/buf_writer.h
 include/stxxl/bits/mng/config.h
-include/stxxl/bits/mng/diskallocator.h
-include/stxxl/bits/mng/mng.h
+include/stxxl/bits/mng/disk_allocator.h
 include/stxxl/bits/mng/prefetch_pool.h
 include/stxxl/bits/mng/read_write_pool.h
 include/stxxl/bits/mng/typed_block.h
@@ -118,6 +142,7 @@ include/stxxl/bits/unused.h
 include/stxxl/bits/utils/malloc.h
 include/stxxl/bits/verbose.h
 include/stxxl/bits/version.h
+include/stxxl/cmdline
 include/stxxl/deque
 include/stxxl/io
 include/stxxl/ksort
@@ -130,12 +155,21 @@ include/stxxl/random
 include/stxxl/random_shuffle
 include/stxxl/request
 include/stxxl/scan
+include/stxxl/sequence
 include/stxxl/sort
+include/stxxl/sorter
 include/stxxl/stable_ksort
 include/stxxl/stack
 include/stxxl/stats
 include/stxxl/stream
 include/stxxl/timer
 include/stxxl/types
+include/stxxl/unordered_map
 include/stxxl/vector
+include/stxxl/version.h
+lib/cmake/stxxl/stxxl-config.cmake
+lib/cmake/stxxl/stxxl-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/stxxl/stxxl-targets.cmake
+lib/cmake/stxxl/stxxl-version.cmake
 lib/libstxxl.a
+libdata/pkgconfig/stxxl.pc