Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

4 files changed, 12 insertions, 19 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index f2d205dea3b1..5898a1a822cb 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ORBit2
-PORTVERSION=	2.4.4
+PORTVERSION=	2.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,12 +23,14 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 CONFIGURE_ARGS= --disable-indent
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@find ${WRKSRC} -type f | xargs ${GREP} -l LINC_THREADSAFE | \
 		xargs ${REINPLACE_CMD} -e 's|LINC_THREADSAFE|G_THREADS_ENABLED|g'
 
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 1e4f3cc849fb..7534e5224241 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.4.4.tar.bz2) = e487accae11949d606938e2678191f05
+MD5 (gnome2/ORBit2-2.6.0.tar.bz2) = c0b26f13f63db89503234d9367962e23
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
index 6b72dbaeed3c..308fddd87618 100644
--- a/devel/ORBit2/files/patch-ab
+++ b/devel/ORBit2/files/patch-ab
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Mon Jan 28 19:56:23 2002
-+++ Makefile.in	Wed Feb 13 10:48:08 2002
+--- Makefile.in.orig	Sat Oct 19 15:24:09 2002
++++ Makefile.in	Sat Oct 19 15:25:58 2002
 @@ -35,7 +35,7 @@
  DESTDIR =
  
@@ -12,7 +9,7 @@ $FreeBSD$
  pkgincludedir = $(includedir)/@PACKAGE@
  
  top_builddir = .
-@@ -93,11 +93,10 @@
+@@ -97,11 +97,10 @@
  STRIP = @STRIP@
  VERSION = @VERSION@
  WARN_CFLAGS = @WARN_CFLAGS@
@@ -25,12 +22,3 @@ $FreeBSD$
  
  bin_SCRIPTS = orbit2-config
  
-@@ -107,7 +106,7 @@
- m4datadir = $(datadir)/aclocal
- m4data_DATA = ORBit2.m4
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(pkglibdir)
- pkgconfig_DATA = ORBit-2.0.pc ORBit-CosNaming-2.0.pc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index a58ff8822d71..5a806118bb68 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -5,6 +5,7 @@ etc/orbit2rc.default
 @exec if [ ! -f %D/etc/orbit2rc ] ; then cp -p %D/%F %B/orbit2rc; fi
 include/orbit-2.0/ORBitservices/CosNaming.h
 include/orbit-2.0/ORBitservices/CosNaming_impl.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
@@ -62,6 +63,7 @@ lib/libORBitCosNaming-2.so
 lib/libORBitCosNaming-2.so.0
 lib/libname-server-2.a
 libdata/pkgconfig/ORBit-2.0.pc
+libdata/pkgconfig/ORBit-idl-2.0.pc
 libdata/pkgconfig/ORBit-CosNaming-2.0.pc
 share/aclocal/ORBit2.m4
 share/idl/orbit-2.0/CosNaming.idl
@@ -73,5 +75,6 @@ share/idl/orbit-2.0/CosNaming.idl
 @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
 @dirrm include/orbit-2.0