pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
add libcutl to pkgsrc-wip
Module Name: pkgsrc-wip
Committed By: Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By: nros
Date: Thu Mar 18 10:51:42 2021 +0000
Changeset: 05854911ac01966456872401885d0943c1a1e6f8
Modified Files:
Makefile
Added Files:
libcutl/DESCR
libcutl/Makefile
libcutl/PLIST
libcutl/buildlink3.mk
libcutl/distinfo
libcutl/patches/patch-configure
libcutl/patches/patch-cutl_re_re.cxx
Log Message:
add libcutl to pkgsrc-wip
libcutl is a c++ library of genereic and independent components such
as meta-programming tests, smart pointers, containers, compiler
buildling blocks, etc.
this package is added to fix xsd.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=05854911ac01966456872401885d0943c1a1e6f8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
libcutl/DESCR | 3 +
libcutl/Makefile | 26 +++++++
libcutl/PLIST | 64 ++++++++++++++++
libcutl/buildlink3.mk | 12 +++
libcutl/distinfo | 8 ++
libcutl/patches/patch-configure | 41 ++++++++++
libcutl/patches/patch-cutl_re_re.cxx | 144 +++++++++++++++++++++++++++++++++++
8 files changed, 299 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index dfe31b2dc9..78d8872d46 100644
--- a/Makefile
+++ b/Makefile
@@ -1992,6 +1992,7 @@ SUBDIR+= libcstring
SUBDIR+= libcthreads
SUBDIR+= libcuba
SUBDIR+= libcue
+SUBDIR+= libcutl
SUBDIR+= libcyaml
SUBDIR+= libdbglog
SUBDIR+= libdbh2
diff --git a/libcutl/DESCR b/libcutl/DESCR
new file mode 100644
index 0000000000..e99df07333
--- /dev/null
+++ b/libcutl/DESCR
@@ -0,0 +1,3 @@
+libcutl is a C++ utility library. It contains a collection of generic and
+fairly independent components such as meta-programming tests, smart pointers,
+containers, compiler buildling blocks, etc.
diff --git a/libcutl/Makefile b/libcutl/Makefile
new file mode 100644
index 0000000000..7c3b4bb96f
--- /dev/null
+++ b/libcutl/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD$
+
+DISTNAME= libcutl-1.10.0
+CATEGORIES= devel
+MASTER_SITES= https://www.codesynthesis.com/download/libcutl/1.10/
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.codesynthesis.com/projects/libcutl/
+COMMENT= C++ utility library
+LICENSE= mit
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_LANGUAGES= c c++
+
+CONFIGURE_ARGS+= --with-external-boost
+CONFIGURE_ARGS+= --with-external-expat
+
+PKGCONFIG_OVERRIDE+= libcutl.pc.in
+
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/libcutl/PLIST b/libcutl/PLIST
new file mode 100644
index 0000000000..af10417721
--- /dev/null
+++ b/libcutl/PLIST
@@ -0,0 +1,64 @@
+@comment $NetBSD$
+include/cutl/compiler/code-stream.hxx
+include/cutl/compiler/code-stream.txx
+include/cutl/compiler/context.hxx
+include/cutl/compiler/context.txx
+include/cutl/compiler/cxx-indenter.hxx
+include/cutl/compiler/cxx-indenter.ixx
+include/cutl/compiler/cxx-indenter.txx
+include/cutl/compiler/sloc-counter.hxx
+include/cutl/compiler/sloc-counter.txx
+include/cutl/compiler/traversal.hxx
+include/cutl/compiler/traversal.txx
+include/cutl/compiler/type-id.hxx
+include/cutl/compiler/type-id.ixx
+include/cutl/compiler/type-id.txx
+include/cutl/compiler/type-info.hxx
+include/cutl/compiler/type-info.ixx
+include/cutl/container/any.hxx
+include/cutl/container/graph.hxx
+include/cutl/container/graph.txx
+include/cutl/container/key.hxx
+include/cutl/container/map-iterator.hxx
+include/cutl/container/multi-index.hxx
+include/cutl/container/pointer-iterator.hxx
+include/cutl/details/config.h
+include/cutl/details/config.hxx
+include/cutl/details/export.hxx
+include/cutl/details/genx/genx.h
+include/cutl/exception.hxx
+include/cutl/fs/auto-remove.hxx
+include/cutl/fs/exception.hxx
+include/cutl/fs/path.hxx
+include/cutl/fs/path.ixx
+include/cutl/fs/path.txx
+include/cutl/meta/answer.hxx
+include/cutl/meta/class-p.hxx
+include/cutl/meta/polymorphic-p.hxx
+include/cutl/meta/remove-c.hxx
+include/cutl/meta/remove-cv.hxx
+include/cutl/meta/remove-p.hxx
+include/cutl/meta/remove-v.hxx
+include/cutl/re.hxx
+include/cutl/re/re.txx
+include/cutl/shared-ptr.hxx
+include/cutl/shared-ptr/base.hxx
+include/cutl/shared-ptr/base.ixx
+include/cutl/shared-ptr/base.txx
+include/cutl/static-ptr.hxx
+include/cutl/xml/exception.hxx
+include/cutl/xml/parser.hxx
+include/cutl/xml/parser.ixx
+include/cutl/xml/parser.txx
+include/cutl/xml/qname.hxx
+include/cutl/xml/serializer.hxx
+include/cutl/xml/serializer.ixx
+include/cutl/xml/value-traits.hxx
+include/cutl/xml/value-traits.txx
+lib/libcutl.la
+lib/pkgconfig/libcutl.pc
+share/doc/libcutl/INSTALL
+share/doc/libcutl/LICENSE
+share/doc/libcutl/NEWS
+share/doc/libcutl/README
+share/doc/libcutl/version
diff --git a/libcutl/buildlink3.mk b/libcutl/buildlink3.mk
new file mode 100644
index 0000000000..ef7c44ff10
--- /dev/null
+++ b/libcutl/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= libcutl
+
+.if !defined(LIBCUTL_BUILDLINK3_MK)
+LIBCUTL_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libcutl+= libcutl>=1.10.0
+BUILDLINK_PKGSRCDIR.libcutl?= ../../wip/libcutl
+.endif # LIBCUTL_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libcutl
diff --git a/libcutl/distinfo b/libcutl/distinfo
new file mode 100644
index 0000000000..8607152448
--- /dev/null
+++ b/libcutl/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (libcutl-1.10.0.tar.bz2) = 2885b79529f8caeb13687d722f5c114186f56956
+RMD160 (libcutl-1.10.0.tar.bz2) = 79c672563cdcfe9ccc330b2e56ecd166d4e5790f
+SHA512 (libcutl-1.10.0.tar.bz2) = c03f39e87e660fdd07aa9cccb2d82d411ca8226b56475c74b7b2147b90cdb83d13246bc0c09513e407271bcf568d6a08f92c9006e48d1e7f06e4b18dde34dc5f
+Size (libcutl-1.10.0.tar.bz2) = 763920 bytes
+SHA1 (patch-configure) = a705d5dc194a3d2ff4d1c4ace34ad83f713b4d79
+SHA1 (patch-cutl_re_re.cxx) = 887d9c00f388ef3e7e989e0a5fe169c09cac94e6
diff --git a/libcutl/patches/patch-configure b/libcutl/patches/patch-configure
new file mode 100644
index 0000000000..fa519174cd
--- /dev/null
+++ b/libcutl/patches/patch-configure
@@ -0,0 +1,41 @@
+$NetBSD$
+
+* use std::regex instead of boost that don't have regex since 1.65
+ from FreeBSD ports
+
+--- configure.orig 2021-03-18 09:51:20.788551616 +0000
++++ configure
+@@ -17554,13 +17554,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h. */
+
+
+-#include <boost/tr1/regex.hpp>
++#include <regex>
+
+ int
+ main ()
+ {
+- std::tr1::regex r ("te.t", std::tr1::regex_constants::ECMAScript);
+- return std::tr1::regex_match ("test", r) ? 0 : 1;
++ std::regex r ("te.t", std::regex_constants::ECMAScript);
++ return std::regex_match ("test", r) ? 0 : 1;
+ }
+
+ _ACEOF
+@@ -17631,13 +17631,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h. */
+
+
+-#include <boost/tr1/regex.hpp>
++#include <regex>
+
+ int
+ main ()
+ {
+- std::tr1::regex r ("te.t", std::tr1::regex_constants::ECMAScript);
+- return std::tr1::regex_match ("test", r) ? 0 : 1;
++ std::regex r ("te.t", std::regex_constants::ECMAScript);
++ return std::regex_match ("test", r) ? 0 : 1;
+ }
+
+ _ACEOF
diff --git a/libcutl/patches/patch-cutl_re_re.cxx b/libcutl/patches/patch-cutl_re_re.cxx
new file mode 100644
index 0000000000..4ca23b03c7
--- /dev/null
+++ b/libcutl/patches/patch-cutl_re_re.cxx
@@ -0,0 +1,144 @@
+$NetBSD$
+
+* use std::regex instead of boost that don't have regex since 1.65
+ from FreeBSD ports
+
+--- cutl/re/re.cxx.orig 2021-03-18 09:52:50.415539125 +0000
++++ cutl/re/re.cxx
+@@ -9,7 +9,7 @@
+ #ifndef LIBCUTL_EXTERNAL_BOOST
+ # include <cutl/details/boost/tr1/regex.hpp>
+ #else
+-# include <boost/tr1/regex.hpp>
++# include <regex>
+ #endif
+
+ using namespace std;
+@@ -40,17 +40,17 @@ namespace cutl
+ struct basic_regex<C>::impl
+ {
+ typedef basic_string<C> string_type;
+- typedef tr1::basic_regex<C> regex_type;
++ typedef std::basic_regex<C> regex_type;
+ typedef typename regex_type::flag_type flag_type;
+
+ impl () {}
+ impl (regex_type const& r): r (r) {}
+ impl (string_type const& s, bool icase)
+ {
+- flag_type f (tr1::regex_constants::ECMAScript);
++ flag_type f (std::regex_constants::ECMAScript);
+
+ if (icase)
+- f |= tr1::regex_constants::icase;
++ f |= std::regex_constants::icase;
+
+ r.assign (s, f);
+ }
+@@ -118,15 +118,15 @@ namespace cutl
+ impl_ = s == 0 ? new impl : new impl (*s, icase);
+ else
+ {
+- impl::flag_type f (tr1::regex_constants::ECMAScript);
++ impl::flag_type f (std::regex_constants::ECMAScript);
+
+ if (icase)
+- f |= tr1::regex_constants::icase;
++ f |= std::regex_constants::icase;
+
+ impl_->r.assign (*s, f);
+ }
+ }
+- catch (tr1::regex_error const& e)
++ catch (std::regex_error const& e)
+ {
+ throw basic_format<char> (s == 0 ? "" : *s, e.what ());
+ }
+@@ -146,15 +146,15 @@ namespace cutl
+ impl_ = s == 0 ? new impl : new impl (*s, icase);
+ else
+ {
+- impl::flag_type f (tr1::regex_constants::ECMAScript);
++ impl::flag_type f (std::regex_constants::ECMAScript);
+
+ if (icase)
+- f |= tr1::regex_constants::icase;
++ f |= std::regex_constants::icase;
+
+ impl_->r.assign (*s, f);
+ }
+ }
+- catch (tr1::regex_error const& e)
++ catch (std::regex_error const& e)
+ {
+ throw basic_format<wchar_t> (s == 0 ? L"" : *s, e.what ());
+ }
+@@ -166,28 +166,28 @@ namespace cutl
+ bool basic_regex<char>::
+ match (string_type const& s) const
+ {
+- return tr1::regex_match (s, impl_->r);
++ return std::regex_match (s, impl_->r);
+ }
+
+ template <>
+ bool basic_regex<wchar_t>::
+ match (string_type const& s) const
+ {
+- return tr1::regex_match (s, impl_->r);
++ return std::regex_match (s, impl_->r);
+ }
+
+ template <>
+ bool basic_regex<char>::
+ search (string_type const& s) const
+ {
+- return tr1::regex_search (s, impl_->r);
++ return std::regex_search (s, impl_->r);
+ }
+
+ template <>
+ bool basic_regex<wchar_t>::
+ search (string_type const& s) const
+ {
+- return tr1::regex_search (s, impl_->r);
++ return std::regex_search (s, impl_->r);
+ }
+
+ template <>
+@@ -196,13 +196,13 @@ namespace cutl
+ string_type const& sub,
+ bool first_only) const
+ {
+- tr1::regex_constants::match_flag_type f (
+- tr1::regex_constants::format_default);
++ std::regex_constants::match_flag_type f (
++ std::regex_constants::format_default);
+
+ if (first_only)
+- f |= tr1::regex_constants::format_first_only;
++ f |= std::regex_constants::format_first_only;
+
+- return tr1::regex_replace (s, impl_->r, sub, f);
++ return std::regex_replace (s, impl_->r, sub, f);
+ }
+
+ template <>
+@@ -211,13 +211,13 @@ namespace cutl
+ string_type const& sub,
+ bool first_only) const
+ {
+- tr1::regex_constants::match_flag_type f (
+- tr1::regex_constants::format_default);
++ std::regex_constants::match_flag_type f (
++ std::regex_constants::format_default);
+
+ if (first_only)
+- f |= tr1::regex_constants::format_first_only;
++ f |= std::regex_constants::format_first_only;
+
+- return tr1::regex_replace (s, impl_->r, sub, f);
++ return std::regex_replace (s, impl_->r, sub, f);
+ }
+ }
+ }
Home |
Main Index |
Thread Index |
Old Index