upgrade to ORBit-0.4.3
This commit is contained in:
parent
e397cb58fc
commit
c815c4329b
@ -1,29 +1,43 @@
|
||||
# $OpenBSD: Makefile,v 1.4 1999/04/08 22:41:21 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 1999/05/06 17:17:37 brad Exp $
|
||||
|
||||
DISTNAME= ORBit-0.4.0
|
||||
CATEGORIES= devel
|
||||
DISTNAME= ORBit-0.4.3
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= ORBit
|
||||
|
||||
NEED_VERSION= 1.79
|
||||
NEED_VERSION= 1.73
|
||||
|
||||
MAINTAINER= rohee@OpenBSD.ORG
|
||||
MAINTAINER= rohee@openbsd.org
|
||||
|
||||
BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool \
|
||||
gindent:${PORTSDIR}/devel/gindent
|
||||
LIB_DEPENDS+= glib.1.2:${PORTSDIR}/devel/glib
|
||||
|
||||
USE_GMAKE= yes
|
||||
|
||||
USE_GMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static
|
||||
CONFIGURE_ENV= LIBTOOL=/usr/local/bin/libtool
|
||||
CONFIGURE_ARGS+= --enable-static --disable-indent
|
||||
CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib-config"
|
||||
|
||||
# People that installed an older version of ORBit 0.4.x wound up with
|
||||
# shared libs with a major/minor of 4.0 ... these files
|
||||
# MUST be removed as the version was incorrect (it came from 1.1.x
|
||||
# sources). Check that out here (and bitch if necessary).
|
||||
pre-extract:
|
||||
@if [ -f ${LOCALBASE}/lib/libORBit.so.4.0 ]; then \
|
||||
echo "+-------------------"; \
|
||||
echo "| ERROR: you MUST remove the existing ORBit installation"; \
|
||||
echo "| before installing this version. To fully remove run"; \
|
||||
echo "| these commands as user root"; \
|
||||
echo "|"; \
|
||||
echo "| pkg_delete -f `pkg_info -e 'ORBit-*'`"; \
|
||||
echo "| ldconfig ${LOCALBASE}/lib"; \
|
||||
echo "|"; \
|
||||
echo "+-------------------"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
post-install:
|
||||
@test -f ${PREFIX}/info/dir || \
|
||||
sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir
|
||||
@install-info ${PREFIX}/info/libIDL.info ${PREFIX}/info/dir
|
||||
${LDCONFIG} -m ${PREFIX}/lib
|
||||
@if [ -d ${PREFIX}/info -a ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
|
||||
${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
|
||||
fi
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
SHA1 (ORBit-0.4.0.tar.gz) = 76fe8a4eca258d6edcba709395c8fae97e00254d
|
||||
RMD160 (ORBit-0.4.0.tar.gz) = 1f34aa4f69aa61e2eae8424c15d758c63ffd327a
|
||||
MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc
|
||||
MD5 (ORBit-0.4.3.tar.gz) = 758e7a4692d6ac8bb6393663162f45eb
|
||||
RMD160 (ORBit-0.4.3.tar.gz) = 88fe1498fa32fdde76466e286f53246193b7dc01
|
||||
SHA1 (ORBit-0.4.3.tar.gz) = 9ec381890151a5e5bb6b31ff5c1443e516c92d1d
|
||||
|
@ -1,21 +1,34 @@
|
||||
$OpenBSD: patch-aa,v 1.1.1.1 1999/03/23 19:24:31 rohee Exp $
|
||||
$NetBSD: patch-aa,v 1.3 1999/03/05 00:25:10 tron Exp $
|
||||
|
||||
--- popt/configure.orig Wed Feb 24 20:54:33 1999
|
||||
+++ popt/configure Thu Mar 4 23:23:12 1999
|
||||
@@ -1895,6 +1895,7 @@
|
||||
fi
|
||||
--- src/IIOP/Makefile.in.orig Wed Apr 7 14:49:37 1999
|
||||
+++ src/IIOP/Makefile.in Thu May 6 11:16:31 1999
|
||||
@@ -90,9 +90,7 @@
|
||||
VERSION = @VERSION@
|
||||
YACC = @YACC@
|
||||
|
||||
# Always use our own libtool.
|
||||
+if false; then
|
||||
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
-LIBWRAP_PATH = @LIBWRAP_PATH@
|
||||
-@HAVE_HOSTS_ACCESS_TRUE@libwrap_files = $(addsuffix .lo, $(basename $(filter %.o, $(shell ar t $(LIBWRAP_PATH)))))
|
||||
-@HAVE_HOSTS_ACCESS_FALSE@libwrap_files =
|
||||
+libwrap_files =
|
||||
|
||||
# Check for any special flags to pass to ltconfig.
|
||||
@@ -2126,6 +2127,7 @@
|
||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
||||
+fi
|
||||
libIIOPincludedir = $(includedir)/IIOP
|
||||
|
||||
# Redirect the config.log output again, so that the ltconfig log is not
|
||||
# clobbered by the next message.
|
||||
@@ -110,7 +108,7 @@
|
||||
|
||||
BUILT_SOURCES = $(libwrap_files)
|
||||
|
||||
-libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
+libIIOP_la_LDFLAGS = -version-info 0:4:0
|
||||
|
||||
EXTRA_DIST = IIOP-design.txt
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
@@ -123,10 +121,7 @@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
-@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)))))
|
||||
-@HAVE_HOSTS_ACCESS_FALSE@libIIOP_la_DEPENDENCIES =
|
||||
+libIIOP_la_DEPENDENCIES =
|
||||
libIIOP_la_OBJECTS = connection.lo encoders.lo giop-msg-buffer.lo \
|
||||
iiop-endian.lo
|
||||
CFLAGS = @CFLAGS@
|
||||
|
@ -1,17 +1,5 @@
|
||||
$OpenBSD: patch-ab,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-ab,v 1.2 1999/03/05 00:25:10 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.
|
||||
|
@ -1,28 +1,6 @@
|
||||
$OpenBSD: patch-ac,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-ac,v 1.1 1998/08/20 22:07:25 agc Exp $
|
||||
|
||||
Use NetBSD's libtool package
|
||||
Comment out erroneous setting of INSTALL variable.
|
||||
|
||||
--- configure 1998/08/19 10:37:24 1.1
|
||||
+++ configure 1998/08/19 10:38:11
|
||||
@@ -1236,6 +1236,7 @@
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
+if false; then
|
||||
# Always use our own libtool.
|
||||
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
|
||||
@@ -1281,6 +1282,7 @@
|
||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
||||
+fi
|
||||
|
||||
# Redirect the config.log output again, so that the ltconfig log is not
|
||||
# clobbered by the next message.
|
||||
@@ -3261,10 +3263,10 @@
|
||||
--- configure.orig Wed Apr 7 13:16:18 1999
|
||||
+++ configure Thu May 6 10:49:51 1999
|
||||
@@ -5424,10 +5424,10 @@
|
||||
*) # Relative path.
|
||||
ac_sub_cache_file="$ac_dots$cache_file" ;;
|
||||
esac
|
||||
|
@ -1,8 +1,14 @@
|
||||
$OpenBSD: patch-ad,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-ad,v 1.3 1999/03/05 00:25:10 tron Exp $
|
||||
|
||||
--- popt/Makefile.in.orig Thu Feb 25 16:17:05 1999
|
||||
+++ popt/Makefile.in Thu Mar 4 23:25:05 1999
|
||||
--- popt/Makefile.in.orig Wed Apr 7 14:49:28 1999
|
||||
+++ popt/Makefile.in Thu May 6 12:18:08 1999
|
||||
@@ -109,7 +109,7 @@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
-libpopt_la_LDFLAGS =
|
||||
+libpopt_la_LDFLAGS = -version-info 0:4:0
|
||||
libpopt_la_LIBADD =
|
||||
libpopt_la_OBJECTS = popt.lo findme.lo poptparse.lo poptconfig.lo \
|
||||
popthelp.lo
|
||||
@@ -122,7 +122,7 @@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
|
@ -1,16 +1,15 @@
|
||||
$OpenBSD: patch-ae,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-ae,v 1.2 1998/12/19 12:31:47 tron Exp $
|
||||
|
||||
--- 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
|
||||
--- src/services/name/Makefile.in.orig Wed Apr 7 14:49:39 1999
|
||||
+++ src/services/name/Makefile.in Thu May 6 11:07:44 1999
|
||||
@@ -105,7 +105,7 @@
|
||||
libORBitservicesinclude_HEADERS = CosNaming.h CosNaming_impl.h CosNaming.idl LName.pidl
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
|
||||
@@ -768,7 +771,7 @@
|
||||
|
||||
-libORBitCosNaming_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
+libORBitCosNaming_la_LDFLAGS = -version-info 0:4:0
|
||||
|
||||
|
||||
INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src @GLIB_CFLAGS@
|
||||
@@ -781,7 +781,7 @@
|
||||
|
||||
|
||||
$(CosNaming_built): CosNaming.idl $(srcdir)/LName.h $(IDL)
|
||||
@ -18,4 +17,4 @@ $NetBSD: patch-ae,v 1.2 1998/12/19 12:31:47 tron Exp $
|
||||
+ $(IDL) CosNaming.idl
|
||||
cat $(srcdir)/LName.h >>CosNaming.h
|
||||
|
||||
dist-hook:
|
||||
$(srcdir)/name-client.c $(srcdir)/orbit-name-server.c $(srcdir)/new-name-server.c: CosNaming.h
|
||||
|
@ -1,18 +1,11 @@
|
||||
$OpenBSD: patch-af,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-af,v 1.3 1999/03/05 00:25:10 tron Exp $
|
||||
|
||||
--- src/idl-compiler/orbit-c-backend.c.orig Mon Feb 22 17:27:40 1999
|
||||
+++ src/idl-compiler/orbit-c-backend.c Thu Mar 4 23:05:25 1999
|
||||
@@ -16,10 +16,10 @@
|
||||
Output: (in files) header, skeletons, stubs, and common code.
|
||||
*/
|
||||
#ifdef HAVE_INDENT_KR
|
||||
-# 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"
|
||||
+# define INDENT "gindent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp"
|
||||
# else
|
||||
# define INDENT "cat"
|
||||
# endif
|
||||
--- src/ORBitutil/Makefile.in.orig Thu May 6 10:59:34 1999
|
||||
+++ src/ORBitutil/Makefile.in Thu May 6 10:59:53 1999
|
||||
@@ -103,7 +103,7 @@
|
||||
libORBitutilinclude_HEADERS = basic_types.h thread-safety.h trace.h util.h compat.h
|
||||
|
||||
|
||||
-libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
+libORBitutil_la_LDFLAGS = -version-info 0:4:0
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
|
@ -1,7 +1,3 @@
|
||||
$OpenBSD: patch-ag,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
|
||||
This one won't be needed anymore when <stdio.h> will be included in <tcpd.h>.
|
||||
|
||||
--- src/IIOP/connection.c.orig Tue Mar 16 23:19:53 1999
|
||||
+++ src/IIOP/connection.c Tue Mar 16 23:23:10 1999
|
||||
@@ -10,6 +10,7 @@
|
||||
|
@ -1,21 +1,11 @@
|
||||
$OpenBSD: patch-ah,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-ah,v 1.1 1999/03/05 00:25:10 tron Exp $
|
||||
|
||||
--- libIDL/configure.orig Wed Feb 24 20:54:31 1999
|
||||
+++ libIDL/configure Fri Mar 5 00:18:15 1999
|
||||
@@ -2185,6 +2185,7 @@
|
||||
fi
|
||||
--- src/orb/Makefile.in.orig Thu May 6 11:06:19 1999
|
||||
+++ src/orb/Makefile.in Thu May 6 11:06:33 1999
|
||||
@@ -107,7 +107,7 @@
|
||||
IDL = $(top_builddir)/src/idl-compiler/orbit-idl
|
||||
IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
|
||||
|
||||
# Always use our own libtool.
|
||||
+if false; then
|
||||
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
-libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
+libORBit_la_LDFLAGS = -version-info 0:4:0
|
||||
libORBit_la_LIBADD = $(GLIB_LIBS) -lm
|
||||
|
||||
# Check for any special flags to pass to ltconfig.
|
||||
@@ -2416,6 +2417,7 @@
|
||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
||||
+fi
|
||||
|
||||
# Redirect the config.log output again, so that the ltconfig log is not
|
||||
# clobbered by the next message.
|
||||
BUILT_SOURCES = interface_repository.h interface_repository-common.c interface_repository-stubs.c
|
||||
|
@ -1,14 +1,20 @@
|
||||
$OpenBSD: patch-ai,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-ai,v 1.1 1999/03/05 00:25:10 tron Exp $
|
||||
|
||||
--- libIDL/Makefile.in.orig Thu Feb 25 16:17:07 1999
|
||||
+++ libIDL/Makefile.in Fri Mar 5 00:21:00 1999
|
||||
--- libIDL/Makefile.in.orig Wed Apr 7 14:49:29 1999
|
||||
+++ libIDL/Makefile.in Thu May 6 11:09:27 1999
|
||||
@@ -89,7 +89,7 @@
|
||||
LT_RELEASE = @LT_RELEASE@
|
||||
LT_REVISION = @LT_REVISION@
|
||||
MAINT = @MAINT@
|
||||
-MAKEINFO = @MAKEINFO@
|
||||
+MAKEINFO = @MAKEINFO@ --no-split
|
||||
NM = @NM@
|
||||
PACKAGE = @PACKAGE@
|
||||
RANLIB = @RANLIB@
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
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 = -release $(LT_RELEASE)
|
||||
+libIDL_la_LDFLAGS = -version-info 0:4:0
|
||||
|
||||
|
||||
m4datadir = $(datadir)/aclocal
|
||||
|
@ -1,28 +1,11 @@
|
||||
$OpenBSD: patch-aj,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-aj,v 1.2 1999/03/11 20:07:57 tron 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@
|
||||
YACC = @YACC@
|
||||
--- src/daemons/interface_repository/Makefile.in.orig Wed Apr 7 14:49:43 1999
|
||||
+++ src/daemons/interface_repository/Makefile.in Thu May 6 10:49:55 1999
|
||||
@@ -100,7 +100,7 @@
|
||||
|
||||
-LIBWRAP_PATH = @LIBWRAP_PATH@
|
||||
-@HAVE_HOSTS_ACCESS_TRUE@libwrap_files = $(addsuffix .lo, $(basename $(filter %.o, $(shell ar t $(LIBWRAP_PATH)))))
|
||||
-@HAVE_HOSTS_ACCESS_FALSE@libwrap_files =
|
||||
+libwrap_files =
|
||||
|
||||
libIIOPincludedir = $(includedir)/IIOP
|
||||
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 -lwrap
|
||||
|
||||
@@ -123,10 +121,7 @@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
-@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)))))
|
||||
-@HAVE_HOSTS_ACCESS_FALSE@libIIOP_la_DEPENDENCIES =
|
||||
+libIIOP_la_DEPENDENCIES =
|
||||
libIIOP_la_OBJECTS = connection.lo encoders.lo giop-msg-buffer.lo \
|
||||
iiop-endian.lo
|
||||
CFLAGS = @CFLAGS@
|
||||
|
||||
orbit_ird_SOURCES = interface_repository-skels.c interface_repository-impl.c
|
||||
|
@ -1,6 +1,3 @@
|
||||
$OpenBSD: patch-ak,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-ak,v 1.1 1999/03/05 00:25:10 tron Exp $
|
||||
|
||||
--- orbit-config.in.orig Tue Oct 27 14:52:35 1998
|
||||
+++ orbit-config.in Fri Mar 5 00:44:54 1999
|
||||
@@ -86,7 +86,7 @@
|
||||
|
@ -1,14 +1,129 @@
|
||||
$OpenBSD: patch-al,v 1.1.1.1 1999/03/23 19:24:32 rohee Exp $
|
||||
$NetBSD: patch-al,v 1.1 1999/03/05 00:25:10 tron Exp $
|
||||
|
||||
--- src/daemons/interface_repository/Makefile.in.orig Thu Feb 25 16:17:26 1999
|
||||
+++ src/daemons/interface_repository/Makefile.in Fri Mar 5 00:52:59 1999
|
||||
@@ -100,7 +100,7 @@
|
||||
--- ltmain.sh.orig Thu May 6 13:13:19 1999
|
||||
+++ ltmain.sh Thu May 6 13:13:35 1999
|
||||
@@ -3326,40 +3326,6 @@
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
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 -lwrap
|
||||
--- popt/ltmain.sh.orig Thu May 6 13:13:45 1999
|
||||
+++ popt/ltmain.sh Thu May 6 13:13:58 1999
|
||||
@@ -3326,40 +3326,6 @@
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
--- libIDL/ltmain.sh.orig Thu May 6 13:14:08 1999
|
||||
+++ libIDL/ltmain.sh Thu May 6 13:14:23 1999
|
||||
@@ -3326,40 +3326,6 @@
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
orbit_ird_SOURCES = interface_repository-common.c interface_repository-skels.c interface_repository-impl.c
|
||||
|
@ -6,7 +6,10 @@ bin/old-name-server
|
||||
bin/orbit-event-server
|
||||
bin/orbit-ird
|
||||
bin/orbit-config
|
||||
@unexec install-info --delete %D/info/libIDL.info %D/info/dir
|
||||
info/libIDL.info
|
||||
@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
|
||||
@exec install-info %D/info/libIDL.info %D/info/dir
|
||||
share/aclocal/libIDL.m4
|
||||
include/libIDL/IDL.h
|
||||
include/orb/allocator-defs.h
|
||||
@ -66,21 +69,21 @@ include/ORBitservices/CosEventComm.idl
|
||||
include/ORBitservices/CosEventChannel.idl
|
||||
include/ORBitservices/CosTypedEventComm.idl
|
||||
include/ORBitservices/CosTypedEventChannel.idl
|
||||
lib/libIIOP.a
|
||||
lib/libIDL-0.6.so.0.0
|
||||
lib/libIDL.so.0.4
|
||||
lib/libIDL.la
|
||||
lib/libIDL.a
|
||||
lib/libIDLConf.sh
|
||||
lib/libORBit.so.4.0
|
||||
lib/libORBit.so.0.4
|
||||
lib/libORBit.la
|
||||
lib/libORBit.a
|
||||
lib/libORBitutil.so.4.0
|
||||
lib/libORBitutil.so.0.4
|
||||
lib/libORBitutil.la
|
||||
lib/libORBitutil.a
|
||||
lib/libIIOP.so.4.0
|
||||
lib/libIIOP.so.0.4
|
||||
lib/libIIOP.la
|
||||
lib/libIIOP.a
|
||||
lib/libname-server.a
|
||||
lib/libORBitCosNaming.so.4.0
|
||||
lib/libORBitCosNaming.so.0.4
|
||||
@exec /sbin/ldconfig -m %B
|
||||
lib/libORBitCosNaming.la
|
||||
lib/libORBitCosNaming.a
|
||||
|
@ -6,7 +6,10 @@ bin/old-name-server
|
||||
bin/orbit-event-server
|
||||
bin/orbit-ird
|
||||
bin/orbit-config
|
||||
@unexec install-info --delete %D/info/libIDL.info %D/info/dir
|
||||
info/libIDL.info
|
||||
@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
|
||||
@exec install-info %D/info/libIDL.info %D/info/dir
|
||||
share/aclocal/libIDL.m4
|
||||
include/libIDL/IDL.h
|
||||
include/orb/allocator-defs.h
|
||||
@ -66,7 +69,6 @@ include/ORBitservices/CosEventComm.idl
|
||||
include/ORBitservices/CosEventChannel.idl
|
||||
include/ORBitservices/CosTypedEventComm.idl
|
||||
include/ORBitservices/CosTypedEventChannel.idl
|
||||
lib/libIIOP.a
|
||||
lib/libIDL.la
|
||||
lib/libIDL.a
|
||||
lib/libIDLConf.sh
|
||||
@ -75,6 +77,7 @@ lib/libORBit.a
|
||||
lib/libORBitutil.la
|
||||
lib/libORBitutil.a
|
||||
lib/libIIOP.la
|
||||
lib/libIIOP.a
|
||||
lib/libname-server.a
|
||||
lib/libORBitCosNaming.la
|
||||
lib/libORBitCosNaming.a
|
||||
|
Loading…
Reference in New Issue
Block a user