pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel Remove mdds0.12, not needed after libreoffice4 r...
details: https://anonhg.NetBSD.org/pkgsrc/rev/42a8ddc5f2a3
branches: trunk
changeset: 357595:42a8ddc5f2a3
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Jan 24 07:32:30 2017 +0000
description:
Remove mdds0.12, not needed after libreoffice4 removal.
diffstat:
devel/Makefile | 3 +-
devel/mdds0.12/DESCR | 11 -
devel/mdds0.12/Makefile | 42 ----
devel/mdds0.12/PLIST | 36 ----
devel/mdds0.12/buildlink3.mk | 16 -
devel/mdds0.12/distinfo | 13 -
devel/mdds0.12/patches/patch-include_mdds_flat__segment__tree.hpp | 14 -
devel/mdds0.12/patches/patch-include_mdds_flat__segment__tree__def.inl | 15 -
devel/mdds0.12/patches/patch-include_mdds_mixed__type__matrix__def.inl | 15 -
devel/mdds0.12/patches/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl | 26 ---
devel/mdds0.12/patches/patch-include_mdds_multi__type__vector__itr.hpp | 85 ----------
devel/mdds0.12/patches/patch-include_mdds_point__quad__tree.hpp | 19 --
devel/mdds0.12/patches/patch-src_flat__segment__tree__test.cpp | 17 --
13 files changed, 1 insertions(+), 311 deletions(-)
diffs (truncated from 374 to 300 lines):
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/Makefile
--- a/devel/Makefile Tue Jan 24 07:31:43 2017 +0000
+++ b/devel/Makefile Tue Jan 24 07:32:30 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2349 2017/01/17 19:44:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.2350 2017/01/24 07:32:30 wiz Exp $
#
COMMENT= Development utilities
@@ -649,7 +649,6 @@
SUBDIR+= matio
SUBDIR+= mcpp
SUBDIR+= mdds
-SUBDIR+= mdds0.12
SUBDIR+= mdds1.2
SUBDIR+= meld
SUBDIR+= mell
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/DESCR
--- a/devel/mdds0.12/DESCR Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-Multi-Dimensional Data Structure (mdds)
-
-A collection of multi-dimensional data structure and indexing algorithm.
-
-It implements the following data structure:
-
- * flat segment tree
- * segment tree
- * rectangle set
-
-This package contains the 0.12 branch of mdds.
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/Makefile
--- a/devel/mdds0.12/Makefile Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2017/01/01 16:06:10 adam Exp $
-
-DISTNAME= mdds_0.12.1
-PKGNAME= ${DISTNAME:S/_/0.12-/}
-PKGREVISION= 2
-CATEGORIES= devel
-MASTER_SITES= http://kohei.us/files/mdds/src/
-EXTRACT_SUFX= .tar.bz2
-EXTRACT_USING= gtar
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://code.google.com/p/multidimalgorithm/
-COMMENT= Collection of multi-dimensional data structure and indexing algorithms (0.12 branch)
-LICENSE= mit
-
-USE_LANGUAGES= c++
-GNU_CONFIGURE= yes
-#NO_BUILD= yes
-INSTALLATION_DIRS= include/mdds/compat include/mdds/hash_container \
- share/pkgconfig
-PKGCONFIG_OVERRIDE+= misc/mdds.pc.in
-
-do-install:
- for i in ${WRKSRC}/include/mdds/*.hpp; do \
- ${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds; \
- done
- for i in ${WRKSRC}/include/mdds/*.inl; do \
- ${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds; \
- done
- for i in ${WRKSRC}/include/mdds/compat/*.hpp; do \
- ${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds/compat; \
- done
- for i in ${WRKSRC}/include/mdds/hash_container/*.hpp; do \
- ${INSTALL_DATA} $$i \
- ${DESTDIR}${PREFIX}/include/mdds/hash_container; \
- done
- ${INSTALL_DATA} ${WRKSRC}/misc/mdds.pc ${DESTDIR}${PREFIX}/share/pkgconfig
-
-BUILDLINK_DEPMETHOD.boost-headers?= build
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/PLIST
--- a/devel/mdds0.12/PLIST Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/02/12 13:34:45 wiz Exp $
-include/mdds/compat/unique_ptr.hpp
-include/mdds/default_deleter.hpp
-include/mdds/flat_segment_tree.hpp
-include/mdds/flat_segment_tree_def.inl
-include/mdds/flat_segment_tree_itr.hpp
-include/mdds/global.hpp
-include/mdds/hash_container/map.hpp
-include/mdds/mixed_type_matrix.hpp
-include/mdds/mixed_type_matrix_def.inl
-include/mdds/mixed_type_matrix_element.hpp
-include/mdds/mixed_type_matrix_flag_storage.hpp
-include/mdds/mixed_type_matrix_storage.hpp
-include/mdds/mixed_type_matrix_storage_filled_linear.inl
-include/mdds/mixed_type_matrix_storage_sparse.inl
-include/mdds/multi_type_matrix.hpp
-include/mdds/multi_type_matrix_def.inl
-include/mdds/multi_type_vector.hpp
-include/mdds/multi_type_vector_custom_func1.hpp
-include/mdds/multi_type_vector_custom_func2.hpp
-include/mdds/multi_type_vector_custom_func3.hpp
-include/mdds/multi_type_vector_def.inl
-include/mdds/multi_type_vector_itr.hpp
-include/mdds/multi_type_vector_macro.hpp
-include/mdds/multi_type_vector_trait.hpp
-include/mdds/multi_type_vector_types.hpp
-include/mdds/node.hpp
-include/mdds/point_quad_tree.hpp
-include/mdds/quad_node.hpp
-include/mdds/rectangle_set.hpp
-include/mdds/rectangle_set_def.inl
-include/mdds/segment_tree.hpp
-include/mdds/segment_tree_def.inl
-include/mdds/sorted_string_map.hpp
-include/mdds/sorted_string_map_def.inl
-share/pkgconfig/mdds.pc
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/buildlink3.mk
--- a/devel/mdds0.12/buildlink3.mk Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/02/12 13:34:45 wiz Exp $
-
-BUILDLINK_TREE+= mdds012
-
-.if !defined(MDDS012_BUILDLINK3_MK)
-MDDS012_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.mdds012+= mdds0.12>=0.9.0nb1
-BUILDLINK_PKGSRCDIR.mdds012?= ../../devel/mdds0.12
-# only contains header files
-BUILDLINK_DEPMETHOD.mdds012?= build
-
-.include "../../devel/boost-headers/buildlink3.mk"
-.endif # MDDS012_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -mdds012
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/distinfo
--- a/devel/mdds0.12/distinfo Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.1 2016/02/12 13:34:45 wiz Exp $
-
-SHA1 (mdds_0.12.1.tar.bz2) = e7469349f8d0c65545896fe553918f3ea93bd84d
-RMD160 (mdds_0.12.1.tar.bz2) = 351e681e04558a7cd4f8e16d8130c60c4760c7da
-SHA512 (mdds_0.12.1.tar.bz2) = 852f58e1f3c18aef78646c2bd6b34dc544fc06cba7ef6bda2a44fd5e681bf47bbf7389505061ddd81797b0bdf343e55f060397a1ccc582c73990bc74d36575a6
-Size (mdds_0.12.1.tar.bz2) = 153265 bytes
-SHA1 (patch-include_mdds_flat__segment__tree.hpp) = 3b5a0c3687ff5a5c53362fda4271d6eded2f327c
-SHA1 (patch-include_mdds_flat__segment__tree__def.inl) = 111c1c0d3e4d1bca421f962c41572a5f805d4e80
-SHA1 (patch-include_mdds_mixed__type__matrix__def.inl) = 602b7a2edfb7321404c5603265e553bf771de26c
-SHA1 (patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl) = bd5c00d8032a74fab956bc64d691f0da1bf0acf6
-SHA1 (patch-include_mdds_multi__type__vector__itr.hpp) = ac5db6ee22a6aced27346088ce3b597c91d01cc5
-SHA1 (patch-include_mdds_point__quad__tree.hpp) = 2237a712ef0b031d59846b08b087dc4e5ad5ac8e
-SHA1 (patch-src_flat__segment__tree__test.cpp) = 1b3345d1e7e97c503d757d163f47b14e2f43a707
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/patches/patch-include_mdds_flat__segment__tree.hpp
--- a/devel/mdds0.12/patches/patch-include_mdds_flat__segment__tree.hpp Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-include_mdds_flat__segment__tree.hpp,v 1.1 2016/02/12 13:34:45 wiz Exp $
-
-https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=bead58cb4042ac42dee890e2f21ab7ea81136e54
-
---- include/mdds/flat_segment_tree.hpp.orig 2015-06-11 23:53:55.000000000 +0000
-+++ include/mdds/flat_segment_tree.hpp
-@@ -32,7 +32,6 @@
- #include <sstream>
- #include <utility>
- #include <cassert>
--#include <limits>
-
- #include "mdds/node.hpp"
- #include "mdds/flat_segment_tree_itr.hpp"
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/patches/patch-include_mdds_flat__segment__tree__def.inl
--- a/devel/mdds0.12/patches/patch-include_mdds_flat__segment__tree__def.inl Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_mdds_flat__segment__tree__def.inl,v 1.1 2016/02/12 13:34:45 wiz Exp $
-
-https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=bead58cb4042ac42dee890e2f21ab7ea81136e54
-
---- include/mdds/flat_segment_tree_def.inl.orig 2015-06-11 23:53:55.000000000 +0000
-+++ include/mdds/flat_segment_tree_def.inl
-@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_se
- // We don't ever use the value of the right leaf node, but we need the
- // value to be always the same, to make it easier to check for
- // equality.
-- m_right_leaf->value_leaf.value = ::std::numeric_limits<value_type>::max();
-+ m_right_leaf->value_leaf.value = init_val;
- }
-
- template<typename _Key, typename _Value>
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/patches/patch-include_mdds_mixed__type__matrix__def.inl
--- a/devel/mdds0.12/patches/patch-include_mdds_mixed__type__matrix__def.inl Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_mdds_mixed__type__matrix__def.inl,v 1.1 2016/02/12 13:34:45 wiz Exp $
-
---- include/mdds/mixed_type_matrix_def.inl.orig 2015-06-11 23:53:55.000000000 +0000
-+++ include/mdds/mixed_type_matrix_def.inl
-@@ -220,8 +220,8 @@ void mixed_type_matrix<_String,_Flag>::a
- // assignment to self.
- return;
-
-- size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows());
-- size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols());
-+ size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows());
-+ size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols());
- for (size_t i = 0; i < row_count; ++i)
- for (size_t j = 0; j < col_count; ++j)
- mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j);
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/patches/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl
--- a/devel/mdds0.12/patches/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl,v 1.1 2016/02/12 13:34:45 wiz Exp $
-
---- include/mdds/mixed_type_matrix_storage_filled_linear.inl.orig 2015-06-11 23:53:55.000000000 +0000
-+++ include/mdds/mixed_type_matrix_storage_filled_linear.inl
-@@ -354,8 +354,8 @@ public:
- }
-
- array_type new_array(new_size, &m_init_elem);
-- size_t min_rows = ::std::min(row, m_rows);
-- size_t min_cols = ::std::min(col, m_cols);
-+ size_t min_rows = (::std::min)(row, m_rows);
-+ size_t min_cols = (::std::min)(col, m_cols);
- for (size_t i = 0; i < min_rows; ++i)
- {
- for (size_t j = 0; j < min_cols; ++j)
-@@ -614,8 +614,8 @@ public:
- }
-
- array_type new_array(new_size, element(0.0));
-- size_t min_rows = ::std::min(row, m_rows);
-- size_t min_cols = ::std::min(col, m_cols);
-+ size_t min_rows = (::std::min)(row, m_rows);
-+ size_t min_cols = (::std::min)(col, m_cols);
- for (size_t i = 0; i < min_rows; ++i)
- {
- for (size_t j = 0; j < min_cols; ++j)
diff -r 8bcd95c927ed -r 42a8ddc5f2a3 devel/mdds0.12/patches/patch-include_mdds_multi__type__vector__itr.hpp
--- a/devel/mdds0.12/patches/patch-include_mdds_multi__type__vector__itr.hpp Tue Jan 24 07:31:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-$NetBSD: patch-include_mdds_multi__type__vector__itr.hpp,v 1.1 2016/02/12 13:34:45 wiz Exp $
-
---- include/mdds/multi_type_vector_itr.hpp.orig 2015-06-11 23:53:55.000000000 +0000
-+++ include/mdds/multi_type_vector_itr.hpp
-@@ -139,14 +139,15 @@ protected:
- typedef typename parent_type::size_type size_type;
- typedef iterator_value_node<size_type, typename parent_type::element_block_type> node;
-
-- iterator_common_base() : m_cur_node(0, 0) {}
-+ iterator_common_base() : m_cur_node(0, 0), m_singular(true) {}
-
- iterator_common_base(
- const base_iterator_type& pos, const base_iterator_type& end,
- size_type start_pos, size_type block_index) :
- m_cur_node(start_pos, block_index),
- m_pos(pos),
-- m_end(end)
-+ m_end(end),
-+ m_singular(false)
- {
- if (m_pos != m_end)
- update_node();
-@@ -154,9 +155,13 @@ protected:
-
- iterator_common_base(const iterator_common_base& other) :
- m_cur_node(other.m_cur_node),
-- m_pos(other.m_pos),
-- m_end(other.m_end)
-+ m_singular(other.m_singular)
- {
-+ if (!m_singular)
-+ {
-+ m_pos = other.m_pos;
-+ m_end = other.m_end;
-+ }
- }
-
- void update_node()
-@@ -196,6 +201,7 @@ protected:
- node m_cur_node;
- base_iterator_type m_pos;
- base_iterator_type m_end;
-+ bool m_singular;
-
- public:
- bool operator== (const iterator_common_base& other) const
-@@ -218,16 +224,34 @@ public:
- iterator_common_base& operator= (const iterator_common_base& other)
- {
- m_cur_node = other.m_cur_node;
-- m_pos = other.m_pos;
-- m_end = other.m_end;
-+ m_singular = other.m_singular;
-+ if (!m_singular)
-+ {
Home |
Main Index |
Thread Index |
Old Index