summaryrefslogtreecommitdiff
path: root/net/ORBit2
diff options
context:
space:
mode:
Diffstat (limited to 'net/ORBit2')
-rw-r--r--net/ORBit2/DESCR12
-rw-r--r--net/ORBit2/Makefile41
-rw-r--r--net/ORBit2/PLIST86
-rw-r--r--net/ORBit2/buildlink3.mk29
-rw-r--r--net/ORBit2/distinfo8
-rw-r--r--net/ORBit2/patches/patch-aa21
-rw-r--r--net/ORBit2/patches/patch-ab175
-rw-r--r--net/ORBit2/patches/patch-ac34
8 files changed, 0 insertions, 406 deletions
diff --git a/net/ORBit2/DESCR b/net/ORBit2/DESCR
deleted file mode 100644
index 7ceb3701e42..00000000000
--- a/net/ORBit2/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
- ORBit is a CORBA 2.2-compliant Object Request Broker (ORB) featuring
-mature C and Perl bindings. Bindings (in various degrees of completeness)
-are also available for C++, Lisp, Pascal, Python, Ruby, and TCL; others
-are in-progress. It supports POA, DII, DSI, TypeCode, Any, IR and IIOP.
-
- Optional features including INS and threading are available. ORBit is
-engineered for the desktop workstation environment, with a focus on
-performance, low resource usage, and security.
-
- The core ORB is written in C, and runs under Linux, UNIX (BSD, Solaris,
-HP-UX, ...), and Windows. ORBit is developed and released as open source
-software under GPL/LGPL.
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
deleted file mode 100644
index cf062fd1109..00000000000
--- a/net/ORBit2/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.54 2007/03/18 21:00:55 wiz Exp $
-#
-
-DISTNAME= ORBit2-2.14.7
-CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ORBit2/2.14/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://orbit-resource.sourceforge.net/
-COMMENT= High-performance CORBA ORB with C language support
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-CONFLICTS= linc>=1.1
-
-USE_TOOLS+= gmake pkg-config
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-#TEST_TARGET= check
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-PKGCONFIG_OVERRIDE= ORBit-2.0.pc.in
-PKGCONFIG_OVERRIDE+= ORBit-CosNaming-2.0.pc.in
-PKGCONFIG_OVERRIDE+= ORBit-imodule-2.0.pc.in
-PKGCONFIG_OVERRIDE+= src/idl-compiler/ORBit-idl-2.0.pc.in
-
-CPPFLAGS.Darwin+= -DBIND_8_COMPAT
-
-PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \
- { print "@unexec $${RMDIR} %D/" $$2 \
- " 2>/dev/null || $${TRUE}"; next; }
-
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../net/libIDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/ORBit2/PLIST b/net/ORBit2/PLIST
deleted file mode 100644
index d1f44aceb0a..00000000000
--- a/net/ORBit2/PLIST
+++ /dev/null
@@ -1,86 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2006/11/13 20:55:46 drochner Exp $
-bin/ior-decode-2
-bin/linc-cleanup-sockets
-bin/orbit-idl-2
-bin/orbit2-config
-bin/typelib-dump
-include/orbit-2.0/ORBitservices/CosNaming.h
-include/orbit-2.0/ORBitservices/CosNaming_impl.h
-include/orbit-2.0/ORBitservices/orbit-imodule.h
-include/orbit-2.0/orbit-idl/orbit-idl-backend.h
-include/orbit-2.0/orbit/dynamic/dynamic-defs.h
-include/orbit-2.0/orbit/dynamic/dynamic.h
-include/orbit-2.0/orbit/orb-core/allocators.h
-include/orbit-2.0/orbit/orb-core/corba-any-type.h
-include/orbit-2.0/orbit/orb-core/corba-any.h
-include/orbit-2.0/orbit/orb-core/corba-context-type.h
-include/orbit-2.0/orbit/orb-core/corba-context.h
-include/orbit-2.0/orbit/orb-core/corba-defs.h
-include/orbit-2.0/orbit/orb-core/corba-environment-type.h
-include/orbit-2.0/orbit/orb-core/corba-environment.h
-include/orbit-2.0/orbit/orb-core/corba-nvlist.h
-include/orbit-2.0/orbit/orb-core/corba-object-type.h
-include/orbit-2.0/orbit/orb-core/corba-object.h
-include/orbit-2.0/orbit/orb-core/corba-orb-type.h
-include/orbit-2.0/orbit/orb-core/corba-orb.h
-include/orbit-2.0/orbit/orb-core/corba-pobj.h
-include/orbit-2.0/orbit/orb-core/corba-policy-type.h
-include/orbit-2.0/orbit/orb-core/corba-string.h
-include/orbit-2.0/orbit/orb-core/corba-typecode-type.h
-include/orbit-2.0/orbit/orb-core/corba-typecode.h
-include/orbit-2.0/orbit/orb-core/iop-defs.h
-include/orbit-2.0/orbit/orb-core/orb-core-types.h
-include/orbit-2.0/orbit/orb-core/orb-core.h
-include/orbit-2.0/orbit/orb-core/orb-types.h
-include/orbit-2.0/orbit/orb-core/orbit-interface.h
-include/orbit-2.0/orbit/orb-core/orbit-object.h
-include/orbit-2.0/orbit/orb-core/orbit-small.h
-include/orbit-2.0/orbit/orbit-config.h
-include/orbit-2.0/orbit/orbit-types.h
-include/orbit-2.0/orbit/orbit.h
-include/orbit-2.0/orbit/poa/orbit-adaptor.h
-include/orbit-2.0/orbit/poa/poa-basics.h
-include/orbit-2.0/orbit/poa/poa-defs.h
-include/orbit-2.0/orbit/poa/poa-policy.h
-include/orbit-2.0/orbit/poa/poa-types.h
-include/orbit-2.0/orbit/poa/poa.h
-include/orbit-2.0/orbit/poa/portableserver-current-type.h
-include/orbit-2.0/orbit/poa/portableserver-poa-type.h
-include/orbit-2.0/orbit/util/basic_types.h
-include/orbit-2.0/orbit/util/orbit-genrand.h
-include/orbit-2.0/orbit/util/orbit-util.h
-lib/libORBit-2.la
-lib/libORBit-imodule-2.la
-lib/libORBitCosNaming-2.la
-lib/libname-server-2.a
-lib/orbit-2.0/Everything_module.la
-lib/pkgconfig/ORBit-2.0.pc
-lib/pkgconfig/ORBit-CosNaming-2.0.pc
-lib/pkgconfig/ORBit-idl-2.0.pc
-lib/pkgconfig/ORBit-imodule-2.0.pc
-share/aclocal/ORBit2.m4
-share/gtk-doc/html/ORBit2/ORBit2-orbit2-allocators.html
-share/gtk-doc/html/ORBit2/ORBit2-orbit2-small.html
-share/gtk-doc/html/ORBit2/ORBit2.devhelp
-share/gtk-doc/html/ORBit2/ORBit2.devhelp2
-share/gtk-doc/html/ORBit2/general.html
-share/gtk-doc/html/ORBit2/home.png
-share/gtk-doc/html/ORBit2/index.html
-share/gtk-doc/html/ORBit2/index.sgml
-share/gtk-doc/html/ORBit2/left.png
-share/gtk-doc/html/ORBit2/right.png
-share/gtk-doc/html/ORBit2/style.css
-share/gtk-doc/html/ORBit2/up.png
-share/idl/orbit-2.0/CosNaming.idl
-@dirrm share/idl/orbit-2.0
-@unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}
-@dirrm share/gtk-doc/html/ORBit2
-@dirrm lib/orbit-2.0
-@dirrm include/orbit-2.0/orbit/util
-@dirrm include/orbit-2.0/orbit/poa
-@dirrm include/orbit-2.0/orbit/orb-core
-@dirrm include/orbit-2.0/orbit/dynamic
-@dirrm include/orbit-2.0/orbit-idl
-@dirrm include/orbit-2.0/orbit
-@dirrm include/orbit-2.0/ORBitservices
-@dirrm include/orbit-2.0
diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk
deleted file mode 100644
index 6be97415007..00000000000
--- a/net/ORBit2/buildlink3.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:02 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ORBIT2_BUILDLINK3_MK:= ${ORBIT2_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= ORBit2
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NORBit2}
-BUILDLINK_PACKAGES+= ORBit2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ORBit2
-
-.if !empty(ORBIT2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ORBit2+= ORBit2>=2.12.0
-BUILDLINK_ABI_DEPENDS.ORBit2?= ORBit2>=2.12.4nb1
-BUILDLINK_PKGSRCDIR.ORBit2?= ../../net/ORBit2
-
-PRINT_PLIST_AWK+= /^@dirrm lib\/orbit-2.0$$/ \
- { print "@comment in ORBit2: " $$0; next; }
-PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \
- { print "@comment in ORBit2: " $$0; next; }
-.endif # ORBIT2_BUILDLINK3_MK
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../net/libIDL/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/ORBit2/distinfo b/net/ORBit2/distinfo
deleted file mode 100644
index 4870600010f..00000000000
--- a/net/ORBit2/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.33 2007/03/18 21:00:55 wiz Exp $
-
-SHA1 (ORBit2-2.14.7.tar.bz2) = d5b2e63d02d4dcf0ab7b0ee48021b365c273102e
-RMD160 (ORBit2-2.14.7.tar.bz2) = 4ac003754c037ec8bb151bb344db31c0888a852c
-Size (ORBit2-2.14.7.tar.bz2) = 729469 bytes
-SHA1 (patch-aa) = 6e87e28e3634908f35c219f81a47d0353cfaf551
-SHA1 (patch-ab) = d422957ba3e228eab0f558c8b977fc3e6403c533
-SHA1 (patch-ac) = cbd62d1f1ed38ce1863efc9b3de0c99825b77634
diff --git a/net/ORBit2/patches/patch-aa b/net/ORBit2/patches/patch-aa
deleted file mode 100644
index 5405dc80e66..00000000000
--- a/net/ORBit2/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2004/11/05 10:19:10 sketch Exp $
-
---- src/idl-compiler/orbit-idl-c-headers.c.orig Wed Nov 3 13:10:51 2004
-+++ src/idl-compiler/orbit-idl-c-headers.c Wed Nov 3 13:11:53 2004
-@@ -447,6 +447,16 @@
- while(*cte && !isspace((int)*cte) && *cte != '"') cte++;
- *cte = '\0';
- fprintf(ci->fh, "#include <%s>\n", ctmp);
-+ } else if(!strncmp(list->data,
-+ "#pragma\tinclude_defs",
-+ sizeof("#pragma\tinclude_defs")-1)) {
-+ char *ctmp, *cte;
-+ ctmp = ((char *)list->data) + sizeof("#pragma\tinclude_defs");
-+ while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++;
-+ cte = ctmp;
-+ while(*cte && !isspace((int)*cte) && *cte != '"') cte++;
-+ *cte = '\0';
-+ fprintf(ci->fh, "#include <%s>\n", ctmp);
- } else
- fprintf(ci->fh, "%s\n", (char *)list->data);
- }
diff --git a/net/ORBit2/patches/patch-ab b/net/ORBit2/patches/patch-ab
deleted file mode 100644
index b6153262ee9..00000000000
--- a/net/ORBit2/patches/patch-ab
+++ /dev/null
@@ -1,175 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/02/20 15:08:59 rillig Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=410002
-
-Though shalt not use void pointers in arithmetics.
-
-NB: Cleaning up the rest of the code is left to the upstream authors as
-an exercise.
-
---- src/orb/orb-core/corba-any.c.orig Mon Jan 1 18:01:32 2007
-+++ src/orb/orb-core/corba-any.c Tue Feb 20 07:51:28 2007
-@@ -3,6 +3,13 @@
- #include "orb-core-private.h"
- #include <string.h>
-
-+#define PTR_PLUS(ptr, offset) \
-+ ((gpointer) (((guchar *)(ptr)) + (offset)))
-+
-+/** Adds the size of TYPE to the gpointer PTR. */
-+#define ADDSIZE(ptr, type) \
-+ ((gpointer) (((guchar *)(ptr)) + sizeof (type)))
-+
- #define SKIP_ALIAS(tc) \
- while ((tc)->kind == CORBA_tk_alias) { (tc) = (tc)->subtypes [0]; }
-
-@@ -162,12 +171,12 @@
- int offset;
- for (i = offset = 0; i < tc->sub_parts; i++) {
- offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align);
-- *val = val0 + offset;
-+ *val = PTR_PLUS (val0, offset);
- ORBit_marshal_value (buf, val, tc->subtypes[i]);
- offset += ORBit_gather_alloc_info (tc->subtypes[i]);
- }
- offset = ALIGN_VALUE (offset, tc->c_align);
-- *val = val0 + offset;
-+ *val = PTR_PLUS (val0, offset);
- break;
- }
- case CORBA_tk_union: {
-@@ -183,14 +192,14 @@
- for (i = 0; i < tc->sub_parts; i++)
- sz = MAX (sz, ORBit_gather_alloc_info (tc->subtypes[i]));
-
-- *val = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
-- tc->c_align);
-+ *val = PTR_PLUS (val0, ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
-+ tc->c_align));
- body = *val;
- ORBit_marshal_value (buf, &body, subtc);
- /* FIXME:
- * WATCHOUT: end of subtc may not be end of union
- */
-- *val = *val + ALIGN_VALUE (sz, tc->c_align);
-+ *val = PTR_PLUS (*val, ALIGN_VALUE (sz, tc->c_align));
- break;
- }
- case CORBA_tk_wstring: {
-@@ -536,13 +545,13 @@
- gpointer val0 = *val;
- for (i = offset = 0; i < tc->sub_parts; i++) {
- offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align);
-- *val = val0 + offset;
-+ *val = PTR_PLUS (val0, offset);
- if (ORBit_demarshal_value (tc->subtypes[i], val, buf, orb))
- return TRUE;
- offset += ORBit_gather_alloc_info (tc->subtypes[i]);
- }
- offset = ALIGN_VALUE (offset, tc->c_align);
-- *val = val0 + offset;
-+ *val = PTR_PLUS (val0, offset);
- break;
- }
- case CORBA_tk_union: {
-@@ -560,14 +569,14 @@
- for (i = 0; i < tc->sub_parts; i++)
- sz = MAX (sz, ORBit_gather_alloc_info (tc->subtypes[i]));
-
-- *val = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
-- tc->c_align);
-+ *val = PTR_PLUS (val0, ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
-+ tc->c_align));
- body = *val;
- if (ORBit_demarshal_value (subtc, &body, buf, orb))
- return TRUE;
-
- /* WATCHOUT: end subtc body may not be end of union */
-- *val = *val + ALIGN_VALUE (sz, tc->c_align);
-+ *val = PTR_PLUS (*val, ALIGN_VALUE (sz, tc->c_align));
- break;
- }
- case CORBA_tk_string:
-@@ -860,14 +869,14 @@
-
- for (i = offset = 0; i < tc->sub_parts; i++) {
- offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align);
-- *val = val0 + offset;
-- *newval = ((guchar *)newval0 + offset);
-+ *val = PTR_PLUS (val0, offset);
-+ *newval = PTR_PLUS (newval0, offset);
- ORBit_copy_value_core (val, newval, tc->subtypes[i]);
- offset += ORBit_gather_alloc_info (tc->subtypes[i]);
- }
- offset = ALIGN_VALUE (offset, tc->c_align);
-- *val = val0 + offset;
-- *newval = newval0 + offset;
-+ *val = PTR_PLUS (val0, offset);
-+ *newval = PTR_PLUS (newval0, offset);
- break;
- }
- case CORBA_tk_union: {
-@@ -876,6 +885,7 @@
- CORBA_TypeCode utc;
- gint union_align = tc->c_align;
- size_t union_size = ORBit_gather_alloc_info (tc);
-+ size_t aligned_size;
-
- pval1 = *val;
- pval2 = *newval;
-@@ -884,9 +894,10 @@
-
- ORBit_copy_value_core (&pval1, &pval2, tc->discriminator);
-
-- pval1 = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
-+ aligned_size = ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
- union_align);
-- pval2 = newval0 + (pval1 - val0);
-+ pval1 = PTR_PLUS (val0, aligned_size);
-+ pval2 = PTR_PLUS (newval0, aligned_size);
-
- ORBit_copy_value_core (&pval1, &pval2, utc);
-
-@@ -1044,8 +1055,8 @@
-
- for (i = offset = 0; i < tc->sub_parts; i++) {
- offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align);
-- *a = a0 + offset;
-- *b = b0 + offset;
-+ *a = PTR_PLUS (a0, offset);
-+ *b = PTR_PLUS (b0, offset);
- if (!ORBit_value_equivalent (a, b, tc->subtypes [i], ev))
- return FALSE;
- offset += ORBit_gather_alloc_info (tc->subtypes[i]);
-@@ -1052,8 +1063,8 @@
- }
-
- offset = ALIGN_VALUE (offset, tc->c_align);
-- *a = a0 + offset;
-- *b = b0 + offset;
-+ *a = PTR_PLUS (a0, offset);
-+ *b = PTR_PLUS (b0, offset);
- return TRUE;
- }
-
-@@ -1084,6 +1095,7 @@
- gint union_align = tc->c_align;
- size_t union_size = ORBit_gather_alloc_info (tc);
- gpointer a_orig, b_orig;
-+ size_t aligned_size;
-
- a_orig = *a;
- b_orig = *b;
-@@ -1097,9 +1109,10 @@
- if (!ORBit_value_equivalent (a, b, tc->discriminator, ev))
- return FALSE;
-
-- *a = a_orig + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
-+ aligned_size = ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
- union_align);
-- *b = b_orig + (*a - a_orig);
-+ *a = PTR_PLUS (a_orig, aligned_size);
-+ *b = PTR_PLUS (b_orig, aligned_size);
- if (!ORBit_value_equivalent (a, b, utc_a, ev))
- return FALSE;
-
diff --git a/net/ORBit2/patches/patch-ac b/net/ORBit2/patches/patch-ac
deleted file mode 100644
index 55a4284baba..00000000000
--- a/net/ORBit2/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/02/20 15:08:59 rillig Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=410002
-
---- src/orb/dynamic/dynany.c.orig Mon Jan 1 18:01:32 2007
-+++ src/orb/dynamic/dynany.c Tue Feb 20 08:12:45 2007
-@@ -104,6 +104,9 @@
- case CORBA_tk_TypeCode: \
- case CORBA_tk_Principal
-
-+#define PTR_PLUS(ptr, offset) \
-+ ((gpointer) (((guchar *)(ptr)) + (offset)))
-+
- /* FIXME: ported very quickly from stable */
- struct DynamicAny_DynAny_type {
- struct ORBit_RootObject_struct parent;
-@@ -1422,7 +1425,7 @@
- (CORBA_Object) subtc, ev);
- to = any->_value = ORBit_alloc_by_tc (subtc);
- offset = ALIGN_VALUE (offset, subtc->c_align);
-- tmpsrc = src + offset;
-+ tmpsrc = PTR_PLUS (src, offset);
- ORBit_copy_value_core (&tmpsrc, &to, subtc);
- offset += ORBit_gather_alloc_info (subtc);
- }
-@@ -1486,7 +1489,7 @@
- gpointer tmpdest;
-
- offset = ALIGN_VALUE (offset, subtc->c_align);
-- tmpdest = dest + offset;
-+ tmpdest = PTR_PLUS (dest, offset);
- ORBit_copy_value_core (&src, &tmpdest, subtc);
- offset += ORBit_gather_alloc_info (subtc);
- }
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-14 00:21:35 +0000