Upgrade to latest version.

4 files changed, 74 insertions, 66 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 57ad5dbb3b41..d7371d88bfa6 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   orbit
-# Version required:		0.3.91
+# Version required:		0.3.98
 # Date Created:			16 Aug 1998
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
-# $Id: Makefile,v 1.12 1999/01/27 08:31:49 fenner Exp $
+# $Id: Makefile,v 1.13 1999/01/31 16:57:13 vanilla Exp $
 #
 
-DISTNAME=	ORBit-0.3.91
+DISTNAME=	ORBit-0.3.98
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	ORBit
@@ -18,8 +18,7 @@ LIB_DEPENDS=	glib11d.2:${PORTSDIR}/devel/glib11-devel
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	INSTALL='$${INSTALL} -c' \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
 CONFIGURE_ARGS= --disable-indent
 
 pre-install:
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index 613af0002228..70fa965d9807 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.3.91.tar.gz) = b43cd33b6ab0df61c28605cd2bd9fa1e
+MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602
diff --git a/devel/ORBit/files/patch-ab b/devel/ORBit/files/patch-ab
index 535510cda2df..2f0283ffae3c 100644
--- a/devel/ORBit/files/patch-ab
+++ b/devel/ORBit/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Wed Dec 16 10:41:29 1998
-+++ Makefile.in	Wed Dec 23 17:18:56 1998
-@@ -87,7 +87,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
+--- Makefile.in.orig	Mon Feb 15 12:59:53 1999
++++ Makefile.in	Thu Feb 18 22:37:23 1999
+@@ -92,7 +92,7 @@
  
--SUBDIRS=libIDL src test
-+SUBDIRS=libIDL src
+ AUTOMAKE_OPTIONS = 1.3 # required version of automake.
+ 
+-SUBDIRS = popt libIDL src test
++SUBDIRS = popt libIDL src
+ 
+ bin_SCRIPTS = orbit-config
  
- bin_SCRIPTS=orbit-config
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index be04e34439ee..97e231005bab 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -1,73 +1,82 @@
---- libIDL/Makefile.in.orig	Wed Dec 16 10:41:34 1998
-+++ libIDL/Makefile.in	Wed Dec 23 17:22:00 1998
-@@ -74,7 +74,7 @@
- LEX = @LEX@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
-@@ -101,7 +101,7 @@
- 
- libIDL_la_SOURCES	= parser.c parser.h lexer.c \
- 			  ns.c util.c util.h rename.h
--libIDL_la_LDFLAGS	= -version-info 5:8:5
-+libIDL_la_LDFLAGS	= -version-info 1:0:0
- 
- tstidl_SOURCES		= tstidl.c
- tstidl_LDFLAGS		= -static
-@@ -145,7 +145,7 @@
- SOURCES = $(libIDL_la_SOURCES) $(tstidl_SOURCES)
- OBJECTS = $(libIDL_la_OBJECTS) $(tstidl_OBJECTS)
+--- src/IIOP/Makefile.in.orig	Mon Feb 15 13:00:01 1999
++++ src/IIOP/Makefile.in	Thu Feb 18 22:36:39 1999
+@@ -109,7 +109,7 @@
  
--all: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS)
- 
- .SUFFIXES:
- .SUFFIXES: .S .c .dvi .info .lo .o .ps .s .texi .texinfo .txi
---- src/IIOP/Makefile.in.orig	Wed Dec 16 10:41:43 1998
-+++ src/IIOP/Makefile.in	Wed Dec 23 17:22:38 1998
-@@ -117,7 +117,7 @@
- 	iiop-encoders.h \
- 	iiop-endian.h
+ BUILT_SOURCES = $(libwrap_files)
  
 -libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 +libIIOP_la_LDFLAGS = -version-info 1:0:0
  
  EXTRA_DIST = IIOP-design.txt
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- src/ORBitutil/Makefile.in.orig	Wed Dec 16 10:41:42 1998
-+++ src/ORBitutil/Makefile.in	Wed Dec 23 17:22:57 1998
-@@ -110,7 +110,7 @@
- 	util.h \
- 	compat.h
+--- src/ORBitutil/Makefile.in.orig	Mon Feb 15 13:00:00 1999
++++ src/ORBitutil/Makefile.in	Thu Feb 18 22:36:39 1999
+@@ -102,7 +102,7 @@
+ libORBitutilinclude_HEADERS =  	basic_types.h 	thread-safety.h 	trace.h 	util.h 	compat.h
+ 
  
 -libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 +libORBitutil_la_LDFLAGS = -version-info 1:0:0
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
  CONFIG_CLEAN_FILES = 
---- src/orb/Makefile.in.orig	Wed Dec 16 10:41:40 1998
-+++ src/orb/Makefile.in	Wed Dec 23 17:23:17 1998
-@@ -164,7 +164,7 @@
- INTF_REP = $(top_srcdir)/src/daemons/interface_repository
- INTF_OBJ = ../daemons/interface_repository
+--- src/orb/Makefile.in.orig	Mon Feb 15 12:59:59 1999
++++ src/orb/Makefile.in	Thu Feb 18 22:36:39 1999
+@@ -106,7 +106,7 @@
+ IDL = $(top_builddir)/src/idl-compiler/orbit-idl
+ IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
  
 -libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 +libORBit_la_LDFLAGS = -version-info 1:0:0
  libORBit_la_LIBADD = $(GLIB_LIBS) -lm
  
- BUILT_SOURCES = \
---- src/services/name/Makefile.in.orig	Wed Dec 16 10:41:47 1998
-+++ src/services/name/Makefile.in	Wed Dec 23 17:57:37 1998
-@@ -107,7 +107,7 @@
- 	LName.pidl
+ BUILT_SOURCES =  	interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
+--- src/services/name/Makefile.in.orig	Mon Feb 15 13:00:03 1999
++++ src/services/name/Makefile.in	Thu Feb 18 22:40:23 1999
+@@ -104,7 +104,7 @@
+ libORBitservicesinclude_HEADERS =  	CosNaming.h								CosNaming_impl.h							CosNaming.idl								LName.pidl
+ 
+ 
+-libORBitCosNaming_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libORBitCosNaming_la_LDFLAGS =  	-version-info 1:0:0
  
- libORBitCosNaming_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+	-version-info 1:0:0
  
  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@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ NM = @NM@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+@@ -101,7 +101,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 1:0:0
  
+ tstidl_SOURCES = tstidl.c
+ tstidl_LDFLAGS = -static
+@@ -478,7 +478,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-info \
+ 		uninstall-pkgincludeHEADERS
+ uninstall: uninstall-am
+-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
++all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS)
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install