From 74e80b8723e8a1ad85b0df0aa6aa2958819adf56 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 17 Oct 2000 23:48:00 +0000 Subject: Update ORBit to 0.5.4. I couldn't find a list of changes from version, 0.5.3 -- only that 0.5.4 is the latest stable version of ORBit. The pkgsrc-related changes are: * Compile and link libpopt statically into ORBit. This is really a small library, and there are more recent versions available if we with to add it to pkgsrc. Also don't install this library. * Compile the tcpd-specific code in libIIOP. --- net/ORBit/Makefile | 9 ++------ net/ORBit/files/md5 | 4 ++-- net/ORBit/files/patch-sum | 17 +++++++------- net/ORBit/patches/patch-ab | 8 +++---- net/ORBit/patches/patch-ad | 14 ++++++------ net/ORBit/patches/patch-ae | 18 +++++++-------- net/ORBit/patches/patch-ag | 56 +++++++++++++++++++++++++++++++++++++++++----- net/ORBit/patches/patch-ai | 17 +++++++------- net/ORBit/patches/patch-aj | 33 --------------------------- net/ORBit/patches/patch-al | 20 ++++++++--------- net/ORBit/patches/patch-am | 20 ++++++++--------- net/ORBit/pkg/PLIST | 15 ++++++------- 12 files changed, 119 insertions(+), 112 deletions(-) delete mode 100644 net/ORBit/patches/patch-aj (limited to 'net') diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 714759df7ba..9416f5f1b1c 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2000/09/05 20:48:21 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.39 2000/10/17 23:48:00 jlam Exp $ # -DISTNAME= ORBit-0.5.3 -PKGNAME= ${DISTNAME}nb1 +DISTNAME= ORBit-0.5.4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/ORBit/} @@ -25,8 +24,4 @@ CPPFLAGS+= -I${LOCALBASE}/include # libintl.h INFO_FILES= libIDL.info -post-install: - cd ${WRKSRC}/popt; ${LIBTOOL} --mode=install \ - ${INSTALL_DATA} libpopt.la ${PREFIX}/lib - .include "../../mk/bsd.pkg.mk" diff --git a/net/ORBit/files/md5 b/net/ORBit/files/md5 index c1dde6e99c1..be0523d4228 100644 --- a/net/ORBit/files/md5 +++ b/net/ORBit/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.10 2000/08/09 23:09:35 wiz Exp $ +$NetBSD: md5,v 1.11 2000/10/17 23:48:00 jlam Exp $ -MD5 (ORBit-0.5.3.tar.gz) = ef0e295ab0666973030c552672aaaee7 +MD5 (ORBit-0.5.4.tar.gz) = 166ba4601ff2e58ddfb5cdd621f0b37f diff --git a/net/ORBit/files/patch-sum b/net/ORBit/files/patch-sum index 799746ccf95..30d4149cdfe 100644 --- a/net/ORBit/files/patch-sum +++ b/net/ORBit/files/patch-sum @@ -1,11 +1,10 @@ -$NetBSD: patch-sum,v 1.11 2000/09/05 20:48:21 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.12 2000/10/17 23:48:00 jlam Exp $ -MD5 (patch-ab) = 39d06749d19c30d91d40e48fd4e74321 -MD5 (patch-ad) = b985b058fd16a7b9140a3440425d9f85 -MD5 (patch-ae) = 7ab15bc6cbd2543ffbd58f44abf0d1bb -MD5 (patch-ag) = be7d2b90edbefb47476fad9e650a26e1 -MD5 (patch-ai) = 8273191786614ce9a11fb824ee3b1c93 -MD5 (patch-aj) = 8dc3b14b38bd8fd55abb621c3fa88be5 +MD5 (patch-ab) = d3874c8f8ff4709ea198e226cb978b9b +MD5 (patch-ad) = 300b48a33500260090858cc981a4c025 +MD5 (patch-ae) = 3f0d1c25c1e9bce88ccce7c634133580 +MD5 (patch-ag) = 50b6232e86894b88210ac478b9b03fc0 +MD5 (patch-ai) = 414e9be35ae069fbf5140409f2a2553b MD5 (patch-ak) = 9ee5d2fc433ee4e0bc86b37b7df416d0 -MD5 (patch-al) = 43f3937da91786d06a5f4a3a3179b809 -MD5 (patch-am) = fc46e740ea36f1ba96a10fd7ca021dfc +MD5 (patch-al) = c69a82dd384dae0c900b9e0af97eb8c0 +MD5 (patch-am) = 70e41153d0c6694131d46f0acef7ab05 diff --git a/net/ORBit/patches/patch-ab b/net/ORBit/patches/patch-ab index daeab90f069..0c617ade90f 100644 --- a/net/ORBit/patches/patch-ab +++ b/net/ORBit/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 1999/10/22 23:35:37 tron Exp $ +$NetBSD: patch-ab,v 1.4 2000/10/17 23:48:01 jlam Exp $ ---- Makefile.in.orig Thu Feb 25 16:17:03 1999 -+++ Makefile.in Thu Mar 4 23:51:40 1999 -@@ -93,7 +93,7 @@ +--- Makefile.in.orig Thu Oct 12 12:06:49 2000 ++++ Makefile.in +@@ -95,7 +95,7 @@ AUTOMAKE_OPTIONS = 1.3 # required version of automake. diff --git a/net/ORBit/patches/patch-ad b/net/ORBit/patches/patch-ad index 7fdc3e99cdd..58065e7e088 100644 --- a/net/ORBit/patches/patch-ad +++ b/net/ORBit/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.4 2000/08/09 23:09:35 wiz Exp $ +$NetBSD: patch-ad,v 1.5 2000/10/17 23:48:01 jlam Exp $ ---- popt/Makefile.in.orig Fri Aug 4 14:27:49 2000 -+++ popt/Makefile.in Fri Aug 4 14:28:17 2000 -@@ -160,7 +160,7 @@ +--- popt/Makefile.in.orig Thu Oct 12 12:06:51 2000 ++++ popt/Makefile.in +@@ -152,7 +152,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) -rpath $(PREFIX)/lib $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(libpopt_la_SOURCES) $(test1_SOURCES) $(test2_SOURCES) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -all-static HEADERS = $(noinst_HEADERS) + DIST_COMMON = README ./stamp-h.in COPYING Makefile.am Makefile.in \ diff --git a/net/ORBit/patches/patch-ae b/net/ORBit/patches/patch-ae index 9758db95472..2a2a3ff5169 100644 --- a/net/ORBit/patches/patch-ae +++ b/net/ORBit/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.7 2000/08/09 23:09:35 wiz Exp $ +$NetBSD: patch-ae,v 1.8 2000/10/17 23:48:01 jlam Exp $ ---- src/services/name/Makefile.in.orig Fri Aug 4 14:28:42 2000 -+++ src/services/name/Makefile.in Fri Aug 4 14:28:52 2000 -@@ -147,7 +147,7 @@ - $(top_builddir)/src/ORBitutil/libORBitutil.la \ - libORBitCosNaming.la \ - @GLIB_LIBS@ \ -- -lm -+ -lm -lwrap +--- src/services/name/Makefile.in.orig Thu Oct 12 12:07:08 2000 ++++ src/services/name/Makefile.in +@@ -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 + + +-LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la libORBitCosNaming.la @GLIB_LIBS@ -lm ++LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la libORBitCosNaming.la @GLIB_LIBS@ -lm @LIB_WRAP@ #name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h diff --git a/net/ORBit/patches/patch-ag b/net/ORBit/patches/patch-ag index 8768ce41dd0..26fdc09118a 100644 --- a/net/ORBit/patches/patch-ag +++ b/net/ORBit/patches/patch-ag @@ -1,14 +1,15 @@ -$NetBSD: patch-ag,v 1.4 1999/11/12 08:15:56 tron Exp $ +$NetBSD: patch-ag,v 1.5 2000/10/17 23:48:01 jlam Exp $ ---- src/IIOP/connection.c.orig Thu Sep 23 04:25:32 1999 -+++ src/IIOP/connection.c Fri Nov 12 11:18:11 1999 -@@ -1,3 +1,6 @@ +--- src/IIOP/connection.c.orig Fri Feb 18 08:55:30 2000 ++++ src/IIOP/connection.c +@@ -1,4 +1,7 @@ + #include "config.h" +#include +#include +#include - #include "config.h" #ifndef _XOPEN_SOURCE_EXTENDED # define _XOPEN_SOURCE_EXTENDED 1 + # define WE_DEFINED_XOPEN_SOURCE_EXTENDED 1 @@ -13,7 +16,6 @@ #include #include @@ -17,3 +18,48 @@ $NetBSD: patch-ag,v 1.4 1999/11/12 08:15:56 tron Exp $ #include #include #include +@@ -32,7 +34,7 @@ + #include + #include + +-#if defined(HAVE_TCPD_H) && defined(HAVE_HOSTS_ACCESS) ++#if defined(HAVE_TCPD_H) + #include + #endif + +@@ -80,7 +82,7 @@ + GIOPConnectionList giop_connection_list; + static GSList *iiop_unix_socket_list = NULL; + +-#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H) ++#if defined (HAVE_TCPD_H) + static const char *argv0_val = NULL; + #endif + +@@ -104,7 +106,7 @@ + struct sigaction mypipe; + g_assert(sizeof(GIOPMessageHeader) == 12); + +-#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H) ++#if defined (HAVE_TCPD_H) + argv0_val = g_strdup(g_basename(argv0)); /* For TCP wrappers */ + #endif + +@@ -1007,7 +1009,7 @@ + */ + int allow_severity = LOG_INFO, deny_severity = LOG_NOTICE; + +-#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H) ++#if defined(HAVE_TCPD_H) + DEFINE_LOCK(tcp_wrappers_usage); + + #endif +@@ -1033,7 +1035,7 @@ + + newfd = accept(GIOP_CONNECTION_GET_FD(connection), &sock, &n); + +-#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H) ++#if defined(HAVE_TCPD_H) + /* tcp wrappers access checking */ + switch(IIOP_CONNECTION(connection)->icnxtype) { + case IIOP_IPV4: diff --git a/net/ORBit/patches/patch-ai b/net/ORBit/patches/patch-ai index c6ca37f2730..5f8628b9fee 100644 --- a/net/ORBit/patches/patch-ai +++ b/net/ORBit/patches/patch-ai @@ -1,12 +1,13 @@ -$NetBSD: patch-ai,v 1.3 2000/09/05 20:48:22 dmcmahill Exp $ +$NetBSD: patch-ai,v 1.4 2000/10/17 23:48:01 jlam Exp $ ---- libIDL/Makefile.in.orig Tue Jul 25 18:34:00 2000 -+++ libIDL/Makefile.in Tue Sep 5 13:44:51 2000 -@@ -131,6 +131,5 @@ - ns.c util.c util.h rename.h +--- libIDL/Makefile.in.orig Thu Oct 12 12:06:54 2000 ++++ libIDL/Makefile.in +@@ -120,7 +120,7 @@ --libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -- -release $(LT_RELEASE) -+libIDL_la_LDFLAGS = -version-info ${LIBIDL_MAJOR_VERSION}:${LIBIDL_MINOR_VERSION} + libIDL_la_SOURCES = parser.c parser.h lexer.c ns.c util.c util.h rename.h +-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) ++libIDL_la_LDFLAGS = -version-info $(LIBIDL_MAJOR_VERSION):$(LIBIDL_MINOR_VERSION) + + m4datadir = $(datadir)/aclocal diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj deleted file mode 100644 index 41cf97cac7c..00000000000 --- a/net/ORBit/patches/patch-aj +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aj,v 1.6 2000/08/09 23:09:35 wiz Exp $ - ---- src/IIOP/Makefile.in.orig Fri Aug 4 14:30:17 2000 -+++ src/IIOP/Makefile.in Fri Aug 4 14:31:06 2000 -@@ -96,14 +96,9 @@ - pkglibdir = @pkglibdir@ - - --LIBWRAP_PATH = @LIBWRAP_PATH@ - LIB_WRAP = @LIB_WRAP@ --@HAVE_HOSTS_ACCESS_TRUE@libwrap_files = \ --@HAVE_HOSTS_ACCESS_TRUE@$(addsuffix .lo, $(basename $(filter %.o, $(shell ar t $(LIBWRAP_PATH))))) --@HAVE_HOSTS_ACCESS_FALSE@libwrap_files = \ --@HAVE_HOSTS_ACCESS_TRUE@libwrap_deps = \ --@HAVE_HOSTS_ACCESS_FALSE@libwrap_deps = \ --@HAVE_HOSTS_ACCESS_FALSE@$(LIB_WRAP) -+libwrap_files = -+libwrap_deps = $(LIB_WRAP) - - libIIOPincludedir = $(includedir)/IIOP - -@@ -154,10 +149,7 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --@HAVE_HOSTS_ACCESS_FALSE@libIIOP_la_DEPENDENCIES = --@HAVE_HOSTS_ACCESS_TRUE@libIIOP_la_DEPENDENCIES = $(addsuffix .lo, \ --@HAVE_HOSTS_ACCESS_TRUE@$(basename $(filter %.o, $(shell ar t \ --@HAVE_HOSTS_ACCESS_TRUE@$(LIBWRAP_PATH))))) -+libIIOP_la_DEPENDENCIES = - am_libIIOP_la_OBJECTS = connection.lo encoders.lo giop-msg-buffer.lo \ - iiop-endian.lo - libIIOP_la_OBJECTS = $(am_libIIOP_la_OBJECTS) diff --git a/net/ORBit/patches/patch-al b/net/ORBit/patches/patch-al index acb97f8378d..2ec5230f150 100644 --- a/net/ORBit/patches/patch-al +++ b/net/ORBit/patches/patch-al @@ -1,13 +1,13 @@ -$NetBSD: patch-al,v 1.4 2000/08/09 23:09:35 wiz Exp $ +$NetBSD: patch-al,v 1.5 2000/10/17 23:48:01 jlam Exp $ ---- src/daemons/interface_repository/Makefile.in.orig Fri Aug 4 14:32:04 2000 -+++ src/daemons/interface_repository/Makefile.in Fri Aug 4 14:32:15 2000 -@@ -113,7 +113,7 @@ - $(top_builddir)/src/IIOP/libIIOP.la \ - $(top_builddir)/src/ORBitutil/libORBitutil.la \ - @GLIB_LIBS@ \ -- -lm -+ -lm -lwrap +--- src/daemons/interface_repository/Makefile.in.orig Thu Oct 12 12:07:12 2000 ++++ src/daemons/interface_repository/Makefile.in +@@ -102,7 +102,7 @@ - orbit_ird_SOURCES = \ + orbit_ird_LDFLAGS = -static +-orbit_ird_LDADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm ++orbit_ird_LDADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm @LIB_WRAP@ + + + orbit_ird_SOURCES = interface_repository-skels.c interface_repository-impl.c diff --git a/net/ORBit/patches/patch-am b/net/ORBit/patches/patch-am index 468df4740e1..c29eee588ca 100644 --- a/net/ORBit/patches/patch-am +++ b/net/ORBit/patches/patch-am @@ -1,13 +1,13 @@ -$NetBSD: patch-am,v 1.2 2000/08/09 23:09:35 wiz Exp $ +$NetBSD: patch-am,v 1.3 2000/10/17 23:48:01 jlam Exp $ ---- src/services/event/Makefile.in.orig Fri Aug 4 14:32:36 2000 -+++ src/services/event/Makefile.in Fri Aug 4 14:32:45 2000 -@@ -138,7 +138,7 @@ - $(top_builddir)/src/IIOP/libIIOP.la \ - $(top_builddir)/src/ORBitutil/libORBitutil.la \ - @GLIB_LIBS@ \ -- -lm -+ -lm -lwrap +--- src/services/event/Makefile.in.orig Thu Oct 12 12:07:09 2000 ++++ src/services/event/Makefile.in +@@ -115,7 +115,7 @@ + DEPS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(top_builddir)/src/IIOP/libIIOP.la - event_consumer_SOURCES = event-consumer.c \ +-LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm ++LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm @LIB_WRAP@ + + + event_consumer_SOURCES = event-consumer.c CosEventComm-skels.c CosEventChannel-common.c CosEventChannel-stubs.c diff --git a/net/ORBit/pkg/PLIST b/net/ORBit/pkg/PLIST index f22363a0d78..ff1f9af3e10 100644 --- a/net/ORBit/pkg/PLIST +++ b/net/ORBit/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2000/09/05 20:48:22 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.16 2000/10/17 23:48:01 jlam Exp $ bin/libIDL-config bin/name-client bin/old-name-server @@ -79,21 +79,20 @@ lib/libIDL.so.0.6 lib/libIDLConf.sh lib/libIIOP.a lib/libIIOP.la -lib/libIIOP.so.5.3 +lib/libIIOP.so.5.4 lib/libORBit.a lib/libORBit.la -lib/libORBit.so.5.3 +lib/libORBit.so.5.4 lib/libORBitCosNaming.a lib/libORBitCosNaming.la -lib/libORBitCosNaming.so.5.3 +lib/libORBitCosNaming.so.5.4 lib/libORBitutil.a lib/libORBitutil.la -lib/libORBitutil.so.5.3 +lib/libORBitutil.so.5.4 lib/libname-server.a lib/liborbit-c-backend.a -lib/libpopt.a -lib/libpopt.la -lib/libpopt.so.0.0 +lib/pkgconfig/ORBit.pc +lib/pkgconfig/libIDL.pc share/aclocal/ORBit.m4 share/aclocal/libIDL.m4 @dirrm include/orb -- cgit v1.2.3