diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/bonobo/Makefile | 9 | ||||
| -rw-r--r-- | devel/bonobo/distinfo | 2 | ||||
| -rw-r--r-- | devel/bonobo/files/patch-aa | 51 | ||||
| -rw-r--r-- | devel/bonobo/files/patch-ab | 112 | ||||
| -rw-r--r-- | devel/bonobo/pkg-plist | 118 |
5 files changed, 155 insertions, 137 deletions
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index d5a9042a4b2e..ab7f4c6851ec 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -1,17 +1,17 @@ # New ports collection makefile for: bonobo -# Version required: 0.4 +# Version required: 0.6 # Date created: 8th October 1999 # Whom: Ade Lovett <ade@lovett.com> # # $FreeBSD$ # -DISTNAME= bonobo-0.4 +DISTNAME= bonobo-0.6 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/bonobo -MAINTAINER= ade@lovett.com +MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ gdk_pixbuf.1:${PORTSDIR}/graphics/gdk-pixbuf @@ -30,4 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +post-patch: + @(cd ${WRKSRC}; ${LN} -s bonobo/bonobo.h) + .include <bsd.port.mk> diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo index 2befae2061b9..ef39e7f30e50 100644 --- a/devel/bonobo/distinfo +++ b/devel/bonobo/distinfo @@ -1 +1 @@ -MD5 (bonobo-0.4.tar.gz) = 108b835663269416b100a0dfd7207c72 +MD5 (bonobo-0.6.tar.gz) = 3191a39b308198418b1e972a5ee38852 diff --git a/devel/bonobo/files/patch-aa b/devel/bonobo/files/patch-aa index 797c1448682d..643fc46cbfdf 100644 --- a/devel/bonobo/files/patch-aa +++ b/devel/bonobo/files/patch-aa @@ -1,19 +1,54 @@ ---- configure.orig Fri Oct 8 12:58:58 1999 -+++ configure Fri Oct 8 13:06:30 1999 -@@ -4454,6 +4454,8 @@ - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +--- configure.orig Wed Jan 26 08:41:19 2000 ++++ configure Fri Jan 28 12:09:41 2000 +@@ -2291,8 +2291,8 @@ + LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ + LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ + DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ ++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ ++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + + # Reload cache, that may have been modified by ltconfig +@@ -2306,7 +2306,7 @@ + + + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh" + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -4538,6 +4538,8 @@ + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else + ac_save_LIBS="$LIBS" +LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF - #line 4459 "configure" + #line 4543 "configure" #include "confdefs.h" -@@ -4488,6 +4490,7 @@ - eval "ac_cv_func_$ac_func=no" +@@ -4557,6 +4559,7 @@ + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +@@ -5245,10 +5248,10 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac - if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/devel/bonobo/files/patch-ab b/devel/bonobo/files/patch-ab index b7a388930663..cd32267b62a7 100644 --- a/devel/bonobo/files/patch-ab +++ b/devel/bonobo/files/patch-ab @@ -1,59 +1,31 @@ ---- Makefile.in.orig Mon Sep 27 16:21:48 1999 -+++ Makefile.in Fri Oct 8 13:45:53 1999 -@@ -126,7 +126,7 @@ +--- Makefile.in.orig Wed Jan 26 08:49:25 2000 ++++ Makefile.in Fri Jan 28 10:56:23 2000 +@@ -125,7 +125,7 @@ - SUBDIRS = po intl idl libefs bonobo storage-modules components samples + SUBDIRS = po intl idl libefs bonobo storage-modules components samples gshell tests -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = bonoboConf.sh EXTRA_DIST = bonoboConf.sh.in bonobo.spec.in ---- bonobo/Makefile.in.orig Mon Sep 27 16:22:01 1999 -+++ bonobo/Makefile.in Fri Oct 8 13:46:36 1999 -@@ -128,7 +128,7 @@ - - corba_DATA = sample.gnorba item.gnorba - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DSTORAGE_LIB=\""$(libdir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTORAGE_LIB=\""$(libdir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) - - - gnome_libs = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOMEGNORBA_LIBS) $(INTLLIBS) ---- components/application-x-gnomine/Makefile.in.orig Mon Sep 27 16:22:05 1999 -+++ components/application-x-gnomine/Makefile.in Fri Oct 8 13:47:29 1999 -@@ -125,9 +125,9 @@ +--- components/application-x-gnomine/Makefile.in.orig Wed Jan 26 08:49:34 2000 ++++ components/application-x-gnomine/Makefile.in Fri Jan 28 10:59:27 2000 +@@ -124,9 +124,9 @@ l = @l@ scoredir = $(localstatedir)/games -Gamesdir = $(datadir)/gnome/apps/Games +Gamesdir = $(datadir)/apps/Games --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) #bin_PROGRAMS = gnomine bonobo-application-x-mines -@@ -146,7 +146,7 @@ - bonobo_application_x_mines_SOURCES = minefield.h minefield.c bonobo-application-x-mines.c - - --bonobo_application_x_mines_LDADD = $(GNOME_LIBDIR) -lbonobo $(GNOMEGNORBA_LIBS) -+bonobo_application_x_mines_LDADD = $(GNOME_LIBDIR) $(top_builddir)/bonobo/libbonobo.la $(GNOMEGNORBA_LIBS) - - - gnorbadir = $(sysconfdir)/CORBA/servers ---- components/audio-ulaw/Makefile.in.orig Mon Sep 27 16:22:12 1999 -+++ components/audio-ulaw/Makefile.in Fri Oct 8 13:48:17 1999 -@@ -124,14 +124,14 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --SUBDIRS = doc -+SUBDIRS = # doc - - bin_PROGRAMS = bonobo-audio-ulaw - +--- components/audio-ulaw/Makefile.in.orig Wed Jan 26 08:49:38 2000 ++++ components/audio-ulaw/Makefile.in Fri Jan 28 11:00:35 2000 +@@ -130,7 +130,7 @@ bonobo_audio_ulaw_SOURCES = bonobo-audio-ulaw.c bonobo-audio-ulaw.h item-audio.c item-audio.h color.c color.h @@ -62,31 +34,9 @@ bonobo_audio_ulaw_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) ---- components/audio-ulaw/doc/C/Makefile.in.orig Mon Sep 27 16:22:14 1999 -+++ components/audio-ulaw/doc/C/Makefile.in Fri Oct 8 13:49:03 1999 -@@ -128,7 +128,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/image-generic/Makefile.in.orig Mon Sep 27 16:22:06 1999 -+++ components/image-generic/Makefile.in Fri Oct 8 13:49:51 1999 -@@ -129,7 +129,7 @@ - bonobo_image_generic_SOURCES = bonobo-image-generic.c - - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) - - - bonobo_image_generic_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) -lgdk_pixbuf ---- components/image-x-png/Makefile.in.orig Mon Sep 27 16:22:07 1999 -+++ components/image-x-png/Makefile.in Fri Oct 8 13:50:29 1999 -@@ -124,14 +124,14 @@ +--- components/image-x-png/Makefile.in.orig Wed Jan 26 08:49:35 2000 ++++ components/image-x-png/Makefile.in Fri Jan 28 11:02:04 2000 +@@ -123,14 +123,14 @@ cxxflags_set = @cxxflags_set@ l = @l@ @@ -103,20 +53,9 @@ bonobo_image_x_png_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) -lpng ---- components/image-x-png/doc/C/Makefile.in.orig Mon Sep 27 16:22:09 1999 -+++ components/image-x-png/doc/C/Makefile.in Fri Oct 8 13:51:01 1999 +--- components/text-plain/Makefile.in.orig Wed Jan 26 08:49:37 2000 ++++ components/text-plain/Makefile.in Fri Jan 28 11:04:17 2000 @@ -128,7 +128,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --image_x_png_helpdir = $(datadir)/gnome/bonobo/docs/image_x_png/C -+image_x_png_helpdir = $(datadir)/bonobo/docs/image_x_png/C - - # - # Module configuration information ---- components/text-plain/Makefile.in.orig Mon Sep 27 16:22:11 1999 -+++ components/text-plain/Makefile.in Fri Oct 8 13:51:48 1999 -@@ -129,7 +129,7 @@ bonobo_text_plain_SOURCES = bonobo-text-plain.c @@ -125,9 +64,9 @@ bonobo_text_plain_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) ---- samples/Makefile.in.orig Mon Sep 27 16:22:16 1999 -+++ samples/Makefile.in Fri Oct 8 13:53:54 1999 -@@ -126,7 +126,7 @@ +--- samples/compound-doc/Makefile.in.orig Wed Jan 26 08:49:40 2000 ++++ samples/compound-doc/Makefile.in Fri Jan 28 11:06:32 2000 +@@ -125,7 +125,7 @@ bin_PROGRAMS = paint-component-simple sample-container @@ -136,6 +75,17 @@ paint_component_simple_SOURCES = paint-component-simple.c +--- samples/controls/Makefile.in.orig Wed Jan 26 08:49:39 2000 ++++ samples/controls/Makefile.in Fri Jan 28 11:07:10 2000 +@@ -125,7 +125,7 @@ + + bin_PROGRAMS = sample-control-factory sample-control-container + +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -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 Mon Sep 27 16:22:03 1999 +++ storage-modules/Makefile.in Fri Oct 8 13:54:29 1999 @@ -124,7 +124,7 @@ diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist index 6f1a058ef812..f18515004402 100644 --- a/devel/bonobo/pkg-plist +++ b/devel/bonobo/pkg-plist @@ -1,80 +1,110 @@ bin/bonobo-application-x-mines bin/bonobo-audio-ulaw -bin/bonobo-image-generic bin/bonobo-image-x-png bin/bonobo-text-plain bin/efstool +bin/gshell bin/paint-component-simple bin/sample-container +bin/sample-control-container +bin/sample-control-factory +bin/test-properties-client +bin/test-properties-server etc/CORBA/servers/application-x-mines.gnorba etc/CORBA/servers/audio-ulaw.gnorba -etc/CORBA/servers/image-generic.gnorba +etc/CORBA/servers/bonobo-calculator-control.gnorba +etc/CORBA/servers/bonobo-clock-control.gnorba etc/CORBA/servers/image-x-png.gnorba etc/CORBA/servers/item.gnorba etc/CORBA/servers/paint-component-simple.gnorba etc/CORBA/servers/sample.gnorba etc/CORBA/servers/text-plain.gnorba etc/bonoboConf.sh -include/bonobo/bonobo.h -include/bonobo/gnome-bonobo-item.h -include/bonobo/gnome-bonobo-selector.h -include/bonobo/gnome-bonobo-widget.h -include/bonobo/gnome-bonobo.h -include/bonobo/gnome-canvas-component.h -include/bonobo/gnome-client-site.h -include/bonobo/gnome-component-io.h -include/bonobo/gnome-container.h -include/bonobo/gnome-embeddable-factory.h -include/bonobo/gnome-embeddable.h -include/bonobo/gnome-main.h -include/bonobo/gnome-moniker-client.h -include/bonobo/gnome-moniker.h -include/bonobo/gnome-object-client.h -include/bonobo/gnome-object-io.h -include/bonobo/gnome-object.h -include/bonobo/gnome-persist-file.h -include/bonobo/gnome-persist-stream.h -include/bonobo/gnome-persist.h -include/bonobo/gnome-progressive.h -include/bonobo/gnome-storage.h -include/bonobo/gnome-stream-client.h -include/bonobo/gnome-stream-fs.h -include/bonobo/gnome-stream-memory.h -include/bonobo/gnome-stream.h -include/bonobo/gnome-ui-handler.h -include/bonobo/gnome-view-frame.h -include/bonobo/gnome-view.h -include/bonobo/gnome-wrapper.h +include/bonobo.h +include/bonobo/Bonobo.h +include/bonobo/bonobo-canvas-component.h +include/bonobo/bonobo-canvas-item.h +include/bonobo/bonobo-client-site.h +include/bonobo/bonobo-component-io.h +include/bonobo/bonobo-container.h +include/bonobo/bonobo-control-frame.h +include/bonobo/bonobo-control.h +include/bonobo/bonobo-desktop-window.h +include/bonobo/bonobo-embeddable-factory.h +include/bonobo/bonobo-embeddable.h +include/bonobo/bonobo-generic-factory.h +include/bonobo/bonobo-main.h +include/bonobo/bonobo-moniker-client.h +include/bonobo/bonobo-moniker.h +include/bonobo/bonobo-object-client.h +include/bonobo/bonobo-object-io.h +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-progressive.h +include/bonobo/bonobo-property-bag-client.h +include/bonobo/bonobo-property-bag-xml.h +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-storage.h +include/bonobo/bonobo-stream-client.h +include/bonobo/bonobo-stream-fs.h +include/bonobo/bonobo-stream-memory.h +include/bonobo/bonobo-stream.h +include/bonobo/bonobo-ui-handler.h +include/bonobo/bonobo-view-frame.h +include/bonobo/bonobo-view.h +include/bonobo/bonobo-widget.h +include/bonobo/bonobo-wrapper.h include/efs.h lib/libbonobo.a -lib/libbonobo.so.0 +lib/libbonobo.so.1 lib/libbonobo.so +lib/libbonobo-xml.a +lib/libbonobo-xml.so.0 +lib/libbonobo-xml.so lib/libefs.a +lib/libefs.so.0 +lib/libefs.so +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B lib/libstorage_efs.so lib/libstorage_fs.so share/gnome/apps/Games/gnomine.desktop share/gnome/idl/bonobo.idl -share/gnome/idl/gnome-advise.idl -share/gnome/idl/gnome-canvas.idl -share/gnome/idl/gnome-client-site.idl -share/gnome/idl/gnome-container.idl -share/gnome/idl/gnome-embeddable.idl -share/gnome/idl/gnome-persist.idl -share/gnome/idl/gnome-progressive.idl -share/gnome/idl/gnome-storage.idl -share/gnome/idl/gnome-ui-handler.idl +share/gnome/idl/Bonobo.idl +share/gnome/idl/bonobo-advise.idl +share/gnome/idl/bonobo-canvas.idl +share/gnome/idl/bonobo-client-site.idl +share/gnome/idl/bonobo-container.idl +share/gnome/idl/bonobo-control.idl +share/gnome/idl/bonobo-embeddable.idl +share/gnome/idl/bonobo-factory.idl +share/gnome/idl/bonobo-persist.idl +share/gnome/idl/bonobo-progressive.idl +share/gnome/idl/bonobo-property.idl +share/gnome/idl/bonobo-storage.idl +share/gnome/idl/bonobo-ui-handler.idl +share/gnome/idl/bonobo-unknown.idl share/gnome/mime-info/bonobo.keys share/locale/da/LC_MESSAGES/bonobo.mo share/locale/de/LC_MESSAGES/bonobo.mo share/locale/el/LC_MESSAGES/bonobo.mo share/locale/es/LC_MESSAGES/bonobo.mo share/locale/fr/LC_MESSAGES/bonobo.mo +share/locale/gl/LC_MESSAGES/bonobo.mo share/locale/it/LC_MESSAGES/bonobo.mo +share/locale/ja/LC_MESSAGES/bonobo.mo share/locale/no/LC_MESSAGES/bonobo.mo 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/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 -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm include/bonobo |