From 544f2563e6514a4f05244b9abb25b9ffede1c2a6 Mon Sep 17 00:00:00 2001 From: marcm Date: Tue, 24 May 2005 21:44:14 +0000 Subject: [PATCH] Update for Gnome 2.10... yet the version is still 2.8... go figure. --- x11/gnome/libbonobo/Makefile | 7 +- x11/gnome/libbonobo/distinfo | 8 +- .../patch-activation-server_Makefile_in | 8 +- ...activation_bonobo-activation-fork-server_c | 8 +- x11/gnome/libbonobo/patches/patch-configure | 28 ------ x11/gnome/libbonobo/patches/patch-ltmain_sh | 70 -------------- .../libbonobo/patches/patch-po_Makefile_in_in | 12 --- x11/gnome/libbonobo/pkg/PLIST | 95 +------------------ 8 files changed, 16 insertions(+), 220 deletions(-) delete mode 100644 x11/gnome/libbonobo/patches/patch-configure delete mode 100644 x11/gnome/libbonobo/patches/patch-ltmain_sh delete mode 100644 x11/gnome/libbonobo/patches/patch-po_Makefile_in_in diff --git a/x11/gnome/libbonobo/Makefile b/x11/gnome/libbonobo/Makefile index 2f4c8aa2521..3cb25754dd6 100644 --- a/x11/gnome/libbonobo/Makefile +++ b/x11/gnome/libbonobo/Makefile @@ -1,14 +1,12 @@ -# $OpenBSD: Makefile,v 1.11 2004/12/15 13:57:56 alek Exp $ +# $OpenBSD: Makefile,v 1.12 2005/05/24 21:44:14 marcm Exp $ COMMENT= "GNOME component and compound document system" -DISTNAME= libbonobo-2.8.0 +DISTNAME= libbonobo-2.8.1 CATEGORIES= devel HOMEPAGE= http://www.gnome.org/ -MAINTAINER= Marc Matteo - # LGPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -28,6 +26,7 @@ LIB_DEPENDS= ORBit-2,ORBitCosNaming-2::devel/ORBit2 \ xml2.6::textproc/libxml USE_GMAKE= Yes +USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu old CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome" diff --git a/x11/gnome/libbonobo/distinfo b/x11/gnome/libbonobo/distinfo index b864dad3325..3293f125a2b 100644 --- a/x11/gnome/libbonobo/distinfo +++ b/x11/gnome/libbonobo/distinfo @@ -1,4 +1,4 @@ -MD5 (libbonobo-2.8.0.tar.bz2) = e3358680e50e69779535d126b1c56ee7 -RMD160 (libbonobo-2.8.0.tar.bz2) = ec4b88771986df6d850a1201e9e40e501cc0e9d8 -SHA1 (libbonobo-2.8.0.tar.bz2) = db9e4ad69166697ef0acb89c406eb3021351655f -SIZE (libbonobo-2.8.0.tar.bz2) = 1460478 +MD5 (libbonobo-2.8.1.tar.bz2) = 54f863c20016cf8a2cf25056f6c7cda7 +RMD160 (libbonobo-2.8.1.tar.bz2) = 4d22830490ca1c9aea7079bdec9f4b028c174101 +SHA1 (libbonobo-2.8.1.tar.bz2) = f86ad47faddbe423e9a498976cd44daacb40f450 +SIZE (libbonobo-2.8.1.tar.bz2) = 1061756 diff --git a/x11/gnome/libbonobo/patches/patch-activation-server_Makefile_in b/x11/gnome/libbonobo/patches/patch-activation-server_Makefile_in index c3a9ce05af1..9a30564bc06 100644 --- a/x11/gnome/libbonobo/patches/patch-activation-server_Makefile_in +++ b/x11/gnome/libbonobo/patches/patch-activation-server_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-activation-server_Makefile_in,v 1.2 2004/06/23 03:26:13 marcm Exp $ ---- activation-server/Makefile.in.orig 2004-05-29 04:17:30.000000000 -0600 -+++ activation-server/Makefile.in 2004-06-19 21:08:57.000000000 -0600 -@@ -249,7 +249,7 @@ bonobo_activation_server_SOURCES = \ +$OpenBSD: patch-activation-server_Makefile_in,v 1.3 2005/05/24 21:44:14 marcm Exp $ +--- activation-server/Makefile.in.orig Sat Feb 5 06:39:38 2005 ++++ activation-server/Makefile.in Mon Apr 4 22:04:47 2005 +@@ -255,7 +255,7 @@ bonobo_activation_server_SOURCES = \ LDADD = \ $(top_builddir)/bonobo/libbonobo-2.la \ diff --git a/x11/gnome/libbonobo/patches/patch-bonobo-activation_bonobo-activation-fork-server_c b/x11/gnome/libbonobo/patches/patch-bonobo-activation_bonobo-activation-fork-server_c index 3b16b96f744..c95fd7f327a 100644 --- a/x11/gnome/libbonobo/patches/patch-bonobo-activation_bonobo-activation-fork-server_c +++ b/x11/gnome/libbonobo/patches/patch-bonobo-activation_bonobo-activation-fork-server_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-bonobo-activation_bonobo-activation-fork-server_c,v 1.1 2003/10/07 05:48:54 marcm Exp $ ---- bonobo-activation/bonobo-activation-fork-server.c.orig 2003-09-09 13:12:20.000000000 -0700 -+++ bonobo-activation/bonobo-activation-fork-server.c 2003-09-09 13:13:06.000000000 -0700 +$OpenBSD: patch-bonobo-activation_bonobo-activation-fork-server_c,v 1.2 2005/05/24 21:44:14 marcm Exp $ +--- bonobo-activation/bonobo-activation-fork-server.c.orig Wed Aug 11 03:26:02 2004 ++++ bonobo-activation/bonobo-activation-fork-server.c Mon Apr 4 22:04:47 2005 @@ -380,6 +380,8 @@ bonobo_activation_server_by_forking ( } else if ((childpid = fork ())) { _exit (0); /* de-zombifier process, just exit */ @@ -8,5 +8,5 @@ $OpenBSD: patch-bonobo-activation_bonobo-activation-fork-server_c,v 1.1 2003/10/ + sigprocmask (SIG_SETMASK, &omask, NULL); + setenv_activation_environment (environment); + sigprocmask (SIG_SETMASK, &omask, NULL); - if (od_iorstr != NULL) { diff --git a/x11/gnome/libbonobo/patches/patch-configure b/x11/gnome/libbonobo/patches/patch-configure deleted file mode 100644 index b9391b6aff1..00000000000 --- a/x11/gnome/libbonobo/patches/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-configure,v 1.4 2004/06/23 03:26:13 marcm Exp $ ---- configure.orig 2004-05-29 04:17:37.000000000 -0600 -+++ configure 2004-06-19 21:26:26.000000000 -0600 -@@ -9713,7 +9713,7 @@ nto-qnx*) - openbsd*) - version_type=sunos - need_lib_prefix=no -- need_version=yes -+ need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -22324,13 +22324,13 @@ if test $ac_cv_func_bind_textdomain_code - DATADIRNAME=share - else - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - - ;; - *) - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - ;; - esac - fi diff --git a/x11/gnome/libbonobo/patches/patch-ltmain_sh b/x11/gnome/libbonobo/patches/patch-ltmain_sh deleted file mode 100644 index 7d71619d167..00000000000 --- a/x11/gnome/libbonobo/patches/patch-ltmain_sh +++ /dev/null @@ -1,70 +0,0 @@ ---- ltmain.sh.orig Wed Dec 1 14:48:09 2004 -+++ ltmain.sh Wed Dec 1 14:49:45 2004 -@@ -1857,9 +1857,12 @@ - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" -- else -- deplibs="$deplib $deplibs" -+ continue - fi -+ if test "$linkmode" = "lib"; then -+ newdependency_libs="$deplib $newdependency_libs" -+ fi -+ deplibs="$deplib $deplibs" - continue - ;; - -l*) -@@ -2274,10 +2277,6 @@ - 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 - # This is a shared library - - # Warn about portability, can't link against -module's on -@@ -5826,41 +5825,6 @@ - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS -- -- $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 the \`-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 $EXIT_SUCCESS - ;; - diff --git a/x11/gnome/libbonobo/patches/patch-po_Makefile_in_in b/x11/gnome/libbonobo/patches/patch-po_Makefile_in_in deleted file mode 100644 index 4baafcc4032..00000000000 --- a/x11/gnome/libbonobo/patches/patch-po_Makefile_in_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_Makefile_in_in,v 1.1 2003/06/12 19:51:14 marcm Exp $ ---- po/Makefile.in.in.orig Thu May 1 17:25:08 2003 -+++ po/Makefile.in.in Thu May 1 17:25:30 2003 -@@ -28,7 +28,7 @@ prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = @datadir@ - libdir = @libdir@ --localedir = $(libdir)/locale -+localedir = $(datadir)/locale - gnulocaledir = $(datadir)/locale - gettextsrcdir = $(datadir)/glib-2.0/gettext/po - subdir = po diff --git a/x11/gnome/libbonobo/pkg/PLIST b/x11/gnome/libbonobo/pkg/PLIST index 47c155dfdd0..64ca2ed4833 100644 --- a/x11/gnome/libbonobo/pkg/PLIST +++ b/x11/gnome/libbonobo/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2004/12/10 20:36:44 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.15 2005/05/24 21:44:15 marcm Exp $ bin/activation-client bin/bonobo-activation-run-query bin/bonobo-slay @@ -83,99 +83,6 @@ share/examples/libbonobo/bonobo-activation/ @sample ${SYSCONFDIR}/gnome/bonobo-activation/ share/examples/libbonobo/bonobo-activation/bonobo-activation-config.xml @sample ${SYSCONFDIR}/gnome/bonobo-activation/bonobo-activation-config.xml -share/gtk-doc/ -share/gtk-doc/html/ -share/gtk-doc/html/bonobo-activation/ -share/gtk-doc/html/bonobo-activation/api-reference.html -share/gtk-doc/html/bonobo-activation/architecture.html -share/gtk-doc/html/bonobo-activation/async-activation.html -share/gtk-doc/html/bonobo-activation/attribute-tag.html -share/gtk-doc/html/bonobo-activation/bonobo-activation-Debugging.html -share/gtk-doc/html/bonobo-activation/bonobo-activation-Initialization.html -share/gtk-doc/html/bonobo-activation/bonobo-activation-Query-and-Activation.html -share/gtk-doc/html/bonobo-activation/bonobo-activation-Registration.html -share/gtk-doc/html/bonobo-activation/bonobo-activation-Utilities.html -share/gtk-doc/html/bonobo-activation/bonobo-activation.devhelp -share/gtk-doc/html/bonobo-activation/bonobo-activation.png -share/gtk-doc/html/bonobo-activation/checklist.html -share/gtk-doc/html/bonobo-activation/configuring.html -share/gtk-doc/html/bonobo-activation/home.png -share/gtk-doc/html/bonobo-activation/index.html -share/gtk-doc/html/bonobo-activation/index.sgml -share/gtk-doc/html/bonobo-activation/left.png -share/gtk-doc/html/bonobo-activation/lgpl.html -share/gtk-doc/html/bonobo-activation/migrating.html -share/gtk-doc/html/bonobo-activation/query-langage.html -share/gtk-doc/html/bonobo-activation/query-syntax.html -share/gtk-doc/html/bonobo-activation/right.png -share/gtk-doc/html/bonobo-activation/server-arch.html -share/gtk-doc/html/bonobo-activation/server-xml-reference.html -share/gtk-doc/html/bonobo-activation/style.css -share/gtk-doc/html/bonobo-activation/terms.html -share/gtk-doc/html/bonobo-activation/tutorial.html -share/gtk-doc/html/bonobo-activation/up.png -share/gtk-doc/html/libbonobo/ -share/gtk-doc/html/libbonobo/debugging.html -share/gtk-doc/html/libbonobo/factories.html -share/gtk-doc/html/libbonobo/general.html -share/gtk-doc/html/libbonobo/home.png -share/gtk-doc/html/libbonobo/index.html -share/gtk-doc/html/libbonobo/index.sgml -share/gtk-doc/html/libbonobo/left.png -share/gtk-doc/html/libbonobo/libbonobo-bonobo-app-client.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-application.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-arg.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-config-database.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-context.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-event-source.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-exception.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-generic-factory.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-i18n.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-item-container.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-item-handler.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-listener.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-main.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-context.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-extender.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-simple.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-util.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-object.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-client.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-file.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-stream.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-property-bag-client.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-property-bag.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-running-context.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-shlib-factory.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-shutdown.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-storage-memory.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-storage.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-stream-client.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-stream-memory.html -share/gtk-doc/html/libbonobo/libbonobo-bonobo-types.html -share/gtk-doc/html/libbonobo/libbonobo-faq.html -share/gtk-doc/html/libbonobo/libbonobo.devhelp -share/gtk-doc/html/libbonobo/misc.html -share/gtk-doc/html/libbonobo/monikers-overview.html -share/gtk-doc/html/libbonobo/monikers.html -share/gtk-doc/html/libbonobo/persist-file.png -share/gtk-doc/html/libbonobo/persist-storage.png -share/gtk-doc/html/libbonobo/persist-stream.png -share/gtk-doc/html/libbonobo/persist.html -share/gtk-doc/html/libbonobo/persist.png -share/gtk-doc/html/libbonobo/properties.html -share/gtk-doc/html/libbonobo/property-bags.html -share/gtk-doc/html/libbonobo/refcounting.html -share/gtk-doc/html/libbonobo/right.png -share/gtk-doc/html/libbonobo/running-context.png -share/gtk-doc/html/libbonobo/storage.png -share/gtk-doc/html/libbonobo/stream.png -share/gtk-doc/html/libbonobo/streams.html -share/gtk-doc/html/libbonobo/style.css -share/gtk-doc/html/libbonobo/unknown.png -share/gtk-doc/html/libbonobo/up.png share/idl/ share/idl/bonobo-2.0/ share/idl/bonobo-2.0/Bonobo.idl