6 files changed, 50 insertions, 34 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index d7371d88bfa6..7317e7015572 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -1,24 +1,24 @@
 # New ports collection makefile for:   orbit
-# Version required:		0.3.98
+# Version required:		0.4.0
 # Date Created:			16 Aug 1998
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
-# $Id: Makefile,v 1.13 1999/01/31 16:57:13 vanilla Exp $
+# $Id: Makefile,v 1.14 1999/02/18 17:49:05 vanilla Exp $
 #
 
-DISTNAME=	ORBit-0.3.98
+DISTNAME=	ORBit-0.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	ORBit
 
 MAINTAINER=	clkao@CirX.ORG
 
-LIB_DEPENDS=	glib11d.2:${PORTSDIR}/devel/glib11-devel
+LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
 CONFIGURE_ARGS= --disable-indent
 
 pre-install:
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index 70fa965d9807..cc28ec485663 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602
+MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index 97e231005bab..a4ebc3344f61 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -42,41 +42,41 @@
  
  
  INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src  @GLIB_CFLAGS@
---- libIDL/Makefile.in.orig	Mon Feb 15 12:59:56 1999
-+++ libIDL/Makefile.in	Thu Feb 18 22:55:15 1999
-@@ -50,7 +50,7 @@
- AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
- 
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_PROGRAM@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -76,7 +76,7 @@
- LEX = @LEX@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
+--- libIDL/Makefile.in.orig	Thu Feb 25 17:17:07 1999
++++ libIDL/Makefile.in	Mon Mar  1 18:54:57 1999
+@@ -89,7 +89,7 @@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  NM = @NM@
  PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
-@@ -101,7 +101,7 @@
+@@ -120,7 +120,7 @@
  
  libIDL_la_SOURCES = parser.c parser.h lexer.c 			  ns.c util.c util.h rename.h
  
--libIDL_la_LDFLAGS = -version-info 5:9:5
+-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				  -release $(LT_RELEASE)
 +libIDL_la_LDFLAGS = -version-info 1:0:0
  
- tstidl_SOURCES = tstidl.c
+ 
+ m4datadir = $(datadir)/aclocal
+@@ -130,7 +130,7 @@
  tstidl_LDFLAGS = -static
-@@ -478,7 +478,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-info \
- 		uninstall-pkgincludeHEADERS
+ tstidl_LDADD = libIDL.la
+ 
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = libIDLConf.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -580,7 +580,7 @@
+ 		uninstall-info uninstall-confexecDATA \
+ 		uninstall-m4dataDATA uninstall-pkgincludeHEADERS
  uninstall: uninstall-am
--all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS)
+-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
++all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \
+ 		$(DATA) $(HEADERS)
  all-redirect: all-am
  install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff --git a/devel/ORBit/files/patch-ad b/devel/ORBit/files/patch-ad
index 44689977d4f7..bc0a5f58b9c9 100644
--- a/devel/ORBit/files/patch-ad
+++ b/devel/ORBit/files/patch-ad
@@ -6,8 +6,8 @@
  
 -    client		(calls glib-config)
 -    server		(calls glib-config)
-+    client		(calls glib11d-config)
-+    server		(calls glib11d-config)
++    client		(calls glib12-config)
++    server		(calls glib12-config)
  EOF
  
      exit $1
@@ -17,8 +17,8 @@
      client|server)
 -	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
 -	the_flags="$the_flags `glib-config --cflags` -I@includedir@"
-+	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib11d-config --libs` @LIBS@ -lm"
-+	the_flags="$the_flags `glib11d-config --cflags` -I@includedir@"
++	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm"
++	the_flags="$the_flags `glib12-config --cflags` -I@includedir@"
  	;;
  
     --use-service=*)
diff --git a/devel/ORBit/files/patch-ae b/devel/ORBit/files/patch-ae
new file mode 100644
index 000000000000..1468b8fed6bd
--- /dev/null
+++ b/devel/ORBit/files/patch-ae
@@ -0,0 +1,13 @@
+--- configure.orig	Fri Feb 19 00:50:06 1999
++++ configure	Fri Feb 19 00:50:21 1999
+@@ -5288,10 +5288,6 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index 453ddbaa26dc..f1424dd5e314 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -1,3 +1,4 @@
+bin/libIDL-config
 bin/name-client
 bin/old-name-server
 bin/orbit-config
@@ -5,6 +6,7 @@ bin/orbit-event-server
 bin/orbit-idl
 bin/orbit-ird
 bin/orbit-name-server
+etc/libIDLConf.sh
 include/IIOP/IIOP-config.h
 include/IIOP/IIOP-types.h
 include/IIOP/IIOP.h
@@ -90,6 +92,7 @@ lib/libORBitutil.so.1
 lib/libname-server.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/libIDL.m4
 @dirrm include/IIOP
 @dirrm include/ORBitservices
 @dirrm include/ORBitutil