3 files changed, 57 insertions, 32 deletions

diff --git a/devel/ORBacus/Makefile b/devel/ORBacus/Makefile
index bb965f04bec2..52bcd26d6a4c 100644
--- a/devel/ORBacus/Makefile
+++ b/devel/ORBacus/Makefile
@@ -3,19 +3,27 @@
 # Whom:			ejc@bazzle.com
 # Version required:	3.0
 #
-# $Id: Makefile,v 1.14 1998/12/22 07:33:27 asami Exp $
+# $Id: Makefile,v 1.15 1998/12/22 07:35:00 asami Exp $
 #
 
-DISTNAME=	OB-3.0
-PKGNAME=	ORBacus-3.0
+DISTNAME=	OB-3.1.1
+PKGNAME=	ORBacus-3.1.1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.ooc.com/pub/OB/3.0/
+MASTER_SITES=	ftp://ftp.ooc.com/pub/OB/3.1/
 
 MAINTAINER=	ejc@bazzle.com
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+LIBSTDC=	${PREFIX}/lib/gcc-lib/i386-unknown-freebsdelf${OSREL}/2.8.1/libstdc++.a
+.else
+LIBSTDC=	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd${OSREL}/2.8.1/libstdc++.a
+.endif
+
 BUILD_DEPENDS=  gcc28:${PORTSDIR}/lang/gcc28 \
 		g++28:${PORTSDIR}/lang/gcc28 \
-		${PREFIX}/lib/gcc-lib/i386-unknown-freebsd${OSREL}/2.8.1/libstdc++.a:${PORTSDIR}/lang/glibstdc++28
+		${LIBSTDC}:${PORTSDIR}/lang/glibstdc++28
 
 USE_XLIB=	yes
 HAS_CONFIGURE=	yes
diff --git a/devel/ORBacus/distinfo b/devel/ORBacus/distinfo
index 9528cadf70c8..bdeb83ea32a5 100644
--- a/devel/ORBacus/distinfo
+++ b/devel/ORBacus/distinfo
@@ -1 +1 @@
-MD5 (OB-3.0.tar.gz) = 30ac9e6e731985875ec0295afc5d0d5e
+MD5 (OB-3.1.1.tar.gz) = 6f1046d51d2cc393e36fca4b3d81a927
diff --git a/devel/ORBacus/pkg-plist b/devel/ORBacus/pkg-plist
index ebfcf71b6a33..0595069c7361 100644
--- a/devel/ORBacus/pkg-plist
+++ b/devel/ORBacus/pkg-plist
@@ -1,17 +1,49 @@
+bin/eventserv
+bin/hidl
+bin/idl
+bin/idlcpp
+bin/iordump
+bin/irdel
+bin/irfeed
+bin/irgen
+bin/irserv
+bin/jidl
+bin/nameserv
+bin/propserv
+bin/ridl
 include/OB/Any.h
 include/OB/BOA.h
 include/OB/Basic.h
 include/OB/CORBA.h
 include/OB/Config.h
 include/OB/Context.h
+include/OB/CosEventChannelAdmin.h
+include/OB/CosEventChannelAdmin_skel.h
+include/OB/CosEventComm.h
+include/OB/CosEventComm_skel.h
+include/OB/CosNaming.h
+include/OB/CosNaming_skel.h
+include/OB/CosProperty.h
+include/OB/CosProperty_impl.h
+include/OB/CosProperty_skel.h
+include/OB/CosTypedEventChannelAdmin.h
+include/OB/CosTypedEventChannelAdmin_skel.h
+include/OB/CosTypedEventComm.h
+include/OB/CosTypedEventComm_skel.h
 include/OB/Current.h
 include/OB/DII.h
 include/OB/DSI.h
 include/OB/Declarations.h
 include/OB/DynAny.h
+include/OB/Dynamic.h
 include/OB/Environment.h
 include/OB/Except.h
+include/OB/ExtNaming.h
+include/OB/ExtNaming_skel.h
 include/OB/GIOP.h
+include/OB/Hashers.h
+include/OB/Hashtable.h
+include/OB/HashtableI.h
 include/OB/IIOP.h
 include/OB/IOP.h
 include/OB/ImplRep.h
@@ -32,6 +64,7 @@ include/OB/Object_skel.h
 include/OB/Policy.h
 include/OB/PolicyManager.h
 include/OB/Principal.h
+include/OB/Properties.h
 include/OB/Reactor.h
 include/OB/TCKind.h
 include/OB/Template.h
@@ -39,32 +72,16 @@ include/OB/TemplateI.h
 include/OB/Timer.h
 include/OB/TypeCode.h
 include/OB/Util.h
+include/OB/Windows.h
 include/OB/X11.h
-include/OB/CosNaming.h
-include/OB/CosNaming_skel.h
-include/OB/CosProperty.h
-include/OB/CosProperty_skel.h
-include/OB/CosEventComm.h
-include/OB/CosEventComm_skel.h
-include/OB/CosEventChannelAdmin.h
-include/OB/CosEventChannelAdmin_skel.h
-bin/idl
-bin/jidl
-bin/hidl
-bin/ridl
-bin/irserv
-bin/irfeed
-bin/irdel
-bin/irgen
-bin/idlcpp
-bin/iordump
-bin/nameserv
-bin/propserv
-bin/eventserv
-lib/libOBTest.a
-lib/libOB.a
-lib/libOBX11.a
-lib/libIDL.a
+lib/libCosEvent.a
 lib/libCosNaming.a
 lib/libCosProperty.a
-lib/libCosEvent.a
+lib/libIDL.a
+lib/libOB.a
+lib/libOBTest.a
+lib/libOBX11.a
+man/man1/idl.1.gz
+share/doc/ORBacus/LICENSE
+@dirrm share/doc/ORBacus
+@dirrm include/OB