From bec03a397f921ba17989c2ecc780dba076a59299 Mon Sep 17 00:00:00 2001 From: rh Date: Tue, 15 Jan 2002 23:52:11 +0000 Subject: Update ORBit to 0.5.13. Changes are bugfixes and minor interface enhancements. --- net/ORBit/Makefile | 6 +- net/ORBit/PLIST | 142 +++++++++++++++++++++++---------------------- net/ORBit/buildlink.mk | 16 ++--- net/ORBit/distinfo | 10 ++-- net/ORBit/patches/patch-aa | 4 +- net/ORBit/patches/patch-ak | 12 ++-- 6 files changed, 96 insertions(+), 94 deletions(-) (limited to 'net/ORBit') diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 8ef7848f2b9..33779283d54 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.71 2001/12/28 23:19:46 abs Exp $ +# $NetBSD: Makefile,v 1.72 2002/01/15 23:52:11 rh Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} -PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/ORBit/} -EXTRACT_SUFX= .tar.bz2 MAINTAINER= wiz@netbsd.org HOMEPAGE= http://www.gnome.org/ @@ -28,7 +26,7 @@ CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 # for DISTNAME, PKGNAME, and PLIST ORBIT_MAJOR= 5 -ORBIT_MINOR= 8 +ORBIT_MINOR= 13 PLIST_SUBST+= ORBIT_MAJOR=${ORBIT_MAJOR} ORBIT_MINOR=${ORBIT_MINOR} INFO_FILES= libIDL.info diff --git a/net/ORBit/PLIST b/net/ORBit/PLIST index f77fbbac583..dc432e60e45 100644 --- a/net/ORBit/PLIST +++ b/net/ORBit/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:42 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/01/15 23:52:11 rh Exp $ bin/libIDL-config bin/name-client bin/old-name-server @@ -7,69 +7,63 @@ bin/orbit-event-server bin/orbit-idl bin/orbit-ird bin/orbit-name-server -include/IIOP/IIOP-config.h -include/IIOP/IIOP-types.h -include/IIOP/IIOP.h -include/IIOP/giop-msg-buffer.h -include/IIOP/iiop-encoders.h -include/IIOP/iiop-endian.h -include/ORBitservices/CosEventChannel.idl -include/ORBitservices/CosEventComm.idl -include/ORBitservices/CosNaming.h -include/ORBitservices/CosNaming.idl -include/ORBitservices/CosNaming_impl.h -include/ORBitservices/CosTypedEventChannel.idl -include/ORBitservices/CosTypedEventComm.idl -include/ORBitservices/LName.pidl -include/ORBitutil/basic_types.h -include/ORBitutil/compat.h -include/ORBitutil/orbit-os-config.h -include/ORBitutil/os-feature-alloca.h -include/ORBitutil/os-specifics.h -include/ORBitutil/thread-safety.h -include/ORBitutil/trace.h -include/ORBitutil/util.h -include/libIDL/IDL.h -include/orb/allocator-defs.h -include/orb/allocators.h -include/orb/cdr.h -include/orb/corba_any.h -include/orb/corba_any_proto.h -include/orb/corba_any_type.h -include/orb/corba_basic_sequences_type.h -include/orb/corba_context.h -include/orb/corba_env.h -include/orb/corba_env_type.h -include/orb/corba_object.h -include/orb/corba_object_type.h -include/orb/corba_orb.h -include/orb/corba_orb_type.h -include/orb/corba_portableserver.h -include/orb/corba_portableserver_type.h -include/orb/corba_sequences.h -include/orb/corba_sequences_type.h -include/orb/corba_typecode.h -include/orb/corba_typecode_type.h -include/orb/dii.h -include/orb/dynany.h -include/orb/env.h -include/orb/interface_repository.h -include/orb/iop.h -include/orb/ir.h -include/orb/options.h -include/orb/orb.h -include/orb/orbit.h -include/orb/orbit_config.h -include/orb/orbit_object.h -include/orb/orbit_object_type.h -include/orb/orbit_poa.h -include/orb/orbit_poa_type.h -include/orb/orbit_typecode.h -include/orb/orbit_types.h -include/orb/poa.h -include/orb/sequences.h -include/orb/typecode.h -include/orbit-idl2.h +include/libIDL-1.0/libIDL/IDL.h +include/orbit-1.0/IIOP/IIOP-config.h +include/orbit-1.0/IIOP/IIOP-types.h +include/orbit-1.0/IIOP/IIOP.h +include/orbit-1.0/IIOP/giop-msg-buffer.h +include/orbit-1.0/IIOP/iiop-encoders.h +include/orbit-1.0/IIOP/iiop-endian.h +include/orbit-1.0/ORBitservices/CosNaming.h +include/orbit-1.0/ORBitservices/CosNaming_impl.h +include/orbit-1.0/ORBitutil/basic_types.h +include/orbit-1.0/ORBitutil/compat.h +include/orbit-1.0/ORBitutil/orbit-os-config.h +include/orbit-1.0/ORBitutil/os-feature-alloca.h +include/orbit-1.0/ORBitutil/os-specifics.h +include/orbit-1.0/ORBitutil/thread-safety.h +include/orbit-1.0/ORBitutil/trace.h +include/orbit-1.0/ORBitutil/util.h +include/orbit-1.0/orb/allocator-defs.h +include/orbit-1.0/orb/allocators.h +include/orbit-1.0/orb/cdr.h +include/orbit-1.0/orb/corba_any.h +include/orbit-1.0/orb/corba_any_proto.h +include/orbit-1.0/orb/corba_any_type.h +include/orbit-1.0/orb/corba_basic_sequences_type.h +include/orbit-1.0/orb/corba_context.h +include/orbit-1.0/orb/corba_env.h +include/orbit-1.0/orb/corba_env_type.h +include/orbit-1.0/orb/corba_object.h +include/orbit-1.0/orb/corba_object_type.h +include/orbit-1.0/orb/corba_orb.h +include/orbit-1.0/orb/corba_orb_type.h +include/orbit-1.0/orb/corba_portableserver.h +include/orbit-1.0/orb/corba_portableserver_type.h +include/orbit-1.0/orb/corba_sequences.h +include/orbit-1.0/orb/corba_sequences_type.h +include/orbit-1.0/orb/corba_typecode.h +include/orbit-1.0/orb/corba_typecode_type.h +include/orbit-1.0/orb/dii.h +include/orbit-1.0/orb/dynany.h +include/orbit-1.0/orb/env.h +include/orbit-1.0/orb/interface_repository.h +include/orbit-1.0/orb/iop.h +include/orbit-1.0/orb/ir.h +include/orbit-1.0/orb/options.h +include/orbit-1.0/orb/orb.h +include/orbit-1.0/orb/orbit.h +include/orbit-1.0/orb/orbit_config.h +include/orbit-1.0/orb/orbit_object.h +include/orbit-1.0/orb/orbit_object_type.h +include/orbit-1.0/orb/orbit_poa.h +include/orbit-1.0/orb/orbit_poa_type.h +include/orbit-1.0/orb/orbit_typecode.h +include/orbit-1.0/orb/orbit_types.h +include/orbit-1.0/orb/poa.h +include/orbit-1.0/orb/sequences.h +include/orbit-1.0/orb/typecode.h +include/orbit-1.0/orbit-idl2.h @unexec install-info --delete %D/info/libIDL.info %D/info/dir info/libIDL.info @exec install-info %D/info/libIDL.info %D/info/dir @@ -105,9 +99,19 @@ lib/pkgconfig/ORBit.pc lib/pkgconfig/libIDL.pc share/aclocal/ORBit.m4 share/aclocal/libIDL.m4 +share/idl/orbit-1.0/CosEventChannel.idl +share/idl/orbit-1.0/CosEventComm.idl +share/idl/orbit-1.0/CosNaming.idl +share/idl/orbit-1.0/CosTypedEventChannel.idl +share/idl/orbit-1.0/CosTypedEventComm.idl +share/idl/orbit-1.0/LName.pidl +@dirrm share/idl/orbit-1.0 +@dirrm share/idl @unexec rmdir %D/lib/pkgconfig 2>/dev/null || true -@dirrm include/orb -@dirrm include/libIDL -@dirrm include/ORBitutil -@dirrm include/ORBitservices -@dirrm include/IIOP +@dirrm include/orbit-1.0/orb +@dirrm include/orbit-1.0/ORBitutil +@dirrm include/orbit-1.0/ORBitservices +@dirrm include/orbit-1.0/IIOP +@dirrm include/orbit-1.0 +@dirrm include/libIDL-1.0/libIDL +@dirrm include/libIDL-1.0 diff --git a/net/ORBit/buildlink.mk b/net/ORBit/buildlink.mk index 692614af300..cac3d47cef3 100644 --- a/net/ORBit/buildlink.mk +++ b/net/ORBit/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:52 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.9 2002/01/15 23:52:11 rh Exp $ # # This Makefile fragment is included by packages that use ORBit. # @@ -17,17 +17,17 @@ ORBIT_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.1 +BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.12 DEPENDS+= ${BUILDLINK_DEPENDS.ORBit}:../../net/ORBit EVAL_PREFIX+= BUILDLINK_PREFIX.ORBit=ORBit BUILDLINK_PREFIX.ORBit_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.ORBit= include/IIOP/* -BUILDLINK_FILES.ORBit+= include/ORBitservices/* -BUILDLINK_FILES.ORBit+= include/ORBitutil/* -BUILDLINK_FILES.ORBit+= include/libIDL/* -BUILDLINK_FILES.ORBit+= include/orb/* -BUILDLINK_FILES.ORBit+= include/orbit-idl2.h +BUILDLINK_FILES.ORBit+= include/libIDL-1.0/libIDL/* +BUILDLINK_FILES.ORBit= include/orbit-1.0/IIOP/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/ORBitservices/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/ORBitutil/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/orb/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/orbit-idl2.h BUILDLINK_FILES.ORBit+= lib/libIDLConf.sh BUILDLINK_FILES.ORBit+= lib/libIDL.* BUILDLINK_FILES.ORBit+= lib/libIIOP.* diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo index ff3304dbe82..4cc83a68e2b 100644 --- a/net/ORBit/distinfo +++ b/net/ORBit/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2001/10/04 19:25:25 rh Exp $ +$NetBSD: distinfo,v 1.7 2002/01/15 23:52:11 rh Exp $ -SHA1 (ORBit-0.5.8.tar.bz2) = 89b7d79f44be59ab029b126c60e79143597db663 -Size (ORBit-0.5.8.tar.bz2) = 850158 bytes -SHA1 (patch-aa) = 84334e6a876ccb6d8cd01d74670b0646fc133518 +SHA1 (ORBit-0.5.13.tar.gz) = ea8d790b040356e90fd81aa98313c2c1b08f3bcf +Size (ORBit-0.5.13.tar.gz) = 1183657 bytes +SHA1 (patch-aa) = ecef5843b4d749ccd8b51e8c7cd5cc96bac00a98 SHA1 (patch-ab) = 1a8d5c433941930d558a408ebfa2ba4a631bafea SHA1 (patch-ac) = 7fddddf08e9f35e1e506be3f71c5925d62ae760c SHA1 (patch-ad) = 688920ba423aa2994d9e2e6540f8738305cb7fd9 @@ -10,6 +10,6 @@ SHA1 (patch-ae) = f6e8fff6047b359ab92c38c0ae2293655394ea04 SHA1 (patch-af) = fe927125647db3404c92abfd7a3a4ddea8e3b760 SHA1 (patch-ag) = 875e83a597ab39d57abcfd9259d8ec15707ea45c SHA1 (patch-ai) = a5ec30692a14fb6bef617f262b6bb1fdd8903436 -SHA1 (patch-ak) = ac2531f892e52ad3c91f18d3d0e91d3e22175217 +SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de SHA1 (patch-al) = 0bba5ec17f8b663f1ca9427538bac238411321a0 SHA1 (patch-am) = c959b34edc150c1d503d2bb294f072e885daed58 diff --git a/net/ORBit/patches/patch-aa b/net/ORBit/patches/patch-aa index b574f54425a..3b67b4438da 100644 --- a/net/ORBit/patches/patch-aa +++ b/net/ORBit/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2001/08/28 18:37:55 skrll Exp $ +$NetBSD: patch-aa,v 1.10 2002/01/15 23:52:11 rh Exp $ ---- popt/configure.orig Tue Aug 28 19:21:53 2001 +--- popt/configure.orig Mon Jan 7 19:10:01 2002 +++ popt/configure @@ -2277,13 +2277,6 @@ echo "$ac_t""no" 1>&6 diff --git a/net/ORBit/patches/patch-ak b/net/ORBit/patches/patch-ak index 6f678ed75d5..77639ad5b99 100644 --- a/net/ORBit/patches/patch-ak +++ b/net/ORBit/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.3 2000/05/30 19:13:19 drochner Exp $ +$NetBSD: patch-ak,v 1.4 2002/01/15 23:52:11 rh Exp $ ---- orbit-config.in.orig Fri Oct 8 06:49:07 1999 -+++ orbit-config.in Tue May 30 16:23:19 2000 +--- orbit-config.in.orig Thu Sep 20 03:09:00 2001 ++++ orbit-config.in @@ -87,7 +87,7 @@ ;; client|server) - the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm" + the_libs="$the_libs -L$libdir -Wl,-R$libdir -lORBit -lIIOP -lwrap -lORBitutil `glib-config --libs` @LIBS@ -lm" - the_flags="$the_flags `glib-config --cflags` -I$includedir " - ;; - + the_flags="$the_flags `glib-config --cflags` " + test "x$includedir" = "x/usr/include" \ + || the_flags="$the_flags -I$includedir " -- cgit v1.2.3