diff options
| -rw-r--r-- | net/ORBit/Makefile | 10 | ||||
| -rw-r--r-- | net/ORBit/files/md5 | 4 | ||||
| -rw-r--r-- | net/ORBit/files/patch-sum | 14 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-aa | 23 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-ac | 26 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-ae | 17 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-ah | 26 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-aj | 12 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-ak | 14 | ||||
| -rw-r--r-- | net/ORBit/pkg/PLIST | 16 |
10 files changed, 84 insertions, 78 deletions
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index b286ecbb1fe..c01b4767220 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2000/05/12 09:22:46 agc Exp $ +# $NetBSD: Makefile,v 1.30 2000/05/30 19:13:16 drochner Exp $ # -DISTNAME= ORBit-0.5.0 +DISTNAME= ORBit-0.5.1 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_GNOME:=stable/releases/gnome-1.0.53/} +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/ORBit/} MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gnome.org/ @@ -25,4 +25,8 @@ do-build: -@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${.MAKEFLAGS} all -@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${.MAKEFLAGS} all +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 affcfb423b5..18f2ac7d66a 100644 --- a/net/ORBit/files/md5 +++ b/net/ORBit/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.7 1999/10/22 23:35:37 tron Exp $ +$NetBSD: md5,v 1.8 2000/05/30 19:13:17 drochner Exp $ -MD5 (ORBit-0.5.0.tar.gz) = ff977db3e5273bf6e13dd3124bed0696 +MD5 (ORBit-0.5.1.tar.gz) = fd132d12a77c2bc4e71168da39c8ff04 diff --git a/net/ORBit/files/patch-sum b/net/ORBit/files/patch-sum index a8809c00514..74e628298a3 100644 --- a/net/ORBit/files/patch-sum +++ b/net/ORBit/files/patch-sum @@ -1,14 +1,14 @@ -$NetBSD: patch-sum,v 1.5 2000/05/02 18:48:37 danw Exp $ +$NetBSD: patch-sum,v 1.6 2000/05/30 19:13:17 drochner Exp $ -MD5 (patch-aa) = 970a8c13fe579d27ad5aa30a7b89f5af +MD5 (patch-aa) = 299365a9c51c83a29f2f1c32cb24fda9 MD5 (patch-ab) = 39d06749d19c30d91d40e48fd4e74321 -MD5 (patch-ac) = 5ee45bc357f9093459722e591d358707 +MD5 (patch-ac) = 19cfe44d23ee91099de7431e9a3c1049 MD5 (patch-ad) = b5a1964a714884369ba9c60790380f69 -MD5 (patch-ae) = 98464c52bd7f89c590bdf08982f2a330 +MD5 (patch-ae) = d2ceabae3616dbd26ab87848d7046c4d MD5 (patch-ag) = be7d2b90edbefb47476fad9e650a26e1 -MD5 (patch-ah) = 29ad288da577fc93e3a28ed254da924c +MD5 (patch-ah) = 9b949d6e0050b7ea9dc2f34b3019afe8 MD5 (patch-ai) = c486d47127aa566b1a8280002295088e -MD5 (patch-aj) = 1580df7ed3f35c03d8bb1111c1fb7be7 -MD5 (patch-ak) = 2650deea424b4db98a4f3c849f137d56 +MD5 (patch-aj) = acab17fefe4adbd909877c56b8ceb6e1 +MD5 (patch-ak) = 9ee5d2fc433ee4e0bc86b37b7df416d0 MD5 (patch-al) = 1b9801005568c1eaaa1e44bc66f3d8a6 MD5 (patch-am) = 595270c0a2bd97be8e8aeb33fe3e8b21 diff --git a/net/ORBit/patches/patch-aa b/net/ORBit/patches/patch-aa index 42948cc759f..6f63e3429f1 100644 --- a/net/ORBit/patches/patch-aa +++ b/net/ORBit/patches/patch-aa @@ -1,20 +1,21 @@ -$NetBSD: patch-aa,v 1.5 1999/10/22 23:35:37 tron Exp $ +$NetBSD: patch-aa,v 1.6 2000/05/30 19:13:18 drochner Exp $ ---- popt/configure.orig Tue Sep 28 18:11:54 1999 -+++ popt/configure Sat Oct 23 00:35:01 1999 -@@ -1882,6 +1882,7 @@ - fi - +--- popt/configure.orig Mon Feb 21 19:17:22 2000 ++++ popt/configure Sat May 27 11:46:55 2000 +@@ -1970,6 +1970,8 @@ + *) lt_target="$target" ;; + esac +if false; then ++ # Check for any special flags to pass to ltconfig. # # the following will cause an existing older ltconfig to fail, so -@@ -2183,6 +2184,7 @@ +@@ -2133,6 +2135,7 @@ + # clobbered by the next message. + exec 5>>./config.log - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' +fi - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac index ee0ed1f12b1..ea893ff88b2 100644 --- a/net/ORBit/patches/patch-ac +++ b/net/ORBit/patches/patch-ac @@ -1,20 +1,22 @@ -$NetBSD: patch-ac,v 1.4 2000/05/02 18:48:37 danw Exp $ +$NetBSD: patch-ac,v 1.5 2000/05/30 19:13:18 drochner Exp $ ---- configure.orig Tue Sep 28 18:11:49 1999 -+++ configure Sat Oct 23 00:50:21 1999 -@@ -1570,6 +1570,7 @@ - fi - +--- configure.orig Mon Feb 21 19:16:23 2000 ++++ configure Sat May 27 11:50:50 2000 +@@ -1362,6 +1362,8 @@ + *) lt_target="$target" ;; + esac +if false; then ++ # Check for any special flags to pass to ltconfig. # # 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' -+fi - +@@ -1524,6 +1526,8 @@ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. + exec 5>>./config.log ++ ++fi + + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 + echo "configure:1530: checking whether to enable maintainer-specific portions of Makefiles" >&5 diff --git a/net/ORBit/patches/patch-ae b/net/ORBit/patches/patch-ae index 4392c7d691b..c5637b3313d 100644 --- a/net/ORBit/patches/patch-ae +++ b/net/ORBit/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.5 1999/10/22 23:35:37 tron Exp $ +$NetBSD: patch-ae,v 1.6 2000/05/30 19:13:18 drochner 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 @@ +--- src/services/name/Makefile.in.orig Mon Feb 21 19:32:42 2000 ++++ src/services/name/Makefile.in Fri May 26 22:18:27 2000 +@@ -122,7 +122,7 @@ DEPS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(top_builddir)/src/IIOP/libIIOP.la libORBitCosNaming.la @@ -11,12 +11,3 @@ $NetBSD: patch-ae,v 1.5 1999/10/22 23:35:37 tron Exp $ #name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h -@@ -792,7 +792,7 @@ - @: - - my_cosnaming_built: CosNaming.idl $(srcdir)/LName.h $(IDL) -- $(IDL) $< -+ $(IDL) CosNaming.idl - cat $(srcdir)/LName.h >>CosNaming.h - touch my_cosnaming_built - diff --git a/net/ORBit/patches/patch-ah b/net/ORBit/patches/patch-ah index fdc25d16dc6..3ce126ac0aa 100644 --- a/net/ORBit/patches/patch-ah +++ b/net/ORBit/patches/patch-ah @@ -1,20 +1,22 @@ -$NetBSD: patch-ah,v 1.3 1999/10/22 23:35:37 tron Exp $ +$NetBSD: patch-ah,v 1.4 2000/05/30 19:13:18 drochner Exp $ ---- libIDL/configure.orig Tue Sep 28 18:11:51 1999 -+++ libIDL/configure Sat Oct 23 00:36:25 1999 -@@ -2173,6 +2173,7 @@ - fi - +--- libIDL/configure.orig Mon Feb 21 19:16:25 2000 ++++ libIDL/configure Sat May 27 11:53:37 2000 +@@ -2016,6 +2016,8 @@ + *) lt_target="$target" ;; + esac +if false; then ++ # 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' -+fi - +@@ -2178,6 +2180,8 @@ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. + exec 5>>./config.log ++ ++fi + + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 + echo "configure:2184: checking whether to enable maintainer-specific portions of Makefiles" >&5 diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj index 6ccb3b3cc70..b78125a4cfb 100644 --- a/net/ORBit/patches/patch-aj +++ b/net/ORBit/patches/patch-aj @@ -1,10 +1,10 @@ -$NetBSD: patch-aj,v 1.2 1999/03/11 20:07:57 tron Exp $ +$NetBSD: patch-aj,v 1.3 2000/05/30 19:13:18 drochner Exp $ ---- src/IIOP/Makefile.in.orig Thu Feb 25 16:17:16 1999 -+++ src/IIOP/Makefile.in Thu Mar 11 21:02:03 1999 -@@ -90,9 +90,7 @@ - VERSION = @VERSION@ +--- src/IIOP/Makefile.in.orig Mon Feb 21 19:32:39 2000 ++++ src/IIOP/Makefile.in Sat May 27 11:58:55 2000 +@@ -91,9 +91,7 @@ YACC = @YACC@ + pkglibdir = @pkglibdir@ -LIBWRAP_PATH = @LIBWRAP_PATH@ -@HAVE_HOSTS_ACCESS_TRUE@libwrap_files = $(addsuffix .lo, $(basename $(filter %.o, $(shell ar t $(LIBWRAP_PATH))))) @@ -13,7 +13,7 @@ $NetBSD: patch-aj,v 1.2 1999/03/11 20:07:57 tron Exp $ libIIOPincludedir = $(includedir)/IIOP -@@ -123,10 +121,7 @@ +@@ -126,10 +124,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/net/ORBit/patches/patch-ak b/net/ORBit/patches/patch-ak index eff8f1eedb3..6f678ed75d5 100644 --- a/net/ORBit/patches/patch-ak +++ b/net/ORBit/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.2 1999/04/27 21:49:04 tron Exp $ +$NetBSD: patch-ak,v 1.3 2000/05/30 19:13:19 drochner Exp $ ---- orbit-config.in.orig Tue Oct 27 14:52:35 1998 -+++ orbit-config.in Tue Apr 27 23:35:16 1999 -@@ -86,7 +86,7 @@ +--- orbit-config.in.orig Fri Oct 8 06:49:07 1999 ++++ orbit-config.in Tue May 30 16:23:19 2000 +@@ -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 -lORBitutil `glib-config --libs` @LIBS@ -lm -lwrap" - the_flags="$the_flags `glib-config --cflags` -I@includedir@" +- 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 " ;; diff --git a/net/ORBit/pkg/PLIST b/net/ORBit/pkg/PLIST index c9e5dfd63f4..126e010017c 100644 --- a/net/ORBit/pkg/PLIST +++ b/net/ORBit/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 1999/10/22 23:35:37 tron Exp $ +@comment $NetBSD: PLIST,v 1.10 2000/05/30 19:13:19 drochner Exp $ bin/libIDL-config bin/name-client bin/old-name-server @@ -11,19 +11,21 @@ lib/libIDL-0.6.so.0.0 lib/libIDL.la lib/libIDL.a lib/libIDLConf.sh -lib/libORBitCosNaming.so.4.0 +lib/libORBitCosNaming.so.5.1 lib/libORBitCosNaming.la lib/libORBitCosNaming.a -lib/libORBitutil.so.4.0 +lib/libORBitutil.so.5.1 lib/libORBitutil.la lib/libORBitutil.a -lib/libIIOP.so.4.0 +lib/libIIOP.so.5.1 lib/libIIOP.la lib/libIIOP.a -lib/libORBit.so.4.0 +lib/libORBit.so.5.1 lib/libORBit.la lib/libORBit.a lib/liborbit-c-backend.a +lib/libpopt.a +lib/libpopt.so.0.0 lib/libname-server.a include/libIDL/IDL.h include/ORBitservices/CosNaming.h @@ -36,6 +38,8 @@ include/ORBitservices/CosTypedEventComm.idl include/ORBitservices/CosTypedEventChannel.idl 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 @@ -52,6 +56,7 @@ include/orb/interface_repository.h include/orb/allocator-defs.h include/orb/allocators.h include/orb/cdr.h +include/orb/corba_context.h include/orb/dii.h include/orb/dynany.h include/orb/env.h @@ -88,6 +93,7 @@ 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 +share/aclocal/ORBit.m4 share/aclocal/libIDL.m4 @dirrm include/libIDL @dirrm include/ORBitutil |