cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.0.22, which eliminates leaking of toolbar widgets. Backported

Browse Source 
from Bonobo 2.

As usual, an itty-bitty fix generates a huge port update because the
autoconf version was changed too.
This commit is contained in:
marcm 2003-02-19 18:37:57 +00:00
parent e0ef69600d
commit 05920affc7
7 changed files with 209 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/bonobo/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2002/11/14 20:52:57 marcm Exp $
# $OpenBSD: Makefile,v 1.7 2003/02/19 18:37:57 marcm Exp $
COMMENT= "architecture for creating reusable software components"
COMMENT-docs= "documentation for the bonobo architecture"
VERSION= 1.0.21
VERSION= 1.0.22
DISTNAME= bonobo-${VERSION}
PKGNAME-docs= bonobo-docs-${VERSION}
CATEGORIES= x11/gnome

6
x11/gnome/bonobo/distinfo
View File

@ -1,3 +1,3 @@
MD5 (bonobo-1.0.21.tar.bz2) = 79265a2889db3cd2fba097b1064df4fb
RMD160 (bonobo-1.0.21.tar.bz2) = 10eece8ccdc4c9fcda55f43dc0fde1ac12cf65e8
SHA1 (bonobo-1.0.21.tar.bz2) = 02b83d4635b4ea683da574309fe413def373b7f0
MD5 (bonobo-1.0.22.tar.bz2) = 7718c374ed82911b24d95fa3ab55dda5
RMD160 (bonobo-1.0.22.tar.bz2) = 9c013077770ca5452c92a9299a579bf41a7f2c5c
SHA1 (bonobo-1.0.22.tar.bz2) = 3ec89cc469adf482459e15f37a4008a0d0340c1a

120
x11/gnome/bonobo/patches/patch-configure
View File

@ -1,38 +1,102 @@
$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
$OpenBSD: patch-configure,v 1.4 2003/02/19 18:37:57 marcm Exp $
--- configure.orig Sat Nov 30 18:32:08 2002
+++ configure Fri Jan 24 16:10:19 2003
@@ -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__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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'
@@ -4656,8 +4666,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
fi
# Allow CC to be a program name with arguments.
@@ -5216,7 +5233,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -5620,10 +5639,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
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'
+ 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 $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'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ 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'
;;
esac
fi
@@ -6964,6 +6964,8 @@ openbsd*)
+ ;;
+ esac
+ fi
;;
os2*)
@@ -6104,9 +6137,19 @@ newsos6)
openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
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
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ 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].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -9738,6 +9781,10 @@ echo "${ECHO_T}$gt_cv_func_gettext_libin
fi
fi

118
x11/gnome/bonobo/patches/patch-libefs_configure
View File

@ -1,34 +1,98 @@
$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
$OpenBSD: patch-libefs_configure,v 1.4 2003/02/19 18:37:57 marcm Exp $
--- libefs/configure.orig Sat Nov 30 18:32:11 2002
+++ libefs/configure Fri Jan 24 16:19:44 2003
@@ -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__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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'
@@ -3676,8 +3686,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
fi
# Allow CC to be a program name with arguments.
@@ -4236,7 +4253,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -4640,10 +4659,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
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'
+ 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 $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'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ 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'
;;
esac
fi
@@ -5962,6 +5962,8 @@ openbsd*)
+ ;;
+ esac
+ fi
;;
os2*)
@@ -5124,9 +5157,19 @@ newsos6)
openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
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].*)
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ 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].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

29
x11/gnome/bonobo/patches/patch-ltmain_sh
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-ltmain_sh,v 1.3 2003/02/19 18:37:57 marcm Exp $
--- ltmain.sh.orig Sat Nov 30 18:32:08 2002
+++ ltmain.sh Fri Jan 24 15:02:58 2003
@@ -1037,6 +1037,17 @@ compiler."
continue
;;
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2002/11/14 20:52:57 marcm Exp $
-module)
module=yes
continue
@@ -1836,6 +1847,9 @@ EOF
@@ -1473,6 +1484,9 @@ compiler."
fi
continue
;;
@ -29,20 +29,21 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2002/11/14 20:52:57 marcm Exp $
%DEPLIBS%)
alldeplibs=yes
continue
@@ -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
@@ -1714,11 +1728,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
# This is a shared library
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
@@ -4951,40 +4961,6 @@ relink_command=\"$relink_command\""
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4412,40 +4421,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:"

10
x11/gnome/bonobo/pkg/PFRAG.shared
View File

@ -1,9 +1,9 @@
@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
lib/libefs.so.1.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2003/02/19 18:37:57 marcm Exp $
lib/bonobo/monikers/libmoniker_std.so
lib/bonobo/plugin/libstorage_efs.so
lib/bonobo/plugin/libstorage_fs.so
lib/libbonobo-print.so.2.1
lib/libbonobo.so.2.1
lib/libbonobox.so.2.1
lib/libefs.so.1.0
DYNLIBDIR(%D/lib)

7
x11/gnome/bonobo/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2002/11/14 20:52:57 marcm Exp $
@comment $OpenBSD: PLIST,v 1.5 2003/02/19 18:37:57 marcm Exp $
bin/bonobo-application-x-mines
bin/bonobo-audio-ulaw
bin/bonobo-echo
@ -237,12 +237,7 @@ share/oaf/Bonobo_Selector.oaf
@comment @dirrm share/locale/az/LC_MESSAGES
@comment @dirrm share/locale/az
@comment @dirrm share/locale
@comment @exec mkdir -p %D/share/libefs/html/libefs
@comment @dirrm share/libefs/html/libefs
@comment @dirrm share/libefs/html
@comment @dirrm share/libefs
@comment @dirrm share/gnome/ui
@comment @exec mkdir -p %D/share/gnome/bonobo/docs/audio_ulaw/C/images
@comment @dirrm share/gnome/bonobo/docs/audio_ulaw/C/images
@comment @dirrm share/gnome/bonobo/docs/audio_ulaw/C
@comment @dirrm share/gnome/bonobo/docs/audio_ulaw