From c017b7575edcc726f92167f2be706eecf1c7e780 Mon Sep 17 00:00:00 2001 From: brad Date: Fri, 29 Oct 1999 21:35:00 +0000 Subject: [PATCH] upgrade to ORBit 0.5.0 --- devel/ORBit/Makefile | 25 +++++----- devel/ORBit/files/md5 | 6 +-- devel/ORBit/patches/patch-aa | 2 +- devel/ORBit/patches/patch-ad | 2 +- devel/ORBit/patches/patch-ae | 2 +- devel/ORBit/patches/patch-af | 2 +- devel/ORBit/patches/patch-ah | 2 +- devel/ORBit/patches/patch-ai | 2 +- devel/ORBit/patches/patch-al | 90 +--------------------------------- devel/ORBit/patches/patch-am | 43 ++++++++++++++++ devel/ORBit/patches/patch-an | 43 ++++++++++++++++ devel/ORBit/pkg/PLIST | 27 +++++----- devel/ORBit/pkg/PLIST.noshared | 15 +++--- 13 files changed, 130 insertions(+), 131 deletions(-) create mode 100644 devel/ORBit/patches/patch-am create mode 100644 devel/ORBit/patches/patch-an diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile index 5aaa7463469..2a593008964 100644 --- a/devel/ORBit/Makefile +++ b/devel/ORBit/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.8 1999/10/02 17:54:40 brad Exp $ +# $OpenBSD: Makefile,v 1.9 1999/10/29 21:35:00 brad Exp $ -DISTNAME= ORBit-0.4.96 +DISTNAME= ORBit-0.5.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= ORBit @@ -24,21 +24,22 @@ CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib-config" # 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; \ + 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: @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 + @install-info ${PREFIX}/info/libIDL.info ${PREFIX}/info/dir .include diff --git a/devel/ORBit/files/md5 b/devel/ORBit/files/md5 index efe25be6edb..b2b0ff9101f 100644 --- a/devel/ORBit/files/md5 +++ b/devel/ORBit/files/md5 @@ -1,3 +1,3 @@ -MD5 (ORBit-0.4.96.tar.gz) = 8034227ca5a6d97dea88bc58c27b934c -RMD160 (ORBit-0.4.96.tar.gz) = 0c94e69d41d4354b41eadaba627ecc5b0f20b465 -SHA1 (ORBit-0.4.96.tar.gz) = 1a03855442a760f4c42fbdd86bd29cba1f4de03b +MD5 (ORBit-0.5.0.tar.gz) = ff977db3e5273bf6e13dd3124bed0696 +RMD160 (ORBit-0.5.0.tar.gz) = 166ccbadcb71288a796a131417aada3bae0cad84 +SHA1 (ORBit-0.5.0.tar.gz) = bce1cc61511dbdcd7d878dd6fd1ab4abc44426ef diff --git a/devel/ORBit/patches/patch-aa b/devel/ORBit/patches/patch-aa index 9189d61e5ed..6fa2e6bfb05 100644 --- a/devel/ORBit/patches/patch-aa +++ b/devel/ORBit/patches/patch-aa @@ -16,7 +16,7 @@ BUILT_SOURCES = $(libwrap_files) -libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libIIOP_la_LDFLAGS = -version-info 0:4:0 ++libIIOP_la_LDFLAGS = -version-info 5:0:0 EXTRA_DIST = IIOP-design.txt diff --git a/devel/ORBit/patches/patch-ad b/devel/ORBit/patches/patch-ad index 610d91ef5d1..4bb1d19b4c0 100644 --- a/devel/ORBit/patches/patch-ad +++ b/devel/ORBit/patches/patch-ad @@ -5,7 +5,7 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libpopt_la_LDFLAGS = -+libpopt_la_LDFLAGS = -version-info 0:4:0 ++libpopt_la_LDFLAGS = -version-info 5:0:0 libpopt_la_LIBADD = libpopt_la_OBJECTS = popt.lo findme.lo poptparse.lo poptconfig.lo \ popthelp.lo diff --git a/devel/ORBit/patches/patch-ae b/devel/ORBit/patches/patch-ae index 18dacf97601..955a0af1fa7 100644 --- a/devel/ORBit/patches/patch-ae +++ b/devel/ORBit/patches/patch-ae @@ -5,7 +5,7 @@ -libORBitCosNaming_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libORBitCosNaming_la_LDFLAGS = -version-info 0:4:0 ++libORBitCosNaming_la_LDFLAGS = -version-info 5:0:0 INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src @GLIB_CFLAGS@ diff --git a/devel/ORBit/patches/patch-af b/devel/ORBit/patches/patch-af index 18b16f4c34c..6cf06baf2a0 100644 --- a/devel/ORBit/patches/patch-af +++ b/devel/ORBit/patches/patch-af @@ -5,7 +5,7 @@ -libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libORBitutil_la_LDFLAGS = -version-info 0:4:0 ++libORBitutil_la_LDFLAGS = -version-info 5:0:0 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = diff --git a/devel/ORBit/patches/patch-ah b/devel/ORBit/patches/patch-ah index 363f72b5e18..e2067599267 100644 --- a/devel/ORBit/patches/patch-ah +++ b/devel/ORBit/patches/patch-ah @@ -5,7 +5,7 @@ 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 0:4:0 ++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 diff --git a/devel/ORBit/patches/patch-ai b/devel/ORBit/patches/patch-ai index d4332350bfc..2a6584d77e3 100644 --- a/devel/ORBit/patches/patch-ai +++ b/devel/ORBit/patches/patch-ai @@ -14,7 +14,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 0:4:0 ++libIDL_la_LDFLAGS = -version-info 5:0:0 m4datadir = $(datadir)/aclocal diff --git a/devel/ORBit/patches/patch-al b/devel/ORBit/patches/patch-al index fa2a218b99d..6c9ecd54ff9 100644 --- a/devel/ORBit/patches/patch-al +++ b/devel/ORBit/patches/patch-al @@ -1,91 +1,5 @@ ---- 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 - ;; - ---- 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 +--- ltmain.sh.orig Tue Sep 28 12:11:40 1999 ++++ ltmain.sh Sat Oct 16 19:32:44 1999 @@ -3326,40 +3326,6 @@ # Exit here if they wanted silent mode. test "$show" = : && exit 0 diff --git a/devel/ORBit/patches/patch-am b/devel/ORBit/patches/patch-am new file mode 100644 index 00000000000..ec2d19203ef --- /dev/null +++ b/devel/ORBit/patches/patch-am @@ -0,0 +1,43 @@ +--- popt/ltmain.sh.orig Tue Sep 28 12:11:51 1999 ++++ popt/ltmain.sh Sat Oct 16 19:32:45 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 + ;; + diff --git a/devel/ORBit/patches/patch-an b/devel/ORBit/patches/patch-an new file mode 100644 index 00000000000..c3900f5f413 --- /dev/null +++ b/devel/ORBit/patches/patch-an @@ -0,0 +1,43 @@ +--- libIDL/ltmain.sh.orig Tue Sep 28 12:11:49 1999 ++++ libIDL/ltmain.sh Sat Oct 16 19:32:45 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 + ;; + diff --git a/devel/ORBit/pkg/PLIST b/devel/ORBit/pkg/PLIST index 36125edfd32..ed5778b4bd1 100644 --- a/devel/ORBit/pkg/PLIST +++ b/devel/ORBit/pkg/PLIST @@ -8,7 +8,6 @@ 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/orbit-idl2.h @@ -71,25 +70,25 @@ include/ORBitservices/CosEventComm.idl include/ORBitservices/CosEventChannel.idl include/ORBitservices/CosTypedEventComm.idl include/ORBitservices/CosTypedEventChannel.idl -lib/libIDL.so.0.4 -lib/libIDL.la -lib/libIDL.a lib/libIDLConf.sh -lib/libORBit.so.0.4 -lib/libORBit.la +lib/libIDL.a +lib/libIDL.la +lib/libIDL.so.5.0 lib/libORBit.a -lib/libORBitutil.so.0.4 -lib/libORBitutil.la +lib/libORBit.la +lib/libORBit.so.5.0 lib/libORBitutil.a -lib/libIIOP.so.0.4 -lib/libIIOP.la +lib/libORBitutil.la +lib/libORBitutil.so.5.0 lib/libIIOP.a +lib/libIIOP.la +lib/libIIOP.so.5.0 +lib/libORBitCosNaming.a +lib/libORBitCosNaming.la +lib/libORBitCosNaming.so.5.0 +@exec /sbin/ldconfig -m %B lib/libname-server.a lib/liborbit-c-backend.a -lib/libORBitCosNaming.so.0.4 -@exec /sbin/ldconfig -m %B -lib/libORBitCosNaming.la -lib/libORBitCosNaming.a @dirrm include/ORBitservices @dirrm include/IIOP @dirrm include/ORBitutil diff --git a/devel/ORBit/pkg/PLIST.noshared b/devel/ORBit/pkg/PLIST.noshared index e49ff4264a1..6bac317132c 100644 --- a/devel/ORBit/pkg/PLIST.noshared +++ b/devel/ORBit/pkg/PLIST.noshared @@ -8,7 +8,6 @@ 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/orbit-idl2.h @@ -71,19 +70,19 @@ include/ORBitservices/CosEventComm.idl include/ORBitservices/CosEventChannel.idl include/ORBitservices/CosTypedEventComm.idl include/ORBitservices/CosTypedEventChannel.idl -lib/libIDL.la -lib/libIDL.a lib/libIDLConf.sh -lib/libORBit.la +lib/libIDL.a +lib/libIDL.la lib/libORBit.a -lib/libORBitutil.la +lib/libORBit.la lib/libORBitutil.a -lib/libIIOP.la +lib/libORBitutil.la lib/libIIOP.a +lib/libIIOP.la +lib/libORBitCosNaming.a +lib/libORBitCosNaming.la lib/libname-server.a lib/liborbit-c-backend.a -lib/libORBitCosNaming.la -lib/libORBitCosNaming.a @dirrm include/ORBitservices @dirrm include/IIOP @dirrm include/ORBitutil