From c05ee0797cfb83fa7e411ab6ea22e72e0d94ed6d Mon Sep 17 00:00:00 2001 From: ade Date: Fri, 4 Aug 2000 01:28:04 +0000 Subject: Update to 0.16 --- devel/bonobo/Makefile | 9 +++- devel/bonobo/distinfo | 2 +- devel/bonobo/files/patch-ab | 124 -------------------------------------------- devel/bonobo/pkg-plist | 13 +++++ 4 files changed, 22 insertions(+), 126 deletions(-) (limited to 'devel/bonobo') diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 6b96596..1352ead 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bonobo -PORTVERSION= 0.15 +PORTVERSION= 0.16 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/bonobo @@ -35,4 +35,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo index 4910dba..6228b53 100644 --- a/devel/bonobo/distinfo +++ b/devel/bonobo/distinfo @@ -1 +1 @@ -MD5 (bonobo-0.15.tar.gz) = 999a6df46195596d436e3d1bdf1f066f +MD5 (bonobo-0.16.tar.gz) = 4f62468afb973d7e09934e2f249139b2 diff --git a/devel/bonobo/files/patch-ab b/devel/bonobo/files/patch-ab index 9044d9b..12ea1ca 100644 --- a/devel/bonobo/files/patch-ab +++ b/devel/bonobo/files/patch-ab @@ -9,86 +9,6 @@ confexec_DATA = bonoboConf.sh EXTRA_DIST = bonoboConf.sh.in bonobo.spec.in ---- components/application-x-gnomine/Makefile.in.orig Fri May 12 13:03:29 2000 -+++ components/application-x-gnomine/Makefile.in Wed May 17 10:29:13 2000 -@@ -138,9 +138,9 @@ - @OAF_FALSE@OBJECT_DIRECTORY_LIBS = $(GNOMEGNORBA_LIBS) - - scoredir = $(localstatedir)/games --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/bonobo -I$(top_builddir)/bonobo -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/bonobo -I$(top_builddir)/bonobo -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - #bin_PROGRAMS = gnomine bonobo-application-x-mines ---- components/audio-ulaw/Makefile.in.orig Tue Feb 22 00:06:59 2000 -+++ components/audio-ulaw/Makefile.in Tue Feb 22 11:15:23 2000 -@@ -139,7 +139,7 @@ - bonobo_audio_ulaw_SOURCES = bonobo-audio-ulaw.c bonobo-audio-ulaw.h item-audio.c item-audio.h color.c color.h - - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) - - - bonobo_audio_ulaw_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) ---- components/audio-ulaw/doc/C/Makefile.in.orig Wed May 31 15:57:26 2000 -+++ components/audio-ulaw/doc/C/Makefile.in Thu Jun 1 14:58:56 2000 -@@ -141,7 +141,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --audio_ulaw_helpdir = $(datadir)/gnome/bonobo/docs/audio_ulaw/C -+audio_ulaw_helpdir = $(datadir)/bonobo/docs/audio_ulaw/C - - # - # Module configuration information ---- components/text-plain/Makefile.in.orig Tue Feb 22 00:06:58 2000 -+++ components/text-plain/Makefile.in Tue Feb 22 11:16:45 2000 -@@ -137,7 +137,7 @@ - bonobo_text_plain_SOURCES = bonobo-text-plain.c - - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) - - - bonobo_text_plain_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) ---- samples/compound-doc/Makefile.in.orig Tue Feb 22 00:07:03 2000 -+++ samples/compound-doc/Makefile.in Tue Feb 22 11:17:13 2000 -@@ -134,7 +134,7 @@ - @OAF_TRUE@bin_PROGRAMS = - @OAF_FALSE@bin_PROGRAMS = paint-component-simple sample-container - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) - - - paint_component_simple_SOURCES = paint-component-simple.c ---- samples/controls/Makefile.in.orig Tue Feb 22 00:07:02 2000 -+++ samples/controls/Makefile.in Tue Feb 22 11:17:36 2000 -@@ -134,7 +134,7 @@ - @OAF_TRUE@bin_PROGRAMS = - @OAF_FALSE@bin_PROGRAMS = sample-control-factory sample-control-container - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) - - - sample_control_factory_SOURCES = bonobo-clock-control.c bonobo-clock-control.h bonobo-calculator-control.c bonobo-calculator-control.h sample-control-factory.c ---- storage-modules/Makefile.in.orig Tue Feb 22 00:06:50 2000 -+++ storage-modules/Makefile.in Tue Feb 22 11:22:05 2000 -@@ -132,7 +132,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libefs/src -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libefs/src -I$(includedir) $(GNOME_INCLUDEDIR) - - - common_ldflags = -avoid-version --- po/Makefile.in.in.orig Mon Feb 21 23:37:16 2000 +++ po/Makefile.in.in Tue Feb 22 11:18:13 2000 @@ -18,8 +18,8 @@ @@ -102,47 +22,3 @@ gnulocaledir = $(prefix)/share/locale gettextsrcdir = $(prefix)/share/gettext/po subdir = po ---- libefs/Makefile.in.orig Tue Feb 22 00:06:43 2000 -+++ libefs/Makefile.in Tue Feb 22 11:18:33 2000 -@@ -77,7 +77,7 @@ - RANLIB = @RANLIB@ - VERSION = @VERSION@ - --SUBDIRS = src doc -+SUBDIRS = src # doc - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs - CONFIG_HEADER = config.h ---- bonobo/Makefile.in.orig Fri May 12 13:03:26 2000 -+++ bonobo/Makefile.in Wed May 17 10:32:46 2000 -@@ -139,7 +139,7 @@ - @OAF_TRUE@OBJECT_DIRECTORY_IMPL = bonobo-object-directory-oaf.c - @OAF_FALSE@OBJECT_DIRECTORY_IMPL = bonobo-object-directory-goad.c - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DSTORAGE_LIB=\""$(libdir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -I. -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) $(GDK_PIXBUF_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTORAGE_LIB=\""$(libdir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -I. -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) $(GDK_PIXBUF_CFLAGS) - - - gnome_libs = $(GNOME_LIBDIR) $(GDK_PIXBUF_LIBS) $(GNOMEUI_LIBS) $(OBJECT_DIRECTORY_LIBS) $(INTLLIBS) ---- gshell/Makefile.in.orig Sun Mar 26 10:16:20 2000 -+++ gshell/Makefile.in Fri Apr 21 10:19:33 2000 -@@ -132,7 +132,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/bonobo -I$(top_builddir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/bonobo -I$(top_builddir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) - - @OAF_TRUE@bin_PROGRAMS = - @OAF_FALSE@bin_PROGRAMS = gshell ---- tests/Makefile.in.orig Sun Mar 26 10:16:23 2000 -+++ tests/Makefile.in Fri Apr 21 10:20:48 2000 -@@ -134,7 +134,7 @@ - @OAF_TRUE@bin_PROGRAMS = - @OAF_FALSE@bin_PROGRAMS = test-properties-server test-properties-client - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) - - - test_properties_server_SOURCES = test-properties-server.c diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist index 374cf04..89278e1 100644 --- a/devel/bonobo/pkg-plist +++ b/devel/bonobo/pkg-plist @@ -6,6 +6,7 @@ bin/bonobo-text-plain bin/echo-client bin/efstool bin/gshell +bin/libefs-config bin/paint-component-simple bin/sample-canvas-item bin/sample-container @@ -46,6 +47,7 @@ include/bonobo/bonobo-object.h include/bonobo/bonobo-persist-file.h include/bonobo/bonobo-persist-stream.h include/bonobo/bonobo-persist.h +include/bonobo/bonobo-plug.h include/bonobo/bonobo-print-client.h include/bonobo/bonobo-print.h include/bonobo/bonobo-progressive.h @@ -54,6 +56,8 @@ include/bonobo/bonobo-property-bag.h include/bonobo/bonobo-property-types.h include/bonobo/bonobo-property.h include/bonobo/bonobo-selector.h +include/bonobo/bonobo-sizeable.h +include/bonobo/bonobo-socket.h include/bonobo/bonobo-storage.h include/bonobo/bonobo-stream-client.h include/bonobo/bonobo-stream-fs.h @@ -76,6 +80,7 @@ lib/libefs.so lib/libefs.so.0 lib/libstorage_efs.so lib/libstorage_fs.so +share/gnome/bonobo/html/bonobo-api.html share/gnome/bonobo/html/bonobo-api.sgml share/gnome/bonobo/html/bonobo-decl.txt share/gnome/bonobo/html/bonobo-sections.txt @@ -132,6 +137,7 @@ share/gnome/idl/bonobo-persist.idl share/gnome/idl/bonobo-print.idl share/gnome/idl/bonobo-progressive.idl share/gnome/idl/bonobo-property.idl +share/gnome/idl/bonobo-sizeable.idl share/gnome/idl/bonobo-storage.idl share/gnome/idl/bonobo-ui-handler.idl share/gnome/idl/bonobo-unknown.idl @@ -148,9 +154,12 @@ share/gnome/oaf/text-plain.oafinfo share/locale/da/LC_MESSAGES/bonobo.mo share/locale/de/LC_MESSAGES/bonobo.mo share/locale/el/LC_MESSAGES/bonobo.mo +share/locale/en_GB/LC_MESSAGES/bonobo.mo share/locale/es/LC_MESSAGES/bonobo.mo +share/locale/fi/LC_MESSAGES/bonobo.mo share/locale/fr/LC_MESSAGES/bonobo.mo share/locale/gl/LC_MESSAGES/bonobo.mo +share/locale/hu/LC_MESSAGES/bonobo.mo share/locale/it/LC_MESSAGES/bonobo.mo share/locale/ja/LC_MESSAGES/bonobo.mo share/locale/nl/LC_MESSAGES/bonobo.mo @@ -159,10 +168,14 @@ share/locale/pl/LC_MESSAGES/bonobo.mo share/locale/pt_BR/LC_MESSAGES/bonobo.mo share/locale/ro/LC_MESSAGES/bonobo.mo share/locale/ru/LC_MESSAGES/bonobo.mo +share/locale/sl/LC_MESSAGES/bonobo.mo share/locale/sv/LC_MESSAGES/bonobo.mo share/locale/tr/LC_MESSAGES/bonobo.mo share/locale/uk/LC_MESSAGES/bonobo.mo share/locale/wa/LC_MESSAGES/bonobo.mo +@dirrm share/gnome/gtk-doc/html/libefs +@dirrm share/gnome/gtk-doc/html +@dirrm share/gnome/gtk-doc @dirrm share/gnome/bonobo/html/bonobo @dirrm share/gnome/bonobo/html @dirrm share/gnome/bonobo/docs/audio_ulaw/C/images -- cgit v1.1