Update to 1.3.8

7 files changed, 15 insertions, 78 deletions

diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index f6a3f725e4f9..b2d0c37c02e3 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	orbitcpp
-PORTVERSION=	1.3.7
+PORTVERSION=	1.3.8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/orbitcpp/distinfo b/devel/orbitcpp/distinfo
index 2664c6dac883..10fea838e3fa 100644
--- a/devel/orbitcpp/distinfo
+++ b/devel/orbitcpp/distinfo
@@ -1 +1 @@
-MD5 (orbitcpp-1.3.7.tar.bz2) = 14a23ca4a09a9eea7a2b42d70662d015
+MD5 (orbitcpp-1.3.8.tar.bz2) = 76cf5eccc039501dc854614c349e9c57
diff --git a/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::pass_xlate.cc b/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::pass_xlate.cc
new file mode 100644
index 000000000000..a409dd6acfcd
--- /dev/null
+++ b/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::pass_xlate.cc
@@ -0,0 +1,11 @@
+--- orbitcpp/idl-compiler/pass_xlate.cc.orig	Tue Nov 18 12:35:41 2003
++++ orbitcpp/idl-compiler/pass_xlate.cc	Tue Nov 18 12:36:16 2003
+@@ -1328,7 +1328,7 @@
+ {
+ 	string array_id = m_dest.get_cpp_typename ();
+ 	string slice_id = array_id + "_slice";
+-	string props_id = m_dest.get_cpp_typename () + "Props";
++	string props_id = m_dest.get_cpp_identifier () + "Props";
+ 
+ 	int length = 1;
+ 	for (IDLArray::const_iterator i = m_array.begin ();
diff --git a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h
deleted file mode 100644
index b6f621ab84db..000000000000
--- a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- orbitcpp/orb-cpp/orbitcpp_compound_seq.h.orig	Mon Aug 25 15:16:07 2003
-+++ orbitcpp/orb-cpp/orbitcpp_compound_seq.h	Mon Aug 25 15:16:55 2003
-@@ -70,6 +70,7 @@
- 	typename SeqTraits::c_value_t,
-         typename SeqTraits::c_seq_t>
-     {
-+    protected:
- 	typedef SeqTraits  traits_t;
- 	typedef typename traits_t::value_t   value_t;
- 	typedef typename traits_t::c_value_t c_value_t;
-@@ -126,6 +127,7 @@
-     template<typename CPPElem, typename SeqTraits=typename CPPElem::SeqTraits>
-     class CompoundUnboundedSeq: public CompoundSeqBase<CPPElem, SeqTraits>
-     {
-+    public:
- 	typedef SeqTraits  traits_t;
- 	typedef typename traits_t::c_value_t c_value_t;
- 	typedef typename traits_t::c_seq_t   c_seq_t;
-@@ -186,6 +188,7 @@
-     template<typename CPPElem, CORBA::ULong max, typename SeqTraits=typename CPPElem::SeqTraits>
-     class CompoundBoundedSeq: public CompoundSeqBase<CPPElem, SeqTraits>
-     {
-+    public:
- 	typedef SeqTraits traits_t;
- 	typedef typename traits_t::value_t  value_t;
- 	typedef typename traits_t::c_value_t c_value_t;
diff --git a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h
deleted file mode 100644
index 655a404a2f4a..000000000000
--- a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- orbitcpp/orb-cpp/orbitcpp_simple_seq.h.orig	Mon Aug 25 15:17:13 2003
-+++ orbitcpp/orb-cpp/orbitcpp_simple_seq.h	Mon Aug 25 15:45:11 2003
-@@ -92,8 +92,10 @@
-     template<class Traits>
-     class SimpleUnboundedSeq: public SimpleSeqBase<Traits>
-     {
-+    public:
- 	typedef SimpleSeqBase<Traits>    Super;
- 	
-+	typedef typename Super::value_t  value_t;
- 	typedef typename Super::size_t   size_t;
- 	typedef typename Super::index_t  index_t;
- 	typedef typename Super::buffer_t buffer_t;
-@@ -146,8 +148,10 @@
-     template<class Traits, CORBA::ULong max>
-     class SimpleBoundedSeq: public SimpleSeqBase<Traits>
-     {
-+    public:
- 	typedef SimpleSeqBase<Traits>    Super;
- 
-+	typedef typename Super::value_t  value_t;
- 	typedef typename Super::size_t   size_t;
- 	typedef typename Super::index_t  index_t;
- 	typedef typename Super::buffer_t buffer_t;
diff --git a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h
deleted file mode 100644
index de342832d4df..000000000000
--- a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- orbitcpp/orb-cpp/orbitcpp_string_seq.h.orig	Mon Aug 25 15:18:19 2003
-+++ orbitcpp/orb-cpp/orbitcpp_string_seq.h	Mon Aug 25 15:45:43 2003
-@@ -90,8 +90,10 @@
- 
-     class StringUnboundedSeq: public StringSeqBase
-     {
-+    public:
- 	typedef StringSeqBase            Super;
- 	
-+	typedef Super::value_t  value_t;
- 	typedef Super::size_t   size_t;
- 	typedef Super::index_t  index_t;
- 	typedef Super::buffer_t buffer_t;
-@@ -145,8 +147,10 @@
-     template<CORBA::ULong max>
-     class StringBoundedSeq: public StringSeqBase
-     {
-+    public:
- 	typedef StringSeqBase   Super;
- 
-+	typedef Super::value_t  value_t;
- 	typedef Super::size_t   size_t;
- 	typedef Super::index_t  index_t;
- 	typedef Super::buffer_t buffer_t;
diff --git a/devel/orbitcpp/pkg-plist b/devel/orbitcpp/pkg-plist
index 840351c8c6e3..d491e99df37d 100644
--- a/devel/orbitcpp/pkg-plist
+++ b/devel/orbitcpp/pkg-plist
@@ -34,10 +34,10 @@ include/orbitcpp-2.0/orbitcpp/orb-cpp/smartpointers/string_out.h
 include/orbitcpp-2.0/orbitcpp/orb-cpp/smartpointers/string_var.h
 lib/libORBit-2-cpp.a
 lib/libORBit-2-cpp.so
-lib/libORBit-2-cpp.so.7
+lib/libORBit-2-cpp.so.8
 lib/orbit-2.0/idl-backends/libORBit-idl-backend-cpp.a
 lib/orbit-2.0/idl-backends/libORBit-idl-backend-cpp.so
-lib/orbit-2.0/idl-backends/libORBit-idl-backend-cpp.so.7
+lib/orbit-2.0/idl-backends/libORBit-idl-backend-cpp.so.8
 libdata/pkgconfig/ORBit-2.0-cpp.pc
 @dirrm include/orbitcpp-2.0/orbitcpp/orb-cpp/smartpointers
 @dirrm include/orbitcpp-2.0/orbitcpp/orb-cpp