diff options
-rw-r--r-- | corba/ORBit/Makefile | 11 | ||||
-rw-r--r-- | corba/ORBit/files/md5 | 4 | ||||
-rw-r--r-- | corba/ORBit/patches/patch-ae | 22 | ||||
-rw-r--r-- | corba/ORBit/patches/patch-af | 16 | ||||
-rw-r--r-- | corba/ORBit/patches/patch-ag | 23 | ||||
-rw-r--r-- | corba/ORBit/pkg/PLIST | 33 | ||||
-rw-r--r-- | net/ORBit/Makefile | 11 | ||||
-rw-r--r-- | net/ORBit/files/md5 | 4 | ||||
-rw-r--r-- | net/ORBit/patches/patch-ae | 22 | ||||
-rw-r--r-- | net/ORBit/patches/patch-af | 16 | ||||
-rw-r--r-- | net/ORBit/patches/patch-ag | 23 | ||||
-rw-r--r-- | net/ORBit/pkg/PLIST | 33 |
12 files changed, 134 insertions, 84 deletions
diff --git a/corba/ORBit/Makefile b/corba/ORBit/Makefile index 7d5727cb9a9..5de7203fd2b 100644 --- a/corba/ORBit/Makefile +++ b/corba/ORBit/Makefile @@ -1,16 +1,19 @@ -# $NetBSD: Makefile,v 1.7 1998/11/21 17:02:16 tron Exp $ +# $NetBSD: Makefile,v 1.8 1998/12/19 12:31:46 tron Exp $ # -DISTNAME= ORBit-0.3.0 +DISTNAME= ORBit-0.3.90 CATEGORIES= corba -MASTER_SITES= ftp://ftp.gnome.org/pub/GNOME/ORBit/ +MASTER_SITES= ftp://ftp.gnome.org/pub/GNOME/ORBit/ \ + ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ -DEPENDS+= glib-1.1.4:../../devel/glib +DEPENDS+= glib-1.1.9:../../devel/glib DEPENDS+= gindent-1.9.1:../../devel/gindent +CONFLICTS= ORBit-* + GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/corba/ORBit/files/md5 b/corba/ORBit/files/md5 index eeeeda41780..c2959c539ae 100644 --- a/corba/ORBit/files/md5 +++ b/corba/ORBit/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/10/05 14:02:07 agc Exp $ +$NetBSD: md5,v 1.3 1998/12/19 12:31:47 tron Exp $ -MD5 (ORBit-0.3.0.tar.gz) = b714070c52eed2a57189ed2d56f88e75 +MD5 (ORBit-0.3.90.tar.gz) = cafc78094ce82d7366a3c490225bb1fa diff --git a/corba/ORBit/patches/patch-ae b/corba/ORBit/patches/patch-ae index 68f6ea470d4..9f1274397ad 100644 --- a/corba/ORBit/patches/patch-ae +++ b/corba/ORBit/patches/patch-ae @@ -1,10 +1,20 @@ -$NetBSD: patch-ae,v 1.1 1998/08/20 22:07:25 agc Exp $ +$NetBSD: patch-ae,v 1.2 1998/12/19 12:31:47 tron Exp $ -make a placeholder Makefile.in so sed doesn't puke during configure stage - ---- /dev/null Wed Aug 19 14:32:56 1998 -+++ src/services/name/Makefile.in Wed Aug 19 14:34:41 1998 -@@ -0,0 +1,3 @@ +--- src/services/name/Makefile.in.orig Wed Dec 16 03:41:47 1998 ++++ src/services/name/Makefile.in Sat Dec 19 12:55:42 1998 +@@ -1,3 +1,6 @@ +# NetBSD +# +# There might as well be something here. + # Makefile.in generated automatically by automake 1.3 from Makefile.am + + # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +@@ -768,7 +771,7 @@ + + + $(CosNaming_built): CosNaming.idl $(srcdir)/LName.h $(IDL) +- $(IDL) $< ++ $(IDL) CosNaming.idl + cat $(srcdir)/LName.h >>CosNaming.h + + dist-hook: diff --git a/corba/ORBit/patches/patch-af b/corba/ORBit/patches/patch-af index cdd10aef1ec..14d749ce0c0 100644 --- a/corba/ORBit/patches/patch-af +++ b/corba/ORBit/patches/patch-af @@ -1,18 +1,16 @@ -$NetBSD: patch-af,v 1.1 1998/09/04 22:00:46 agc Exp $ +$NetBSD: patch-af,v 1.2 1998/12/19 12:31:47 tron Exp $ -Use GNU indent, not NetBSD indent(1). - ---- src/idl-compiler/orbit-c-backend.c 1998/09/04 21:28:47 1.1 -+++ src/idl-compiler/orbit-c-backend.c 1998/09/04 21:29:03 +--- src/idl-compiler/orbit-c-backend.c.orig Wed Dec 16 02:17:18 1998 ++++ src/idl-compiler/orbit-c-backend.c Sat Dec 19 12:54:49 1998 @@ -18,9 +18,9 @@ #ifndef HAVE_INDENT #define INDENT "cat" #elif HAVE_INDENT_KR --#define INDENT "indent -kr -i8 -bad -fca -sc -sob" -+#define INDENT "gindent -kr -i8 -bad -fca -sc -sob" +-#define INDENT "indent -npro -kr -i8 -bad -fca -sc -sob" ++#define INDENT "gindent -npro -kr -i8 -bad -fca -sc -sob" #else --#define INDENT "indent -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp" -+#define INDENT "gindent -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp" +-#define INDENT "indent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp" ++#define INDENT "gindent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp" #endif /* HAVE_INDENT */ void diff --git a/corba/ORBit/patches/patch-ag b/corba/ORBit/patches/patch-ag index 1c1a6fa7407..aa6b88b7217 100644 --- a/corba/ORBit/patches/patch-ag +++ b/corba/ORBit/patches/patch-ag @@ -1,16 +1,13 @@ -$NetBSD: patch-ag,v 1.1 1998/10/05 14:02:07 agc Exp $ +$NetBSD: patch-ag,v 1.2 1998/12/19 12:31:47 tron Exp $ -Name the idl file explicitly, or orbit-idl complains (this may -be a gmake problem). - ---- src/services/name/Makefile.in 1998/10/05 13:33:08 1.1 -+++ src/services/name/Makefile.in 1998/10/05 13:33:21 -@@ -510,7 +510,7 @@ +--- src/daemons/interface_repository/Makefile.in.orig Wed Dec 16 03:41:51 1998 ++++ src/daemons/interface_repository/Makefile.in Sat Dec 19 12:56:24 1998 +@@ -439,7 +439,7 @@ + - name.h name-common.c name-stubs.c name-skels.c: name.idl \ - $(top_builddir)/src/idl-compiler/orbit-idl -- $(top_builddir)/src/idl-compiler/orbit-idl $< -+ $(top_builddir)/src/idl-compiler/orbit-idl name.idl + $(orbit_ird_built): interface_repository.idl $(IDL) +- $(IDL) $< ++ $(IDL) interface_repository.idl - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. + dist-hook: + cd $(distdir); rm -f $(BUILD_SOURCES) diff --git a/corba/ORBit/pkg/PLIST b/corba/ORBit/pkg/PLIST index e846e9d999e..19d34d3ee5b 100644 --- a/corba/ORBit/pkg/PLIST +++ b/corba/ORBit/pkg/PLIST @@ -1,7 +1,17 @@ -@comment $NetBSD: PLIST,v 1.3 1998/11/12 23:03:39 frueauf Exp $ -lib/libIDL.so.5.0 +@comment $NetBSD: PLIST,v 1.4 1998/12/19 12:31:48 tron Exp $ +bin/name-client +bin/old-name-server +bin/orbit-idl +bin/orbit-config +bin/orbit-event-server +bin/orbit-ird +bin/orbit-name-server +lib/libIDL.so.5.7 lib/libIDL.la lib/libIDL.a +lib/libORBitCosNaming.so.3.0 +lib/libORBitCosNaming.la +lib/libORBitCosNaming.a lib/libORBitutil.so.3.0 lib/libORBitutil.la lib/libORBitutil.a @@ -11,11 +21,16 @@ lib/libIIOP.a lib/libORBit.so.3.0 lib/libORBit.la lib/libORBit.a -bin/orbit-idl -bin/naming-client -bin/orbit-naming-server -bin/orbit-config +lib/libname-server.a include/libIDL/IDL.h +include/ORBitservices/CosNaming.h +include/ORBitservices/CosNaming_impl.h +include/ORBitservices/CosNaming.idl +include/ORBitservices/LName.pidl +include/ORBitservices/CosEventComm.idl +include/ORBitservices/CosEventChannel.idl +include/ORBitservices/CosTypedEventComm.idl +include/ORBitservices/CosTypedEventChannel.idl include/ORBitutil/basic_types.h include/ORBitutil/thread-safety.h include/ORBitutil/trace.h @@ -27,9 +42,11 @@ include/IIOP/IIOP.h include/IIOP/giop-msg-buffer.h include/IIOP/iiop-encoders.h include/IIOP/iiop-endian.h +include/orb/corba_any_proto.h +include/orb/orbit_typecode.h +include/orb/interface_repository.h include/orb/allocator-defs.h include/orb/allocators.h -include/orb/boa.h include/orb/cdr.h include/orb/dii.h include/orb/dynany.h @@ -49,7 +66,6 @@ include/orb/corba_any_type.h include/orb/corba_basic_sequences_type.h include/orb/corba_env.h include/orb/corba_env_type.h -include/orb/corba_ir.h include/orb/corba_object.h include/orb/corba_object_type.h include/orb/corba_orb.h @@ -69,5 +85,6 @@ info/libIDL.info @exec %D/bin/install-info %D/info/libIDL.info %D/info/libIDL.info @dirrm include/libIDL @dirrm include/ORBitutil +@dirrm include/ORBitservices @dirrm include/IIOP @dirrm include/orb diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 7d5727cb9a9..5de7203fd2b 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,16 +1,19 @@ -# $NetBSD: Makefile,v 1.7 1998/11/21 17:02:16 tron Exp $ +# $NetBSD: Makefile,v 1.8 1998/12/19 12:31:46 tron Exp $ # -DISTNAME= ORBit-0.3.0 +DISTNAME= ORBit-0.3.90 CATEGORIES= corba -MASTER_SITES= ftp://ftp.gnome.org/pub/GNOME/ORBit/ +MASTER_SITES= ftp://ftp.gnome.org/pub/GNOME/ORBit/ \ + ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ -DEPENDS+= glib-1.1.4:../../devel/glib +DEPENDS+= glib-1.1.9:../../devel/glib DEPENDS+= gindent-1.9.1:../../devel/gindent +CONFLICTS= ORBit-* + GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/net/ORBit/files/md5 b/net/ORBit/files/md5 index eeeeda41780..c2959c539ae 100644 --- a/net/ORBit/files/md5 +++ b/net/ORBit/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/10/05 14:02:07 agc Exp $ +$NetBSD: md5,v 1.3 1998/12/19 12:31:47 tron Exp $ -MD5 (ORBit-0.3.0.tar.gz) = b714070c52eed2a57189ed2d56f88e75 +MD5 (ORBit-0.3.90.tar.gz) = cafc78094ce82d7366a3c490225bb1fa diff --git a/net/ORBit/patches/patch-ae b/net/ORBit/patches/patch-ae index 68f6ea470d4..9f1274397ad 100644 --- a/net/ORBit/patches/patch-ae +++ b/net/ORBit/patches/patch-ae @@ -1,10 +1,20 @@ -$NetBSD: patch-ae,v 1.1 1998/08/20 22:07:25 agc Exp $ +$NetBSD: patch-ae,v 1.2 1998/12/19 12:31:47 tron Exp $ -make a placeholder Makefile.in so sed doesn't puke during configure stage - ---- /dev/null Wed Aug 19 14:32:56 1998 -+++ src/services/name/Makefile.in Wed Aug 19 14:34:41 1998 -@@ -0,0 +1,3 @@ +--- src/services/name/Makefile.in.orig Wed Dec 16 03:41:47 1998 ++++ src/services/name/Makefile.in Sat Dec 19 12:55:42 1998 +@@ -1,3 +1,6 @@ +# NetBSD +# +# There might as well be something here. + # Makefile.in generated automatically by automake 1.3 from Makefile.am + + # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +@@ -768,7 +771,7 @@ + + + $(CosNaming_built): CosNaming.idl $(srcdir)/LName.h $(IDL) +- $(IDL) $< ++ $(IDL) CosNaming.idl + cat $(srcdir)/LName.h >>CosNaming.h + + dist-hook: diff --git a/net/ORBit/patches/patch-af b/net/ORBit/patches/patch-af index cdd10aef1ec..14d749ce0c0 100644 --- a/net/ORBit/patches/patch-af +++ b/net/ORBit/patches/patch-af @@ -1,18 +1,16 @@ -$NetBSD: patch-af,v 1.1 1998/09/04 22:00:46 agc Exp $ +$NetBSD: patch-af,v 1.2 1998/12/19 12:31:47 tron Exp $ -Use GNU indent, not NetBSD indent(1). - ---- src/idl-compiler/orbit-c-backend.c 1998/09/04 21:28:47 1.1 -+++ src/idl-compiler/orbit-c-backend.c 1998/09/04 21:29:03 +--- src/idl-compiler/orbit-c-backend.c.orig Wed Dec 16 02:17:18 1998 ++++ src/idl-compiler/orbit-c-backend.c Sat Dec 19 12:54:49 1998 @@ -18,9 +18,9 @@ #ifndef HAVE_INDENT #define INDENT "cat" #elif HAVE_INDENT_KR --#define INDENT "indent -kr -i8 -bad -fca -sc -sob" -+#define INDENT "gindent -kr -i8 -bad -fca -sc -sob" +-#define INDENT "indent -npro -kr -i8 -bad -fca -sc -sob" ++#define INDENT "gindent -npro -kr -i8 -bad -fca -sc -sob" #else --#define INDENT "indent -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp" -+#define INDENT "gindent -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp" +-#define INDENT "indent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp" ++#define INDENT "gindent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp" #endif /* HAVE_INDENT */ void diff --git a/net/ORBit/patches/patch-ag b/net/ORBit/patches/patch-ag index 1c1a6fa7407..aa6b88b7217 100644 --- a/net/ORBit/patches/patch-ag +++ b/net/ORBit/patches/patch-ag @@ -1,16 +1,13 @@ -$NetBSD: patch-ag,v 1.1 1998/10/05 14:02:07 agc Exp $ +$NetBSD: patch-ag,v 1.2 1998/12/19 12:31:47 tron Exp $ -Name the idl file explicitly, or orbit-idl complains (this may -be a gmake problem). - ---- src/services/name/Makefile.in 1998/10/05 13:33:08 1.1 -+++ src/services/name/Makefile.in 1998/10/05 13:33:21 -@@ -510,7 +510,7 @@ +--- src/daemons/interface_repository/Makefile.in.orig Wed Dec 16 03:41:51 1998 ++++ src/daemons/interface_repository/Makefile.in Sat Dec 19 12:56:24 1998 +@@ -439,7 +439,7 @@ + - name.h name-common.c name-stubs.c name-skels.c: name.idl \ - $(top_builddir)/src/idl-compiler/orbit-idl -- $(top_builddir)/src/idl-compiler/orbit-idl $< -+ $(top_builddir)/src/idl-compiler/orbit-idl name.idl + $(orbit_ird_built): interface_repository.idl $(IDL) +- $(IDL) $< ++ $(IDL) interface_repository.idl - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. + dist-hook: + cd $(distdir); rm -f $(BUILD_SOURCES) diff --git a/net/ORBit/pkg/PLIST b/net/ORBit/pkg/PLIST index e846e9d999e..19d34d3ee5b 100644 --- a/net/ORBit/pkg/PLIST +++ b/net/ORBit/pkg/PLIST @@ -1,7 +1,17 @@ -@comment $NetBSD: PLIST,v 1.3 1998/11/12 23:03:39 frueauf Exp $ -lib/libIDL.so.5.0 +@comment $NetBSD: PLIST,v 1.4 1998/12/19 12:31:48 tron Exp $ +bin/name-client +bin/old-name-server +bin/orbit-idl +bin/orbit-config +bin/orbit-event-server +bin/orbit-ird +bin/orbit-name-server +lib/libIDL.so.5.7 lib/libIDL.la lib/libIDL.a +lib/libORBitCosNaming.so.3.0 +lib/libORBitCosNaming.la +lib/libORBitCosNaming.a lib/libORBitutil.so.3.0 lib/libORBitutil.la lib/libORBitutil.a @@ -11,11 +21,16 @@ lib/libIIOP.a lib/libORBit.so.3.0 lib/libORBit.la lib/libORBit.a -bin/orbit-idl -bin/naming-client -bin/orbit-naming-server -bin/orbit-config +lib/libname-server.a include/libIDL/IDL.h +include/ORBitservices/CosNaming.h +include/ORBitservices/CosNaming_impl.h +include/ORBitservices/CosNaming.idl +include/ORBitservices/LName.pidl +include/ORBitservices/CosEventComm.idl +include/ORBitservices/CosEventChannel.idl +include/ORBitservices/CosTypedEventComm.idl +include/ORBitservices/CosTypedEventChannel.idl include/ORBitutil/basic_types.h include/ORBitutil/thread-safety.h include/ORBitutil/trace.h @@ -27,9 +42,11 @@ include/IIOP/IIOP.h include/IIOP/giop-msg-buffer.h include/IIOP/iiop-encoders.h include/IIOP/iiop-endian.h +include/orb/corba_any_proto.h +include/orb/orbit_typecode.h +include/orb/interface_repository.h include/orb/allocator-defs.h include/orb/allocators.h -include/orb/boa.h include/orb/cdr.h include/orb/dii.h include/orb/dynany.h @@ -49,7 +66,6 @@ include/orb/corba_any_type.h include/orb/corba_basic_sequences_type.h include/orb/corba_env.h include/orb/corba_env_type.h -include/orb/corba_ir.h include/orb/corba_object.h include/orb/corba_object_type.h include/orb/corba_orb.h @@ -69,5 +85,6 @@ info/libIDL.info @exec %D/bin/install-info %D/info/libIDL.info %D/info/libIDL.info @dirrm include/libIDL @dirrm include/ORBitutil +@dirrm include/ORBitservices @dirrm include/IIOP @dirrm include/orb |