upgrade to ORBit 0.5.3
This commit is contained in:
parent
f2ad613b7c
commit
3296c5ed58
@ -1,45 +1,26 @@
|
|||||||
# $OpenBSD: Makefile,v 1.18 2000/07/04 01:46:37 krw Exp $
|
# $OpenBSD: Makefile,v 1.19 2000/08/21 12:20:20 brad Exp $
|
||||||
|
|
||||||
DISTNAME= ORBit-0.5.0
|
DISTNAME= ORBit-0.5.3
|
||||||
CATEGORIES= devel
|
CATEGORIES= devel
|
||||||
NEED_VERSION= 1.310
|
NEED_VERSION= 1.310
|
||||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||||
MASTER_SITE_SUBDIR= stable/sources/ORBit
|
MASTER_SITE_SUBDIR= stable/sources/ORBit
|
||||||
|
|
||||||
|
LIB_DEPENDS= intl.1::devel/gettext \
|
||||||
LIB_DEPENDS= intl::devel/gettext \
|
|
||||||
glib.1.2::devel/glib
|
glib.1.2::devel/glib
|
||||||
|
|
||||||
MAINTAINER= rohee@openbsd.org
|
MAINTAINER= rohee@openbsd.org
|
||||||
|
|
||||||
LICENSE_TYPE= GPL
|
|
||||||
PERMIT_PACKAGE_CDROM= Yes
|
PERMIT_PACKAGE_CDROM= Yes
|
||||||
PERMIT_PACKAGE_FTP= Yes
|
PERMIT_PACKAGE_FTP= Yes
|
||||||
PERMIT_DISTFILES_CDROM= Yes
|
PERMIT_DISTFILES_CDROM= Yes
|
||||||
PERMIT_DISTFILES_FTP= Yes
|
PERMIT_DISTFILES_FTP= Yes
|
||||||
|
|
||||||
USE_GMAKE= Yes
|
USE_GMAKE= Yes
|
||||||
CONFIGURE_STYLE= gnu
|
CONFIGURE_STYLE= gnu
|
||||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||||
CONFIGURE_ARGS+= --enable-static --disable-indent
|
CONFIGURE_ARGS+= --enable-static --disable-indent
|
||||||
CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib-config"
|
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||||
|
LDFLAGS="-L${LOCALBASE}/lib"
|
||||||
# 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
|
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
MD5 (ORBit-0.5.0.tar.gz) = ff977db3e5273bf6e13dd3124bed0696
|
MD5 (ORBit-0.5.3.tar.gz) = ef0e295ab0666973030c552672aaaee7
|
||||||
RMD160 (ORBit-0.5.0.tar.gz) = 166ccbadcb71288a796a131417aada3bae0cad84
|
RMD160 (ORBit-0.5.3.tar.gz) = a505da1081f45e20c4cf460eaba1007ea92d88ca
|
||||||
SHA1 (ORBit-0.5.0.tar.gz) = bce1cc61511dbdcd7d878dd6fd1ab4abc44426ef
|
SHA1 (ORBit-0.5.3.tar.gz) = 42d71f4901a0182b5e0f4f9d4ea2634774002eab
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- Makefile.in.orig Wed Sep 8 18:37:14 1999
|
--- Makefile.in.orig Sun Aug 20 17:05:31 2000
|
||||||
+++ Makefile.in Wed Sep 8 18:04:26 1999
|
+++ Makefile.in Sun Aug 20 17:06:11 2000
|
||||||
@@ -95,7 +95,7 @@
|
@@ -98,7 +98,7 @@
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = 1.3 # required version of automake.
|
AUTOMAKE_OPTIONS = 1.3 # required version of automake.
|
||||||
|
|
@ -1,34 +0,0 @@
|
|||||||
--- src/IIOP/Makefile.in.orig Mon Sep 27 16:38:32 1999
|
|
||||||
+++ src/IIOP/Makefile.in Fri Oct 1 19:50:43 1999
|
|
||||||
@@ -92,9 +92,7 @@
|
|
||||||
VERSION = @VERSION@
|
|
||||||
YACC = @YACC@
|
|
||||||
|
|
||||||
-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
|
|
||||||
|
|
||||||
@@ -112,7 +110,7 @@
|
|
||||||
|
|
||||||
BUILT_SOURCES = $(libwrap_files)
|
|
||||||
|
|
||||||
-libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
|
||||||
+libIIOP_la_LDFLAGS = -version-info 5:0:0
|
|
||||||
|
|
||||||
EXTRA_DIST = IIOP-design.txt
|
|
||||||
|
|
||||||
@@ -127,10 +125,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,32 +0,0 @@
|
|||||||
--- configure.orig Mon Aug 30 17:48:31 1999
|
|
||||||
+++ configure Mon Sep 13 17:46:13 1999
|
|
||||||
@@ -5164,10 +5164,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 +5388,10 @@
|
|
||||||
*) # Relative path.
|
|
||||||
ac_sub_cache_file="$ac_dots$cache_file" ;;
|
|
||||||
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 "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
|
|
||||||
# The eval makes quoting arguments work.
|
|
@ -1,20 +0,0 @@
|
|||||||
--- popt/Makefile.in.orig Wed Sep 8 18:37:56 1999
|
|
||||||
+++ popt/Makefile.in Wed Sep 8 18:06:07 1999
|
|
||||||
@@ -108,7 +108,7 @@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
|
||||||
LDFLAGS = @LDFLAGS@
|
|
||||||
LIBS = @LIBS@
|
|
||||||
-libpopt_la_LDFLAGS =
|
|
||||||
+libpopt_la_LDFLAGS = -version-info 5:0:0
|
|
||||||
libpopt_la_LIBADD =
|
|
||||||
libpopt_la_OBJECTS = popt.lo findme.lo poptparse.lo poptconfig.lo \
|
|
||||||
popthelp.lo
|
|
||||||
@@ -121,7 +121,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) $(LDFLAGS) -o $@
|
|
||||||
+LINK = $(LIBTOOL) --mode=link $(CCLD) -rpath $(PREFIX)/lib $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
|
||||||
HEADERS = $(noinst_HEADERS)
|
|
||||||
|
|
||||||
DIST_COMMON = README ./stamp-h.in COPYING Makefile.am Makefile.in \
|
|
@ -1,11 +0,0 @@
|
|||||||
--- src/services/name/Makefile.in.orig Mon Aug 30 18:01:52 1999
|
|
||||||
+++ src/services/name/Makefile.in Thu Sep 9 17:56:26 1999
|
|
||||||
@@ -107,7 +107,7 @@
|
|
||||||
libORBitservicesinclude_HEADERS = CosNaming.h CosNaming_impl.h CosNaming.idl LName.pidl
|
|
||||||
|
|
||||||
|
|
||||||
-libORBitCosNaming_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
|
||||||
+libORBitCosNaming_la_LDFLAGS = -version-info 5:0:0
|
|
||||||
|
|
||||||
|
|
||||||
INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src @GLIB_CFLAGS@
|
|
@ -1,11 +0,0 @@
|
|||||||
--- src/ORBitutil/Makefile.in.orig Wed Sep 8 18:39:25 1999
|
|
||||||
+++ src/ORBitutil/Makefile.in Wed Sep 8 18:07:43 1999
|
|
||||||
@@ -105,7 +105,7 @@
|
|
||||||
libORBitutilinclude_HEADERS = basic_types.h thread-safety.h trace.h util.h compat.h os-specifics.h
|
|
||||||
|
|
||||||
|
|
||||||
-libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
|
||||||
+libORBitutil_la_LDFLAGS = -version-info 5:0:0
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
||||||
CONFIG_HEADER = ../../config.h
|
|
||||||
CONFIG_CLEAN_FILES =
|
|
@ -1,10 +0,0 @@
|
|||||||
--- src/IIOP/connection.c.orig Wed Sep 8 18:39:37 1999
|
|
||||||
+++ src/IIOP/connection.c Wed Sep 8 18:08:22 1999
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
#include "IIOP.h"
|
|
||||||
#include "IIOP-private.h"
|
|
||||||
#include "giop-msg-buffer.h"
|
|
||||||
+#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <errno.h>
|
|
@ -1,11 +0,0 @@
|
|||||||
--- src/orb/Makefile.in.orig Wed Sep 8 18:39:49 1999
|
|
||||||
+++ src/orb/Makefile.in Wed Sep 8 18:08:42 1999
|
|
||||||
@@ -110,7 +110,7 @@
|
|
||||||
IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
|
|
||||||
IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
|
|
||||||
|
|
||||||
-libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
|
||||||
+libORBit_la_LDFLAGS = -version-info 5:0:0
|
|
||||||
libORBit_la_LIBADD = $(GLIB_LIBS) -lm
|
|
||||||
|
|
||||||
BUILT_SOURCES = interface_repository.h interface_repository-common.c interface_repository-stubs.c
|
|
@ -1,20 +0,0 @@
|
|||||||
--- libIDL/Makefile.in.orig Wed Sep 8 18:40:06 1999
|
|
||||||
+++ libIDL/Makefile.in Wed Sep 8 18:09:18 1999
|
|
||||||
@@ -92,7 +92,7 @@
|
|
||||||
LT_RELEASE = @LT_RELEASE@
|
|
||||||
LT_REVISION = @LT_REVISION@
|
|
||||||
MAINT = @MAINT@
|
|
||||||
-MAKEINFO = @MAKEINFO@
|
|
||||||
+MAKEINFO = @MAKEINFO@ --no-split
|
|
||||||
NM = @NM@
|
|
||||||
PACKAGE = @PACKAGE@
|
|
||||||
RANLIB = @RANLIB@
|
|
||||||
@@ -123,7 +123,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 = -version-info 5:0:0
|
|
||||||
|
|
||||||
|
|
||||||
m4datadir = $(datadir)/aclocal
|
|
@ -1,11 +0,0 @@
|
|||||||
--- src/daemons/interface_repository/Makefile.in.orig Wed Sep 8 18:40:33 1999
|
|
||||||
+++ src/daemons/interface_repository/Makefile.in Wed Sep 8 18:10:07 1999
|
|
||||||
@@ -102,7 +102,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
orbit_ird_SOURCES = interface_repository-skels.c interface_repository-impl.c
|
|
@ -1,11 +0,0 @@
|
|||||||
--- 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 @@
|
|
||||||
;;
|
|
||||||
|
|
||||||
client|server)
|
|
||||||
- the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
|
|
||||||
+ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm -lwrap"
|
|
||||||
the_flags="$the_flags `glib-config --cflags` -I@includedir@"
|
|
||||||
;;
|
|
||||||
|
|
21
devel/ORBit/patches/patch-libIDL_Makefile.in
Normal file
21
devel/ORBit/patches/patch-libIDL_Makefile.in
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
--- libIDL/Makefile.in.orig Mon Aug 21 05:07:15 2000
|
||||||
|
+++ libIDL/Makefile.in Mon Aug 21 05:07:40 2000
|
||||||
|
@@ -88,7 +88,7 @@
|
||||||
|
LT_RELEASE = @LT_RELEASE@
|
||||||
|
LT_REVISION = @LT_REVISION@
|
||||||
|
MAINT = @MAINT@
|
||||||
|
-MAKEINFO = @MAKEINFO@
|
||||||
|
+MAKEINFO = @MAKEINFO@ --no-split
|
||||||
|
OBJDUMP = @OBJDUMP@
|
||||||
|
PACKAGE = @PACKAGE@
|
||||||
|
RANLIB = @RANLIB@
|
||||||
|
@@ -130,8 +130,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 = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||||
|
|
||||||
|
|
||||||
|
m4datadir = $(datadir)/aclocal
|
10
devel/ORBit/patches/patch-libIDL_ltconfig
Normal file
10
devel/ORBit/patches/patch-libIDL_ltconfig
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- libIDL/ltconfig.orig Sun Aug 20 17:22:44 2000
|
||||||
|
+++ libIDL/ltconfig Sun Aug 20 17:22:53 2000
|
||||||
|
@@ -2004,6 +2004,7 @@
|
||||||
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||||
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||||
|
shlibpath_var=LD_LIBRARY_PATH
|
||||||
|
+ deplibs_check_method='pass_all'
|
||||||
|
;;
|
||||||
|
|
||||||
|
os2*)
|
@ -1,6 +1,6 @@
|
|||||||
--- libIDL/ltmain.sh.orig Tue Sep 28 12:11:49 1999
|
--- libIDL/ltmain.sh.orig Tue Jul 25 18:28:39 2000
|
||||||
+++ libIDL/ltmain.sh Sat Oct 16 19:32:45 1999
|
+++ libIDL/ltmain.sh Sun Aug 20 17:20:54 2000
|
||||||
@@ -3326,40 +3326,6 @@
|
@@ -3555,40 +3555,6 @@
|
||||||
# Exit here if they wanted silent mode.
|
# Exit here if they wanted silent mode.
|
||||||
test "$show" = : && exit 0
|
test "$show" = : && exit 0
|
||||||
|
|
10
devel/ORBit/patches/patch-ltconfig
Normal file
10
devel/ORBit/patches/patch-ltconfig
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- ltconfig.orig Sun Aug 20 17:21:15 2000
|
||||||
|
+++ ltconfig Sun Aug 20 17:21:50 2000
|
||||||
|
@@ -2004,6 +2004,7 @@
|
||||||
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||||
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||||
|
shlibpath_var=LD_LIBRARY_PATH
|
||||||
|
+ deplibs_check_method='pass_all'
|
||||||
|
;;
|
||||||
|
|
||||||
|
os2*)
|
@ -1,6 +1,6 @@
|
|||||||
--- ltmain.sh.orig Tue Sep 28 12:11:40 1999
|
--- ltmain.sh.orig Tue Jul 25 18:28:29 2000
|
||||||
+++ ltmain.sh Sat Oct 16 19:32:44 1999
|
+++ ltmain.sh Sun Aug 20 17:19:44 2000
|
||||||
@@ -3326,40 +3326,6 @@
|
@@ -3555,40 +3555,6 @@
|
||||||
# Exit here if they wanted silent mode.
|
# Exit here if they wanted silent mode.
|
||||||
test "$show" = : && exit 0
|
test "$show" = : && exit 0
|
||||||
|
|
11
devel/ORBit/patches/patch-orbit-config.in
Normal file
11
devel/ORBit/patches/patch-orbit-config.in
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- orbit-config.in.orig Mon Aug 21 06:26:09 2000
|
||||||
|
+++ orbit-config.in Mon Aug 21 06:26:34 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 -lORBit -lIIOP -lwrap -lORBitutil `glib-config --libs` @LIBS@ -lm"
|
||||||
|
the_flags="$the_flags `glib-config --cflags` -I$includedir "
|
||||||
|
;;
|
||||||
|
|
11
devel/ORBit/patches/patch-popt_Makefile.in
Normal file
11
devel/ORBit/patches/patch-popt_Makefile.in
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- popt/Makefile.in.orig Mon Aug 21 05:52:25 2000
|
||||||
|
+++ popt/Makefile.in Mon Aug 21 05:52:46 2000
|
||||||
|
@@ -160,7 +160,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 $(libdir) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
|
DIST_SOURCES = $(libpopt_la_SOURCES) $(test1_SOURCES) $(test2_SOURCES)
|
||||||
|
HEADERS = $(noinst_HEADERS)
|
||||||
|
|
10
devel/ORBit/patches/patch-popt_ltconfig
Normal file
10
devel/ORBit/patches/patch-popt_ltconfig
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- popt/ltconfig.orig Sun Aug 20 17:22:13 2000
|
||||||
|
+++ popt/ltconfig Sun Aug 20 17:22:23 2000
|
||||||
|
@@ -2004,6 +2004,7 @@
|
||||||
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||||
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||||
|
shlibpath_var=LD_LIBRARY_PATH
|
||||||
|
+ deplibs_check_method='pass_all'
|
||||||
|
;;
|
||||||
|
|
||||||
|
os2*)
|
@ -1,6 +1,6 @@
|
|||||||
--- popt/ltmain.sh.orig Tue Sep 28 12:11:51 1999
|
--- popt/ltmain.sh.orig Tue Jul 25 18:28:41 2000
|
||||||
+++ popt/ltmain.sh Sat Oct 16 19:32:45 1999
|
+++ popt/ltmain.sh Sun Aug 20 17:20:05 2000
|
||||||
@@ -3326,40 +3326,6 @@
|
@@ -3555,40 +3555,6 @@
|
||||||
# Exit here if they wanted silent mode.
|
# Exit here if they wanted silent mode.
|
||||||
test "$show" = : && exit 0
|
test "$show" = : && exit 0
|
||||||
|
|
31
devel/ORBit/patches/patch-src_IIOP_Makefile.in
Normal file
31
devel/ORBit/patches/patch-src_IIOP_Makefile.in
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
--- src/IIOP/Makefile.in.orig Mon Aug 21 06:21:54 2000
|
||||||
|
+++ src/IIOP/Makefile.in Mon Aug 21 06:20:15 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)
|
17
devel/ORBit/patches/patch-src_IIOP_connection.c
Normal file
17
devel/ORBit/patches/patch-src_IIOP_connection.c
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
--- src/IIOP/connection.c.orig Fri Feb 18 11:18:00 2000
|
||||||
|
+++ src/IIOP/connection.c Mon Aug 21 05:54:57 2000
|
||||||
|
@@ -1,3 +1,6 @@
|
||||||
|
+#include <sys/types.h>
|
||||||
|
+#include <sys/param.h>
|
||||||
|
+#include <stdio.h>
|
||||||
|
#include "config.h"
|
||||||
|
#ifndef _XOPEN_SOURCE_EXTENDED
|
||||||
|
# define _XOPEN_SOURCE_EXTENDED 1
|
||||||
|
@@ -13,7 +16,6 @@
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
-#include <sys/types.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/un.h>
|
@ -0,0 +1,11 @@
|
|||||||
|
--- src/daemons/interface_repository/Makefile.in.orig Mon Aug 21 06:29:25 2000
|
||||||
|
+++ src/daemons/interface_repository/Makefile.in Mon Aug 21 06:29:35 2000
|
||||||
|
@@ -113,7 +113,7 @@
|
||||||
|
$(top_builddir)/src/IIOP/libIIOP.la \
|
||||||
|
$(top_builddir)/src/ORBitutil/libORBitutil.la \
|
||||||
|
@GLIB_LIBS@ \
|
||||||
|
- -lm
|
||||||
|
+ -lm -lwrap
|
||||||
|
|
||||||
|
|
||||||
|
orbit_ird_SOURCES = \
|
11
devel/ORBit/patches/patch-src_services_event_Makefile.in
Normal file
11
devel/ORBit/patches/patch-src_services_event_Makefile.in
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- src/services/event/Makefile.in.orig Mon Aug 21 06:30:58 2000
|
||||||
|
+++ src/services/event/Makefile.in Mon Aug 21 06:31:08 2000
|
||||||
|
@@ -138,7 +138,7 @@
|
||||||
|
$(top_builddir)/src/IIOP/libIIOP.la \
|
||||||
|
$(top_builddir)/src/ORBitutil/libORBitutil.la \
|
||||||
|
@GLIB_LIBS@ \
|
||||||
|
- -lm
|
||||||
|
+ -lm -lwrap
|
||||||
|
|
||||||
|
|
||||||
|
event_consumer_SOURCES = event-consumer.c \
|
11
devel/ORBit/patches/patch-src_services_name_Makefile.in
Normal file
11
devel/ORBit/patches/patch-src_services_name_Makefile.in
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- src/services/name/Makefile.in.orig Mon Aug 21 06:01:35 2000
|
||||||
|
+++ src/services/name/Makefile.in Mon Aug 21 06:02:02 2000
|
||||||
|
@@ -147,7 +147,7 @@
|
||||||
|
$(top_builddir)/src/ORBitutil/libORBitutil.la \
|
||||||
|
libORBitCosNaming.la \
|
||||||
|
@GLIB_LIBS@ \
|
||||||
|
- -lm
|
||||||
|
+ -lm -lwrap
|
||||||
|
|
||||||
|
|
||||||
|
#name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h
|
@ -1,7 +1,7 @@
|
|||||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2000/08/20 20:42:12 brad Exp $
|
@comment $OpenBSD: PFRAG.shared,v 1.4 2000/08/21 12:20:23 brad Exp $
|
||||||
lib/libIDL.so.5.0
|
lib/libIDL.so.4.4
|
||||||
lib/libIIOP.so.5.0
|
lib/libIIOP.so.5.3
|
||||||
lib/libORBit.so.5.0
|
lib/libORBit.so.5.3
|
||||||
lib/libORBitCosNaming.so.5.0
|
lib/libORBitCosNaming.so.5.3
|
||||||
lib/libORBitutil.so.5.0
|
lib/libORBitutil.so.5.3
|
||||||
DYNLIBDIR(%B)
|
DYNLIBDIR(%B)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.10 2000/08/20 20:42:13 brad Exp $
|
@comment $OpenBSD: PLIST,v 1.11 2000/08/21 12:20:23 brad Exp $
|
||||||
@pkgcfl libIDL-*
|
@pkgcfl libIDL-*
|
||||||
bin/libIDL-config
|
bin/libIDL-config
|
||||||
bin/name-client
|
bin/name-client
|
||||||
@ -24,6 +24,8 @@ include/ORBitservices/CosTypedEventComm.idl
|
|||||||
include/ORBitservices/LName.pidl
|
include/ORBitservices/LName.pidl
|
||||||
include/ORBitutil/basic_types.h
|
include/ORBitutil/basic_types.h
|
||||||
include/ORBitutil/compat.h
|
include/ORBitutil/compat.h
|
||||||
|
include/ORBitutil/orbit-os-config.h
|
||||||
|
include/ORBitutil/os-feature-alloca.h
|
||||||
include/ORBitutil/os-specifics.h
|
include/ORBitutil/os-specifics.h
|
||||||
include/ORBitutil/thread-safety.h
|
include/ORBitutil/thread-safety.h
|
||||||
include/ORBitutil/trace.h
|
include/ORBitutil/trace.h
|
||||||
@ -36,6 +38,7 @@ include/orb/corba_any.h
|
|||||||
include/orb/corba_any_proto.h
|
include/orb/corba_any_proto.h
|
||||||
include/orb/corba_any_type.h
|
include/orb/corba_any_type.h
|
||||||
include/orb/corba_basic_sequences_type.h
|
include/orb/corba_basic_sequences_type.h
|
||||||
|
include/orb/corba_context.h
|
||||||
include/orb/corba_env.h
|
include/orb/corba_env.h
|
||||||
include/orb/corba_env_type.h
|
include/orb/corba_env_type.h
|
||||||
include/orb/corba_object.h
|
include/orb/corba_object.h
|
||||||
@ -85,6 +88,7 @@ lib/libORBitutil.la
|
|||||||
lib/libname-server.a
|
lib/libname-server.a
|
||||||
lib/liborbit-c-backend.a
|
lib/liborbit-c-backend.a
|
||||||
%%SHARED%%
|
%%SHARED%%
|
||||||
|
share/aclocal/ORBit.m4
|
||||||
share/aclocal/libIDL.m4
|
share/aclocal/libIDL.m4
|
||||||
@dirrm include/IIOP
|
@dirrm include/IIOP
|
||||||
@dirrm include/ORBitservices
|
@dirrm include/ORBitservices
|
||||||
|
Loading…
Reference in New Issue
Block a user