Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

8 files changed, 24 insertions, 48 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 0fa37b24407d..c048a73e3e54 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ORBit2
-PORTVERSION=	2.8.3
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,9 +21,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
-USE_GNOME=	gnomehack libidl
-CONFIGURE_ARGS= --disable-indent \
+USE_LIBTOOL_VER=13
+USE_GNOME=	gnomehack lthack libidl
+CONFIGURE_ARGS=	--disable-indent \
 		--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 610e0d208774..b32abca376d0 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/ORBit2-2.8.3.tar.bz2) = c6c4b63de2f70310e33a52a37257ddaf
-SIZE (gnome2/ORBit2-2.8.3.tar.bz2) = 633145
+MD5 (gnome2/ORBit2-2.10.0.tar.bz2) = fe86ec038fc51ee0e90e84169a8dda6c
+SIZE (gnome2/ORBit2-2.10.0.tar.bz2) = 643687
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
index 57f1e2d4c301..281d27bbf89e 100644
--- a/devel/ORBit2/files/patch-ab
+++ b/devel/ORBit2/files/patch-ab
@@ -1,17 +1,17 @@
---- Makefile.in.orig	Sat Jun 14 01:50:29 2003
-+++ Makefile.in	Sat Jun 14 01:51:03 2003
-@@ -35,7 +35,7 @@
- DESTDIR =
- 
+--- Makefile.in.orig	Fri Mar  5 23:34:38 2004
++++ Makefile.in	Fri Mar  5 23:35:59 2004
+@@ -34,7 +34,7 @@
+ includedir = @includedir@
+ oldincludedir = /usr/include
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(prefix)/libdata/pkgconfig
  pkgincludedir = $(includedir)/@PACKAGE@
- 
  top_builddir = .
-@@ -115,7 +115,7 @@
  
- AUTOMAKE_OPTIONS = 1.3
+@@ -125,7 +125,7 @@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  
 -SUBDIRS = linc2 src include test docs
 +SUBDIRS = linc2 src include docs
diff --git a/devel/ORBit2/files/patch-configure b/devel/ORBit2/files/patch-configure
deleted file mode 100644
index 3c4e6cd0faf9..000000000000
--- a/devel/ORBit2/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/04/26 07:38:33	1.1
-+++ configure	2002/04/26 07:38:42
-@@ -6201,6 +6201,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
index 0c2cb69a98bc..e048ca634226 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	Tue Jul 15 13:16:53 2003
-+++ src/orb/util/Makefile.in	Tue Jul 15 13:17:32 2003
-@@ -189,7 +189,7 @@
+--- src/orb/util/Makefile.in.orig	Fri Mar  5 23:39:16 2004
++++ src/orb/util/Makefile.in	Fri Mar  5 23:39:43 2004
+@@ -126,7 +126,7 @@
  INCLUDES = \
  	-I$(top_srcdir)/include				\
  	-I$(top_builddir)/include			\
diff --git a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
index 48972837628b..44dfb3fb0690 100644
--- a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
+++ b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
@@ -1,6 +1,6 @@
---- src/orb/orb-core/orbit-typelib.c.orig	Sun May 11 20:37:14 2003
-+++ src/orb/orb-core/orbit-typelib.c	Sun May 11 20:40:42 2003
-@@ -215,6 +215,8 @@
+--- src/orb/orb-core/orbit-typelib.c.orig	Fri Mar  5 23:42:33 2004
++++ src/orb/orb-core/orbit-typelib.c	Fri Mar  5 23:43:00 2004
+@@ -218,6 +218,8 @@
  	paths = g_ptr_array_sized_new (8);
  
  	g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR));
diff --git a/devel/ORBit2/pkg-descr b/devel/ORBit2/pkg-descr
index 8336574a1661..57ee9653d674 100644
--- a/devel/ORBit2/pkg-descr
+++ b/devel/ORBit2/pkg-descr
@@ -1,3 +1,3 @@
 ORBit is a high-performance CORBA ORB with support for the C language.
-It allows programs to send requests and receive replies from other
-programs, regardless of the locations of the two programs.
+It allows programs to comminucate with each other, regardless of their
+physical and logical locations.
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index ea2dca5ab3ae..c18fe8f28e9c 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -64,19 +64,9 @@ 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
+@dirrm %%DOCSDIR%%
 @unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib/orbit-2.0 2>/dev/null || /usr/bin/true
 @dirrm include/orbit-2.0/orbit/util