From 6e318c32b4c10ecd355828ea596aec87c7b5da9f Mon Sep 17 00:00:00 2001 From: marcm Date: Thu, 14 Nov 2002 20:52:57 +0000 Subject: [PATCH] Update to 1.0.21. Minor bugfix release. ok todd@ --- x11/gnome/bonobo/Makefile | 4 +- x11/gnome/bonobo/distinfo | 6 +- x11/gnome/bonobo/patches/patch-configure | 79 ++++++++----------- .../bonobo/patches/patch-libefs_configure | 71 +++++++---------- x11/gnome/bonobo/patches/patch-ltmain_sh | 31 ++++---- x11/gnome/bonobo/pkg/PFRAG.shared | 3 +- x11/gnome/bonobo/pkg/PLIST | 6 +- 7 files changed, 85 insertions(+), 115 deletions(-) diff --git a/x11/gnome/bonobo/Makefile b/x11/gnome/bonobo/Makefile index 737199c5584..790b40914b1 100644 --- a/x11/gnome/bonobo/Makefile +++ b/x11/gnome/bonobo/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2002/09/22 15:37:35 marcm Exp $ +# $OpenBSD: Makefile,v 1.6 2002/11/14 20:52:57 marcm Exp $ COMMENT= "architecture for creating reusable software components" COMMENT-docs= "documentation for the bonobo architecture" -VERSION= 1.0.20 +VERSION= 1.0.21 DISTNAME= bonobo-${VERSION} PKGNAME-docs= bonobo-docs-${VERSION} CATEGORIES= x11/gnome diff --git a/x11/gnome/bonobo/distinfo b/x11/gnome/bonobo/distinfo index 720b9819f8c..bab0e8b57e2 100644 --- a/x11/gnome/bonobo/distinfo +++ b/x11/gnome/bonobo/distinfo @@ -1,3 +1,3 @@ -MD5 (bonobo-1.0.20.tar.bz2) = c4c586e2f8670a0adf6116f9b7e6e496 -RMD160 (bonobo-1.0.20.tar.bz2) = 5da1fe75282eb89dbc8f8a2f561a3b025dabd576 -SHA1 (bonobo-1.0.20.tar.bz2) = 2aee87ac64552364501a7fca4e541e02e8907f64 +MD5 (bonobo-1.0.21.tar.bz2) = 79265a2889db3cd2fba097b1064df4fb +RMD160 (bonobo-1.0.21.tar.bz2) = 10eece8ccdc4c9fcda55f43dc0fde1ac12cf65e8 +SHA1 (bonobo-1.0.21.tar.bz2) = 02b83d4635b4ea683da574309fe413def373b7f0 diff --git a/x11/gnome/bonobo/patches/patch-configure b/x11/gnome/bonobo/patches/patch-configure index 32cb63e2456..1e267b56c61 100644 --- a/x11/gnome/bonobo/patches/patch-configure +++ b/x11/gnome/bonobo/patches/patch-configure @@ -1,58 +1,45 @@ -$OpenBSD: patch-configure,v 1.2 2002/07/18 20:50:56 pvalchev Exp $ ---- configure.orig Thu Apr 11 08:10:55 2002 -+++ configure Mon May 20 11:38:09 2002 -@@ -3910,6 +3910,16 @@ newos6*) - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -+openbsd*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then -+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ else -+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ fi -+ ;; -+ - osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -@@ -5620,8 +5630,8 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' +$OpenBSD: patch-configure,v 1.3 2002/11/14 20:52:57 marcm Exp $ +--- configure.orig Mon Oct 7 23:07:43 2002 ++++ configure Mon Oct 7 23:11:16 2002 +@@ -6437,8 +6437,8 @@ else hardcode_direct=yes hardcode_shlibpath_var=no - ;; -@@ -6104,10 +6114,11 @@ newsos6) - - openbsd*) + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in +@@ -6447,8 +6447,8 @@ else + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + ;; + esac + fi +@@ -6964,6 +6964,8 @@ openbsd*) version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi -+ need_lib_prefix=no -+ need_version=no + need_lib_prefix=no + need_version=no + sys_lib_search_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" -+ shlibpath_overrides_runpath=yes - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -9737,6 +9748,10 @@ echo "$as_me:9736: result: $gt_cv_func_g - echo "${ECHO_T}$gt_cv_func_gettext_libintl" >&6 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case "$host_os" in + openbsd2.[89] | openbsd2.[89].*) +@@ -10898,6 +10900,10 @@ echo "${ECHO_T}$gt_cv_func_gettext_libin fi -+ fi + fi + + if test "$gt_cv_func_gettext_libintl" = "yes"; then + LIBS="$LIBS -lintl"; - fi ++ fi if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then diff --git a/x11/gnome/bonobo/patches/patch-libefs_configure b/x11/gnome/bonobo/patches/patch-libefs_configure index a4a7bbbcd46..5af8f0c41e0 100644 --- a/x11/gnome/bonobo/patches/patch-libefs_configure +++ b/x11/gnome/bonobo/patches/patch-libefs_configure @@ -1,47 +1,34 @@ -$OpenBSD: patch-libefs_configure,v 1.2 2002/07/18 20:50:56 pvalchev Exp $ ---- libefs/configure.orig Thu Apr 11 08:11:03 2002 -+++ libefs/configure Mon May 20 11:42:08 2002 -@@ -2930,6 +2930,16 @@ newos6*) - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -+openbsd*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then -+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ else -+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ fi -+ ;; -+ - osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -@@ -4640,8 +4650,8 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' +$OpenBSD: patch-libefs_configure,v 1.3 2002/11/14 20:52:57 marcm Exp $ +--- libefs/configure.orig Mon Oct 7 23:15:02 2002 ++++ libefs/configure Mon Oct 7 23:16:20 2002 +@@ -5435,8 +5435,8 @@ else hardcode_direct=yes hardcode_shlibpath_var=no - ;; -@@ -5124,10 +5134,11 @@ newsos6) - - openbsd*) + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in +@@ -5445,8 +5445,8 @@ else + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + ;; + esac + fi +@@ -5962,6 +5962,8 @@ openbsd*) version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi -+ need_lib_prefix=no -+ need_version=no + need_lib_prefix=no + need_version=no + sys_lib_search_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" -+ shlibpath_overrides_runpath=yes - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case "$host_os" in + openbsd2.[89] | openbsd2.[89].*) diff --git a/x11/gnome/bonobo/patches/patch-ltmain_sh b/x11/gnome/bonobo/patches/patch-ltmain_sh index 89c6eedc0a9..abed602de2a 100644 --- a/x11/gnome/bonobo/patches/patch-ltmain_sh +++ b/x11/gnome/bonobo/patches/patch-ltmain_sh @@ -1,8 +1,7 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/05/30 09:45:37 nino Exp $ -Patch for version 1.4 of libtool ---- ltmain.sh.orig Thu Apr 11 08:10:55 2002 -+++ ltmain.sh Fri Apr 26 17:13:56 2002 -@@ -1048,6 +1048,17 @@ compiler." +$OpenBSD: patch-ltmain_sh,v 1.2 2002/11/14 20:52:57 marcm Exp $ +--- ltmain.sh.orig Sun Oct 6 12:24:35 2002 ++++ ltmain.sh Tue Oct 8 13:39:20 2002 +@@ -1249,6 +1249,17 @@ EOF continue ;; @@ -20,32 +19,30 @@ Patch for version 1.4 of libtool -module) module=yes continue -@@ -1484,6 +1495,10 @@ compiler." +@@ -1836,6 +1847,9 @@ EOF fi continue ;; + -pthread) + continue + ;; -+ %DEPLIBS%) alldeplibs=yes continue -@@ -1725,11 +1740,6 @@ compiler." - continue - fi - +@@ -2079,10 +2093,6 @@ EOF + link_static=no # Whether the deplib will be linked statically + if test -n "$library_names" && + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi -- - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names -@@ -4464,40 +4474,6 @@ relink_command=\"$relink_command\"" + # This is a shared library + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then +@@ -4951,40 +4961,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 + test "$show" = : && exit 0 - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" diff --git a/x11/gnome/bonobo/pkg/PFRAG.shared b/x11/gnome/bonobo/pkg/PFRAG.shared index d04869dd17f..c65d93c4506 100644 --- a/x11/gnome/bonobo/pkg/PFRAG.shared +++ b/x11/gnome/bonobo/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/05/30 09:45:37 nino Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.2 2002/11/14 20:52:57 marcm Exp $ lib/libbonobo-print.so.2.0 lib/libbonobo.so.2.0 lib/libbonobox.so.2.0 @@ -7,4 +7,3 @@ lib/bonobo/monikers/libmoniker_std.so lib/bonobo/plugin/libstorage_efs.so lib/bonobo/plugin/libstorage_fs.so DYNLIBDIR(%D/lib) - diff --git a/x11/gnome/bonobo/pkg/PLIST b/x11/gnome/bonobo/pkg/PLIST index e9a01ace6d2..370eee24030 100644 --- a/x11/gnome/bonobo/pkg/PLIST +++ b/x11/gnome/bonobo/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2002/06/13 11:26:43 nino Exp $ +@comment $OpenBSD: PLIST,v 1.4 2002/11/14 20:52:57 marcm Exp $ bin/bonobo-application-x-mines bin/bonobo-audio-ulaw bin/bonobo-echo @@ -251,6 +251,6 @@ share/oaf/Bonobo_Selector.oaf @comment @dirrm share/gnome @comment @dirrm lib/pkgconfig @dirrm lib/bonobo/plugin -@dirrm lib/bonobo/monikers -@dirrm lib/bonobo +@comment @dirrm lib/bonobo/monikers +@comment @dirrm lib/bonobo @dirrm include/gnome-1.0/bonobo