7 files changed, 38 insertions, 27 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 55a216f6c057..f65a936d9056 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ORBit2
-PORTVERSION=	2.6.3
+PORTVERSION=	2.8.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,8 +22,10 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack libidl linc
-CONFIGURE_ARGS= --disable-indent
+USE_GNOME=	gnomehack libidl
+CONFIGURE_ARGS= --disable-indent \
+		--with-html-dir=${PREFIX}/share/doc \
+		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index bd5b8a651fea..aef8b18f674b 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.6.3.tar.bz2) = b6fc2b71018c46b2da607510492c597f
+MD5 (gnome2/ORBit2-2.8.1.tar.bz2) = 062674985948deebf9f8a9117c3c7754
diff --git a/devel/ORBit2/files/patch-ORBit-2.0.pc.in b/devel/ORBit2/files/patch-ORBit-2.0.pc.in
new file mode 100644
index 000000000000..bd616eaa2014
--- /dev/null
+++ b/devel/ORBit2/files/patch-ORBit-2.0.pc.in
@@ -0,0 +1,10 @@
+--- ORBit-2.0.pc.in.orig	Sat May 31 11:04:33 2003
++++ ORBit-2.0.pc.in	Sun Jun 15 01:31:20 2003
+@@ -8,6 +8,6 @@
+ Name: ORBit-2.0
+ Description: High-performance CORBA Object Request Broker.
+ Version: @ORBIT_VERSION@
+-Requires: glib-2.0 gmodule-2.0
++Requires: glib-2.0 gmodule-2.0 gthread-2.0
+ Libs: -L${libdir} -lORBit-2 @ORBIT_LIBS@ @LIBS@ -lm
+ Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
index 308fddd87618..57f1e2d4c301 100644
--- a/devel/ORBit2/files/patch-ab
+++ b/devel/ORBit2/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Oct 19 15:24:09 2002
-+++ Makefile.in	Sat Oct 19 15:25:58 2002
+--- Makefile.in.orig	Sat Jun 14 01:50:29 2003
++++ Makefile.in	Sat Jun 14 01:51:03 2003
 @@ -35,7 +35,7 @@
  DESTDIR =
  
@@ -9,16 +9,12 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  
  top_builddir = .
-@@ -97,11 +97,10 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
--pkglibdir = @pkglibdir@
+@@ -115,7 +115,7 @@
  
  AUTOMAKE_OPTIONS = 1.3
  
--SUBDIRS = src include test docs
-+SUBDIRS = src include docs
+-SUBDIRS = linc2 src include test docs
++SUBDIRS = linc2 src include docs
  
  bin_SCRIPTS = orbit2-config
  
diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
index f40acebc7738..0c2cb69a98bc 100644
--- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in
+++ b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
@@ -1,6 +1,6 @@
---- src/orb/util/Makefile.in.orig	Mon Jul 21 11:21:48 2003
-+++ src/orb/util/Makefile.in	Mon Jul 21 11:22:19 2003
-@@ -104,7 +104,7 @@
+--- src/orb/util/Makefile.in.orig	Tue Jul 15 13:16:53 2003
++++ src/orb/util/Makefile.in	Tue Jul 15 13:17:32 2003
+@@ -189,7 +189,7 @@
  INCLUDES = \
  	-I$(top_srcdir)/include				\
  	-I$(top_builddir)/include			\
diff --git a/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c b/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c
index dcc0e0ebb4f6..8ae3c76447c1 100644
--- a/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c
+++ b/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c
@@ -4,7 +4,7 @@
  	char **strv;
  	int    i;
  
-+	paths = g_slist_prepend (paths, "/usr/X11R6/lib/orbit-2.0/idl-backends");
++	paths = g_slist_prepend (paths, "%%X11BASE%%/lib/orbit-2.0/idl-backends");
 +
  	if (!(val = getenv ("GNOME2_PATH")))
  		return paths;
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index 7b378aaf3d26..723579770b17 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -1,3 +1,4 @@
+bin/linc-cleanup-sockets
 bin/orbit-idl-2
 bin/orbit2-config
 @unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi
@@ -7,14 +8,6 @@ include/orbit-2.0/ORBitservices/CosNaming.h
 include/orbit-2.0/ORBitservices/CosNaming_impl.h
 include/orbit-2.0/ORBitservices/orbit-imodule.h
 include/orbit-2.0/orbit-idl/orbit-idl-backend.h
-include/orbit-2.0/orbit/GIOP/giop-basics.h
-include/orbit-2.0/orbit/GIOP/giop-connection.h
-include/orbit-2.0/orbit/GIOP/giop-endian.h
-include/orbit-2.0/orbit/GIOP/giop-recv-buffer.h
-include/orbit-2.0/orbit/GIOP/giop-send-buffer.h
-include/orbit-2.0/orbit/GIOP/giop-server.h
-include/orbit-2.0/orbit/GIOP/giop-types.h
-include/orbit-2.0/orbit/GIOP/giop.h
 include/orbit-2.0/orbit/dynamic/dynamic-defs.h
 include/orbit-2.0/orbit/dynamic/dynamic.h
 include/orbit-2.0/orbit/orb-core/allocators.h
@@ -71,14 +64,24 @@ libdata/pkgconfig/ORBit-idl-2.0.pc
 libdata/pkgconfig/ORBit-imodule-2.0.pc
 libdata/pkgconfig/ORBit-CosNaming-2.0.pc
 share/aclocal/ORBit2.m4
+share/doc/ORBit2/ORBit2-orbit2-allocators.html
+share/doc/ORBit2/ORBit2-orbit2-small.html
+share/doc/ORBit2/ORBit2.devhelp
+share/doc/ORBit2/general.html
+share/doc/ORBit2/home.png
+share/doc/ORBit2/index.html
+share/doc/ORBit2/index.sgml
+share/doc/ORBit2/left.png
+share/doc/ORBit2/right.png
+share/doc/ORBit2/up.png
 share/idl/orbit-2.0/CosNaming.idl
 @dirrm share/idl/orbit-2.0
+@dirrm share/doc/ORBit2
 @unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true
 @dirrm include/orbit-2.0/orbit/util
 @dirrm include/orbit-2.0/orbit/poa
 @dirrm include/orbit-2.0/orbit/orb-core
 @dirrm include/orbit-2.0/orbit/dynamic
-@dirrm include/orbit-2.0/orbit/GIOP
 @dirrm include/orbit-2.0/orbit
 @dirrm include/orbit-2.0/orbit-idl
 @dirrm include/orbit-2.0/ORBitservices