svn commit: r413308 - in head: devel devel/liborcus devel/liborcus07 devel/mdds devel/mdds/files devel/mdds0 editors/libreoffice editors/libreoffice4 graphics/libetonyek01
Jung-uk Kim
jkim at FreeBSD.org
Thu Apr 14 17:48:53 UTC 2016
Author: jkim
Date: Thu Apr 14 17:48:51 2016
New Revision: 413308
URL: https://svnweb.freebsd.org/changeset/ports/413308
Log:
- Update to 1.1.0.
- Copy the previous port to devel/mdds0.
Added:
head/devel/mdds/files/patch-include_mdds_multi__type__vector__def.inl (contents, props changed)
head/devel/mdds/files/patch-include_mdds_sorted__string__map__def.inl (contents, props changed)
head/devel/mdds0/
- copied from r406869, head/devel/mdds/
Deleted:
head/devel/mdds/files/patch-include_mdds_flat__segment__tree.hpp
head/devel/mdds/files/patch-include_mdds_flat__segment__tree__def.inl
head/devel/mdds/files/patch-include_mdds_mixed__type__matrix__def.inl
head/devel/mdds/files/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl
head/devel/mdds/files/patch-include_mdds_multi__type__vector__itr.hpp
head/devel/mdds/files/patch-include_mdds_point__quad__tree.hpp
Modified:
head/devel/Makefile
head/devel/liborcus/Makefile
head/devel/liborcus07/Makefile
head/devel/mdds/Makefile
head/devel/mdds/distinfo
head/devel/mdds/pkg-plist
head/devel/mdds0/Makefile
head/editors/libreoffice/Makefile
head/editors/libreoffice4/Makefile
head/graphics/libetonyek01/Makefile
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Thu Apr 14 17:41:13 2016 (r413307)
+++ head/devel/Makefile Thu Apr 14 17:48:51 2016 (r413308)
@@ -1481,6 +1481,7 @@
SUBDIR += maven33
SUBDIR += mcpp
SUBDIR += mdds
+ SUBDIR += mdds0
SUBDIR += memcheck
SUBDIR += menhir
SUBDIR += mercator
Modified: head/devel/liborcus/Makefile
==============================================================================
--- head/devel/liborcus/Makefile Thu Apr 14 17:41:13 2016 (r413307)
+++ head/devel/liborcus/Makefile Thu Apr 14 17:48:51 2016 (r413308)
@@ -10,7 +10,7 @@ COMMENT= Standalone file import filter l
LICENSE= MIT
-BUILD_DEPENDS= ${LOCALBASE}/include/mdds/global.hpp:devel/mdds
+BUILD_DEPENDS= ${LOCALBASE}/include/mdds/global.hpp:devel/mdds0
LIB_DEPENDS= libboost_system.so:devel/boost-libs
GNU_CONFIGURE= yes
Modified: head/devel/liborcus07/Makefile
==============================================================================
--- head/devel/liborcus07/Makefile Thu Apr 14 17:41:13 2016 (r413307)
+++ head/devel/liborcus07/Makefile Thu Apr 14 17:48:51 2016 (r413308)
@@ -11,7 +11,7 @@ COMMENT= Standalone file import filter l
LICENSE= MIT
-BUILD_DEPENDS= ${LOCALBASE}/include/mdds/global.hpp:devel/mdds
+BUILD_DEPENDS= ${LOCALBASE}/include/mdds/global.hpp:devel/mdds0
LIB_DEPENDS= libboost_system.so:devel/boost-libs
BROKEN_sparc64= cannot link with boost
Modified: head/devel/mdds/Makefile
==============================================================================
--- head/devel/mdds/Makefile Thu Apr 14 17:41:13 2016 (r413307)
+++ head/devel/mdds/Makefile Thu Apr 14 17:48:51 2016 (r413308)
@@ -1,32 +1,36 @@
# $FreeBSD$
PORTNAME= mdds
-PORTVERSION= 0.12.1
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= devel
MASTER_SITES= http://kohei.us/files/mdds/src/
-DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= office at FreeBSD.org
COMMENT= Multi-dimensional data index algorithm
LICENSE= MIT
-PROJECTHOST= multidimalgorithm
-
USES= tar:bzip2
NO_ARCH= yes
NO_BUILD= yes
+API_VERSION= 1.0
+PLIST_SUB= API_VERSION=${API_VERSION}
+
do-configure:
- @${SED} -e 's|@prefix@|${PREFIX}|' \
- -e 's|@includedir@|$${prefix}/include|' \
+ @${SED} -e 's|@API_VERSION@|${API_VERSION}|' \
-e 's|@VERSION@|${PORTVERSION}|' \
- ${WRKSRC}/misc/mdds.pc.in > ${WRKSRC}/misc/mdds.pc
+ -e 's|@includedir@|$${prefix}/include|' \
+ -e 's|@prefix@|${PREFIX}|' \
+ ${WRKSRC}/misc/mdds.pc.in > \
+ ${WRKSRC}/misc/mdds-${API_VERSION}.pc
do-install:
- cd ${WRKSRC} && ${COPYTREE_SHARE} include ${STAGEDIR}${PREFIX}
- ${INSTALL_DATA} ${WRKSRC}/misc/mdds.pc \
+ ${MKDIR} ${STAGEDIR}${PREFIX}/include/mdds-${API_VERSION}/mdds
+ (cd ${WRKSRC}/include && ${COPYTREE_SHARE} . \
+ ${STAGEDIR}${PREFIX}/include/mdds-${API_VERSION} \
+ "-not -name *.orig")
+ ${INSTALL_DATA} ${WRKSRC}/misc/mdds-${API_VERSION}.pc \
${STAGEDIR}${PREFIX}/libdata/pkgconfig
.include <bsd.port.mk>
Modified: head/devel/mdds/distinfo
==============================================================================
--- head/devel/mdds/distinfo Thu Apr 14 17:41:13 2016 (r413307)
+++ head/devel/mdds/distinfo Thu Apr 14 17:48:51 2016 (r413308)
@@ -1,2 +1,2 @@
-SHA256 (mdds_0.12.1.tar.bz2) = 23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d
-SIZE (mdds_0.12.1.tar.bz2) = 153265
+SHA256 (mdds-1.1.0.tar.bz2) = 4253ab93fe8bb579321a50e247f1f800191ab99fe2d8c6c181741b8bd3fb161f
+SIZE (mdds-1.1.0.tar.bz2) = 258691
Added: head/devel/mdds/files/patch-include_mdds_multi__type__vector__def.inl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/mdds/files/patch-include_mdds_multi__type__vector__def.inl Thu Apr 14 17:48:51 2016 (r413308)
@@ -0,0 +1,10 @@
+--- include/mdds/multi_type_vector_def.inl.orig 2016-01-29 00:31:44 UTC
++++ include/mdds/multi_type_vector_def.inl
+@@ -1936,7 +1936,6 @@ multi_type_vector<_CellBlockFunc, _Event
+ else
+ {
+ // Just move the whole block over.
+- block* blk = m_blocks[block_index2];
+ dest.m_blocks[dest_block_pos] = blk;
+ if (blk->mp_data)
+ {
Added: head/devel/mdds/files/patch-include_mdds_sorted__string__map__def.inl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/mdds/files/patch-include_mdds_sorted__string__map__def.inl Thu Apr 14 17:48:51 2016 (r413308)
@@ -0,0 +1,11 @@
+--- include/mdds/sorted_string_map_def.inl.orig 2015-12-22 00:33:47 UTC
++++ include/mdds/sorted_string_map_def.inl
+@@ -65,7 +65,7 @@ sorted_string_map<_ValueT>::sorted_strin
+ m_entry_end(m_entries+m_entry_size)
+ {
+ #ifdef _GLIBCXX_DEBUG
+- assert(std::is_sorted(m_entries, m_entry_end, compare<_ValueT>));
++ assert(std::is_sorted(m_entries, m_entry_end, detail::compare<_ValueT>));
+ #endif
+ }
+
Modified: head/devel/mdds/pkg-plist
==============================================================================
--- head/devel/mdds/pkg-plist Thu Apr 14 17:41:13 2016 (r413307)
+++ head/devel/mdds/pkg-plist Thu Apr 14 17:48:51 2016 (r413308)
@@ -1,35 +1,28 @@
-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
-libdata/pkgconfig/mdds.pc
+include/mdds-%%API_VERSION%%/mdds/default_deleter.hpp
+include/mdds-%%API_VERSION%%/mdds/flat_segment_tree.hpp
+include/mdds-%%API_VERSION%%/mdds/flat_segment_tree_def.inl
+include/mdds-%%API_VERSION%%/mdds/flat_segment_tree_itr.hpp
+include/mdds-%%API_VERSION%%/mdds/global.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_matrix.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_matrix_def.inl
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector_custom_func1.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector_custom_func2.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector_custom_func3.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector_def.inl
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector_itr.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector_macro.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector_trait.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector_types.hpp
+include/mdds-%%API_VERSION%%/mdds/node.hpp
+include/mdds-%%API_VERSION%%/mdds/point_quad_tree.hpp
+include/mdds-%%API_VERSION%%/mdds/quad_node.hpp
+include/mdds-%%API_VERSION%%/mdds/rectangle_set.hpp
+include/mdds-%%API_VERSION%%/mdds/rectangle_set_def.inl
+include/mdds-%%API_VERSION%%/mdds/segment_tree.hpp
+include/mdds-%%API_VERSION%%/mdds/segment_tree_def.inl
+include/mdds-%%API_VERSION%%/mdds/sorted_string_map.hpp
+include/mdds-%%API_VERSION%%/mdds/sorted_string_map_def.inl
+include/mdds-%%API_VERSION%%/mdds/trie_map.hpp
+include/mdds-%%API_VERSION%%/mdds/trie_map_def.inl
+libdata/pkgconfig/mdds-%%API_VERSION%%.pc
Modified: head/devel/mdds0/Makefile
==============================================================================
--- head/devel/mdds/Makefile Thu Jan 21 18:45:39 2016 (r406869)
+++ head/devel/mdds0/Makefile Thu Apr 14 17:48:51 2016 (r413308)
@@ -2,9 +2,9 @@
PORTNAME= mdds
PORTVERSION= 0.12.1
-PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://kohei.us/files/mdds/src/
+PKGNAMESUFFIX= 0
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= office at FreeBSD.org
@@ -12,8 +12,6 @@ COMMENT= Multi-dimensional data index al
LICENSE= MIT
-PROJECTHOST= multidimalgorithm
-
USES= tar:bzip2
NO_ARCH= yes
NO_BUILD= yes
Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile Thu Apr 14 17:41:13 2016 (r413307)
+++ head/editors/libreoffice/Makefile Thu Apr 14 17:48:51 2016 (r413308)
@@ -19,7 +19,7 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archive
cppunit-config:devel/cppunit \
dmake:devel/dmake \
${LOCALBASE}/bin/gperf:devel/gperf \
- mdds>=0.9.0:devel/mdds \
+ ${LOCALBASE}/include/mdds/global.hpp:devel/mdds0 \
gpatch:devel/patch \
ucpp:devel/ucpp \
${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
Modified: head/editors/libreoffice4/Makefile
==============================================================================
--- head/editors/libreoffice4/Makefile Thu Apr 14 17:41:13 2016 (r413307)
+++ head/editors/libreoffice4/Makefile Thu Apr 14 17:48:51 2016 (r413308)
@@ -25,7 +25,7 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archive
cppunit-config:devel/cppunit \
dmake:devel/dmake \
${LOCALBASE}/bin/gperf:devel/gperf \
- mdds>=0.9.0:devel/mdds \
+ ${LOCALBASE}/include/mdds/global.hpp:devel/mdds0 \
gpatch:devel/patch \
ucpp:devel/ucpp \
vigra-config:graphics/vigra \
Modified: head/graphics/libetonyek01/Makefile
==============================================================================
--- head/graphics/libetonyek01/Makefile Thu Apr 14 17:41:13 2016 (r413307)
+++ head/graphics/libetonyek01/Makefile Thu Apr 14 17:48:51 2016 (r413308)
@@ -14,7 +14,7 @@ COMMENT= Library to interpret and import
LICENSE= LGPL21 MPL
LICENSE_COMB= dual
-BUILD_DEPENDS= mdds>=0.12.1_1:devel/mdds \
+BUILD_DEPENDS= ${LOCALBASE}/include/mdds/global.hpp:devel/mdds0 \
${LOCALBASE}/include/glm/glm.hpp:math/glm
LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
librevenge-0.0.so:textproc/librevenge \
More information about the svn-ports-all
mailing list