diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/ORBit/Makefile | 10 | ||||
| -rw-r--r-- | net/ORBit/files/md5 | 4 | ||||
| -rw-r--r-- | net/ORBit/files/patch-sum | 13 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-aa | 14 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-ab | 11 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-ac | 31 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-ae | 19 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-af | 17 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-ah | 18 | ||||
| -rw-r--r-- | net/ORBit/pkg/PLIST | 15 |
10 files changed, 72 insertions, 80 deletions
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 0fadf30f39d..dd2a34cc022 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.25 1999/10/01 22:59:38 jlam Exp $ +# $NetBSD: Makefile,v 1.26 1999/10/22 23:35:37 tron Exp $ # -DISTNAME= ORBit-0.4.3 +DISTNAME= ORBit-0.5.0 CATEGORIES= corba -MASTER_SITES= ${MASTER_SITE_GNOME:=gnome-1.0/sources/} +MASTER_SITES= ${MASTER_SITE_GNOME:=gnome-1.0.53/sources/} -MAINTAINER= packages@netbsd.org +MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gnome.org/ -DEPENDS+= glib-1.2.4:../../devel/glib +DEPENDS+= glib-1.2.*:../../devel/glib DEPENDS+= gindent-*:../../devel/gindent GNU_CONFIGURE= yes diff --git a/net/ORBit/files/md5 b/net/ORBit/files/md5 index 783bb5b460a..affcfb423b5 100644 --- a/net/ORBit/files/md5 +++ b/net/ORBit/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.6 1999/04/15 21:33:04 tron Exp $ +$NetBSD: md5,v 1.7 1999/10/22 23:35:37 tron Exp $ -MD5 (ORBit-0.4.3.tar.gz) = 758e7a4692d6ac8bb6393663162f45eb +MD5 (ORBit-0.5.0.tar.gz) = ff977db3e5273bf6e13dd3124bed0696 diff --git a/net/ORBit/files/patch-sum b/net/ORBit/files/patch-sum index 658bb46a642..dd2eaf44aef 100644 --- a/net/ORBit/files/patch-sum +++ b/net/ORBit/files/patch-sum @@ -1,13 +1,12 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:28 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/22 23:35:37 tron Exp $ -MD5 (patch-aa) = 53c3d85310f2c7f51aaa4d45c577a5e3 -MD5 (patch-ab) = c8c2ad67bb203273625830ce4a1c2878 -MD5 (patch-ac) = de13ff2247bfd0f4b940955f2dee3a24 +MD5 (patch-aa) = 970a8c13fe579d27ad5aa30a7b89f5af +MD5 (patch-ab) = 39d06749d19c30d91d40e48fd4e74321 +MD5 (patch-ac) = fe026df2a9ecc4445b873b4b07312711 MD5 (patch-ad) = b5a1964a714884369ba9c60790380f69 -MD5 (patch-ae) = 723ec81c5cf870e1e2645e3c907f0cf5 -MD5 (patch-af) = ef0ab9e98bac5886603a33f92b210a0a +MD5 (patch-ae) = 98464c52bd7f89c590bdf08982f2a330 MD5 (patch-ag) = ef5def8752f3989bb79acbf8beb7c354 -MD5 (patch-ah) = 02af46e1d2395704411871eb970f5937 +MD5 (patch-ah) = 29ad288da577fc93e3a28ed254da924c MD5 (patch-ai) = c486d47127aa566b1a8280002295088e MD5 (patch-aj) = 1580df7ed3f35c03d8bb1111c1fb7be7 MD5 (patch-ak) = 2650deea424b4db98a4f3c849f137d56 diff --git a/net/ORBit/patches/patch-aa b/net/ORBit/patches/patch-aa index f7587e21550..42948cc759f 100644 --- a/net/ORBit/patches/patch-aa +++ b/net/ORBit/patches/patch-aa @@ -1,16 +1,16 @@ -$NetBSD: patch-aa,v 1.4 1999/04/04 19:20:10 tron Exp $ +$NetBSD: patch-aa,v 1.5 1999/10/22 23:35:37 tron Exp $ ---- popt/configure.orig Wed Mar 24 18:46:35 1999 -+++ popt/configure Sun Apr 4 19:09:10 1999 -@@ -1883,6 +1883,7 @@ +--- popt/configure.orig Tue Sep 28 18:11:54 1999 ++++ popt/configure Sat Oct 23 00:35:01 1999 +@@ -1882,6 +1882,7 @@ fi +if false; then # Check for any special flags to pass to ltconfig. - libtool_flags="--cache-file=$cache_file" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -@@ -2179,6 +2180,7 @@ + # + # the following will cause an existing older ltconfig to fail, so +@@ -2183,6 +2184,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/ORBit/patches/patch-ab b/net/ORBit/patches/patch-ab index 97a2408aaf7..daeab90f069 100644 --- a/net/ORBit/patches/patch-ab +++ b/net/ORBit/patches/patch-ab @@ -1,16 +1,7 @@ -$NetBSD: patch-ab,v 1.2 1999/03/05 00:25:10 tron Exp $ +$NetBSD: patch-ab,v 1.3 1999/10/22 23:35:37 tron Exp $ --- Makefile.in.orig Thu Feb 25 16:17:03 1999 +++ Makefile.in Thu Mar 4 23:51:40 1999 -@@ -48,7 +48,7 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} - transform = @program_transform_name@ - - NORMAL_INSTALL = : @@ -93,7 +93,7 @@ AUTOMAKE_OPTIONS = 1.3 # required version of automake. diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac index 5efbff1f3d8..e18e50ffbb0 100644 --- a/net/ORBit/patches/patch-ac +++ b/net/ORBit/patches/patch-ac @@ -1,16 +1,16 @@ -$NetBSD: patch-ac,v 1.2 1999/04/04 19:20:10 tron Exp $ +$NetBSD: patch-ac,v 1.3 1999/10/22 23:35:37 tron Exp $ ---- configure.orig Wed Mar 24 22:32:13 1999 -+++ configure Sun Apr 4 18:28:33 1999 -@@ -1569,6 +1569,7 @@ +--- configure.orig Tue Sep 28 18:11:49 1999 ++++ configure Sat Oct 23 00:50:21 1999 +@@ -1570,6 +1570,7 @@ fi +if false; then # Check for any special flags to pass to ltconfig. - libtool_flags="--cache-file=$cache_file" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -@@ -1865,6 +1866,7 @@ + # + # the following will cause an existing older ltconfig to fail, so +@@ -1871,6 +1872,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -18,7 +18,22 @@ $NetBSD: patch-ac,v 1.2 1999/04/04 19:20:10 tron Exp $ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. -@@ -5424,10 +5426,10 @@ +@@ -5164,10 +5166,10 @@ + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac + + echo creating "$ac_file" + rm -f "$ac_file" +@@ -5388,10 +5390,10 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/net/ORBit/patches/patch-ae b/net/ORBit/patches/patch-ae index cd55e36d924..4392c7d691b 100644 --- a/net/ORBit/patches/patch-ae +++ b/net/ORBit/patches/patch-ae @@ -1,7 +1,8 @@ -$NetBSD: patch-ae,v 1.4 1999/04/14 20:34:38 garbled Exp $ ---- src/services/name/Makefile.in.orig Thu Mar 25 12:15:25 1999 -+++ src/services/name/Makefile.in Wed Apr 14 13:20:07 1999 -@@ -118,7 +118,7 @@ +$NetBSD: patch-ae,v 1.5 1999/10/22 23:35:37 tron Exp $ + +--- src/services/name/Makefile.in.orig Tue Sep 28 18:12:57 1999 ++++ src/services/name/Makefile.in Fri Oct 22 20:26:10 1999 +@@ -123,7 +123,7 @@ DEPS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(top_builddir)/src/IIOP/libIIOP.la libORBitCosNaming.la @@ -9,13 +10,13 @@ $NetBSD: patch-ae,v 1.4 1999/04/14 20:34:38 garbled Exp $ +LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la libORBitCosNaming.la @GLIB_LIBS@ -lm -lwrap - name_client_SOURCES = name-client.c -@@ -781,7 +781,7 @@ + #name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h +@@ -792,7 +792,7 @@ + @: - - $(CosNaming_built): CosNaming.idl $(srcdir)/LName.h $(IDL) + my_cosnaming_built: CosNaming.idl $(srcdir)/LName.h $(IDL) - $(IDL) $< + $(IDL) CosNaming.idl cat $(srcdir)/LName.h >>CosNaming.h + touch my_cosnaming_built - $(srcdir)/name-client.c $(srcdir)/orbit-name-server.c $(srcdir)/new-name-server.c: CosNaming.h diff --git a/net/ORBit/patches/patch-af b/net/ORBit/patches/patch-af deleted file mode 100644 index b04607d6d93..00000000000 --- a/net/ORBit/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.4 1999/04/04 19:20:10 tron Exp $ - ---- src/idl-compiler/main.c.orig Tue Mar 23 20:26:47 1999 -+++ src/idl-compiler/main.c Sun Apr 4 18:06:57 1999 -@@ -53,10 +53,10 @@ - - #ifdef HAVE_INDENT_KR - #warning "Please e-mail orbit-list@cuc.edu if you get HAVE_INDENT_KR working" --# define INDENT "indent -npro -kr -i8 -bad -fca -sc -sob" -+# define INDENT "gindent -npro -kr -i8 -bad -fca -sc -sob" - #else - # ifdef HAVE_INDENT --# define INDENT "indent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp -st" -+# define INDENT "gindent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp -st" - # else - # define INDENT "cat" - # endif diff --git a/net/ORBit/patches/patch-ah b/net/ORBit/patches/patch-ah index c4edf30350e..fdc25d16dc6 100644 --- a/net/ORBit/patches/patch-ah +++ b/net/ORBit/patches/patch-ah @@ -1,16 +1,16 @@ -$NetBSD: patch-ah,v 1.2 1999/04/04 19:20:10 tron Exp $ +$NetBSD: patch-ah,v 1.3 1999/10/22 23:35:37 tron Exp $ ---- libIDL/configure.orig Thu Mar 25 20:15:02 1999 -+++ libIDL/configure Sun Apr 4 18:27:26 1999 -@@ -2446,6 +2446,7 @@ - rm -f confcache +--- libIDL/configure.orig Tue Sep 28 18:11:51 1999 ++++ libIDL/configure Sat Oct 23 00:36:25 1999 +@@ -2173,6 +2173,7 @@ + fi +if false; then - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -@@ -2469,6 +2470,7 @@ + # Check for any special flags to pass to ltconfig. + # + # the following will cause an existing older ltconfig to fail, so +@@ -2474,6 +2475,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/ORBit/pkg/PLIST b/net/ORBit/pkg/PLIST index 648a4c376bc..c9e5dfd63f4 100644 --- a/net/ORBit/pkg/PLIST +++ b/net/ORBit/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 1999/04/15 21:33:04 tron Exp $ +@comment $NetBSD: PLIST,v 1.9 1999/10/22 23:35:37 tron Exp $ bin/libIDL-config bin/name-client bin/old-name-server @@ -11,18 +11,19 @@ lib/libIDL-0.6.so.0.0 lib/libIDL.la lib/libIDL.a lib/libIDLConf.sh -lib/libORBitCosNaming.so.4.3 +lib/libORBitCosNaming.so.4.0 lib/libORBitCosNaming.la lib/libORBitCosNaming.a -lib/libORBitutil.so.4.3 +lib/libORBitutil.so.4.0 lib/libORBitutil.la lib/libORBitutil.a -lib/libIIOP.so.4.3 +lib/libIIOP.so.4.0 lib/libIIOP.la lib/libIIOP.a -lib/libORBit.so.4.3 +lib/libORBit.so.4.0 lib/libORBit.la lib/libORBit.a +lib/liborbit-c-backend.a lib/libname-server.a include/libIDL/IDL.h include/ORBitservices/CosNaming.h @@ -34,10 +35,11 @@ include/ORBitservices/CosEventChannel.idl include/ORBitservices/CosTypedEventComm.idl include/ORBitservices/CosTypedEventChannel.idl include/ORBitutil/basic_types.h +include/ORBitutil/compat.h +include/ORBitutil/os-specifics.h include/ORBitutil/thread-safety.h include/ORBitutil/trace.h include/ORBitutil/util.h -include/ORBitutil/compat.h include/IIOP/IIOP-config.h include/IIOP/IIOP-types.h include/IIOP/IIOP.h @@ -82,6 +84,7 @@ include/orb/orbit_object.h include/orb/orbit_object_type.h include/orb/orbit_poa.h include/orb/orbit_poa_type.h +include/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 |