Upgrade to 0.3.0, and convert ORBit to elf.

4 files changed, 68 insertions, 23 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 3a6d62b1f416..daaf2b6fe62b 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   orbit
-# Version required:		0.2.1
+# Version required:		0.3.0
 # Date Created:			16 Aug 1998
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
-# $Id: Makefile,v 1.3 1998/08/20 02:32:50 asami Exp $
+# $Id: Makefile,v 1.4 1998/09/22 23:31:11 asami Exp $
 #
 
-DISTNAME=	ORBit-0.2.1
+DISTNAME=	ORBit-0.3.0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gnome.org/pub/ORBit/
 
@@ -21,6 +21,6 @@ CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS= --disable-indent
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index 684cd75daaa7..d2ae92e6d576 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.2.1.tar.gz) = 0cb385f17dc6cf80b450bf0fb2256aeb
+MD5 (ORBit-0.3.0.tar.gz) = b714070c52eed2a57189ed2d56f88e75
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index a68110b0d462..d6af06dc6eb4 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -1,14 +1,53 @@
---- src/ORBitutil/machine_endian.awk.orig	Thu Aug 20 09:50:40 1998
-+++ src/ORBitutil/machine_endian.awk	Thu Aug 20 09:51:22 1998
-@@ -10,8 +10,10 @@
-   if (def["HAVE_MACHINE_ENDIAN_H"] || def["HAVE_ENDIAN_H"] || def["HAVE_SYS_MACHINE_H"] || def["HAVE_SYS_ENDIAN_H"]) {
-     if (def["HAVE_MACHINE_ENDIAN_H"])
-       print "#include <machine/endian.h>";
--    if (def["HAVE_MACHINE_TYPES_H"])
-+    if (def["HAVE_MACHINE_TYPES_H"]) {
-+      print "#include <sys/types.h>";
-       print "#include <machine/types.h>";
-+    }
-     if (def["HAVE_SYS_MACHINE_H"])
-       print "#include <sys/machine.h>";
-     if (def["HAVE_SYS_ENDIAN_H"])
+--- libIDL/Makefile.in.orig	Mon Sep 21 13:50:12 1998
++++ libIDL/Makefile.in	Wed Sep 23 23:18:22 1998
+@@ -95,7 +95,7 @@
+ noinst_PROGRAMS		= tstidl
+ 
+ libIDL_la_SOURCES	= parser.c parser.h lexer.c ns.c util.c util.h rename.h
+-libIDL_la_LDFLAGS	= -version-info 5:0:5
++libIDL_la_LDFLAGS	= -version-info 0:3:0
+ 
+ tstidl_SOURCES		= tstidl.c
+ tstidl_LDADD		= libIDL.la
+@@ -446,7 +446,7 @@
+ install-exec: install-libLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+ 
+-install-data: install-info-am install-pkgincludeHEADERS
++install-data: install-pkgincludeHEADERS
+ 	@$(NORMAL_INSTALL)
+ 
+ install: install-exec install-data all
+--- src/IIOP/Makefile.in.orig	Wed Sep 23 21:35:34 1998
++++ src/IIOP/Makefile.in	Wed Sep 23 21:35:48 1998
+@@ -117,7 +117,7 @@
+ 	iiop-encoders.h \
+ 	iiop-endian.h
+ 
+-libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libIIOP_la_LDFLAGS = -version-info 0:3:0
+ 
+ EXTRA_DIST = IIOP-design.txt
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+--- src/ORBitutil/Makefile.in.orig	Wed Sep 23 21:35:00 1998
++++ src/ORBitutil/Makefile.in	Wed Sep 23 21:35:14 1998
+@@ -110,7 +110,7 @@
+ 	util.h \
+ 	compat.h
+ 
+-libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libORBitutil_la_LDFLAGS = -version-info 0:3:0
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES = 
+--- src/orb/Makefile.in.orig	Wed Sep 23 21:36:05 1998
++++ src/orb/Makefile.in	Wed Sep 23 21:36:21 1998
+@@ -190,7 +190,7 @@
+ 	orbit_poa_type.h \
+ 	orbit_types.h
+ 
+-libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libORBit_la_LDFLAGS = -version-info 0:3:0
+ libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index 5ba6341ca0d5..d29c1118bd36 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -1,5 +1,7 @@
+bin/naming-client
 bin/orbit-config
 bin/orbit-idl
+bin/orbit-naming-server
 include/IIOP/IIOP-config.h
 include/IIOP/IIOP-types.h
 include/IIOP/IIOP.h
@@ -8,7 +10,6 @@ include/IIOP/iiop-encoders.h
 include/IIOP/iiop-endian.h
 include/ORBitutil/basic_types.h
 include/ORBitutil/compat.h
-include/ORBitutil/machine_endian.h
 include/ORBitutil/thread-safety.h
 include/ORBitutil/trace.h
 include/ORBitutil/util.h
@@ -51,18 +52,23 @@ include/orb/poa.h
 include/orb/sequences.h
 include/orb/typecode.h
 lib/libIDL.a
+lib/libIDL.la
+lib/libIDL.so
+lib/libIDL.so.0.3
 lib/libIIOP.a
 lib/libIIOP.la
 lib/libIIOP.so
-lib/libIIOP.so.2.1
+lib/libIIOP.so.0.3
 lib/libORBit.a
 lib/libORBit.la
 lib/libORBit.so
-lib/libORBit.so.2.1
+lib/libORBit.so.0.3
 lib/libORBitutil.a
 lib/libORBitutil.la
 lib/libORBitutil.so
-lib/libORBitutil.so.2.1
+lib/libORBitutil.so.0.3
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm include/IIOP
 @dirrm include/ORBitutil
 @dirrm include/libIDL