Update to 1.3.7

Approved by: marcus (mentor)

8 files changed, 28 insertions, 56 deletions

diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index 6fa3133fb032..f6a3f725e4f9 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	orbitcpp
-PORTVERSION=	1.3.6
-PORTREVISION=	3
+PORTVERSION=	1.3.7
 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 7f10c46d2527..2664c6dac883 100644
--- a/devel/orbitcpp/distinfo
+++ b/devel/orbitcpp/distinfo
@@ -1 +1 @@
-MD5 (orbitcpp-1.3.6.tar.bz2) = 5dbfd25232aa3b079ffbee9fd5641348
+MD5 (orbitcpp-1.3.7.tar.bz2) = 14a23ca4a09a9eea7a2b42d70662d015
diff --git a/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::types:IDLStruct.h b/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::types:IDLStruct.h
deleted file mode 100644
index d0579b763c48..000000000000
--- a/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::types:IDLStruct.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- orbitcpp/idl-compiler/types/IDLStruct.h.orig	Fri Jun 20 14:36:07 2003
-+++ orbitcpp/idl-compiler/types/IDLStruct.h	Fri Jun 20 14:36:26 2003
-@@ -33,7 +33,7 @@
- #include "IDLCompound.h"
- #include "IDLCompoundSeqElem.h"
- 
--class IDLStruct: public IDLCompound, public virtual IDLType, public IDLCompoundSeqElem
-+class IDLStruct: public IDLCompound, public IDLCompoundSeqElem
- {
- public:
- 	IDLStruct(const string &id,
diff --git a/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::types:IDLUnion.h b/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::types:IDLUnion.h
deleted file mode 100644
index 5de45d00b4ca..000000000000
--- a/devel/orbitcpp/files/patch-orbitcpp::idl-compiller::types:IDLUnion.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- orbitcpp/idl-compiler/types/IDLUnion.h.orig	Fri Jun 20 15:05:07 2003
-+++ orbitcpp/idl-compiler/types/IDLUnion.h	Fri Jun 20 15:05:33 2003
-@@ -34,7 +34,7 @@
- #include "IDLCompoundSeqElem.h"
- //#include "language.h"
- 
--class IDLUnion: public virtual IDLType, public IDLScope, public IDLCompoundSeqElem
-+class IDLUnion: public IDLScope, public IDLCompoundSeqElem
- {
- 	const IDLUnionDiscriminator &m_discriminator;
- 
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
index e8038e512f6b..b6f621ab84db 100644
--- a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h
+++ b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h
@@ -1,10 +1,10 @@
---- orbitcpp/orb-cpp/orbitcpp_compound_seq.h.orig	Fri May 30 02:10:38 2003
-+++ orbitcpp/orb-cpp/orbitcpp_compound_seq.h	Wed Jul 23 10:56:18 2003
+--- 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>
      {
-+    public:
++    protected:
  	typedef SeqTraits  traits_t;
  	typedef typename traits_t::value_t   value_t;
  	typedef typename traits_t::c_value_t c_value_t;
@@ -23,4 +23,4 @@
 +    public:
  	typedef SeqTraits traits_t;
  	typedef typename traits_t::value_t  value_t;
- 	typedef typename traits_t::c_elem_t c_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
index 57dc49bd1e07..655a404a2f4a 100644
--- a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h
+++ b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h
@@ -1,26 +1,24 @@
---- orbitcpp/orb-cpp/orbitcpp_simple_seq.h.orig	Fri May 30 02:10:38 2003
-+++ orbitcpp/orb-cpp/orbitcpp_simple_seq.h	Wed Jul 23 10:56:55 2003
-@@ -35,6 +35,7 @@
-     class SimpleSeqBase: public SequenceBase <typename Traits::value_t,
- 		typename Traits::c_value_t, typename Traits::c_seq_t>
-     {
-+    public:
- 	typedef Traits                       traits_t;
- 	typedef typename Traits::value_t     value_t;
- 	typedef typename traits_t::c_value_t c_value_t;
-@@ -91,6 +92,7 @@
+--- 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;
-@@ -145,6 +147,7 @@
+ 	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
index c05da7a2696a..de342832d4df 100644
--- a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h
+++ b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h
@@ -1,27 +1,24 @@
---- orbitcpp/orb-cpp/orbitcpp_string_seq.h.orig	Wed Jul 23 10:57:57 2003
-+++ orbitcpp/orb-cpp/orbitcpp_string_seq.h	Wed Jul 23 10:58:52 2003
-@@ -35,7 +35,7 @@
-     class StringSeqBase: public SequenceBase <CORBA::String_mgr,
- 			 CORBA_char*, CORBA_sequence_CORBA_string>
-     {
--    protected:
-+    public:
- 	typedef CORBA::String_mgr           value_t;
- 	typedef CORBA_char*                 c_value_t;
- 	typedef CORBA_sequence_CORBA_string c_seq_t;
-@@ -90,6 +90,7 @@
+--- 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;
-@@ -145,6 +146,7 @@
+ 	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 741f4e12df2f..840351c8c6e3 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.6
+lib/libORBit-2-cpp.so.7
 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.6
+lib/orbit-2.0/idl-backends/libORBit-idl-backend-cpp.so.7
 libdata/pkgconfig/ORBit-2.0-cpp.pc
 @dirrm include/orbitcpp-2.0/orbitcpp/orb-cpp/smartpointers
 @dirrm include/orbitcpp-2.0/orbitcpp/orb-cpp