diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-08 18:37:33 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-08 18:37:33 +0000 |
commit | 19058d4eb8b97dda82b3bf0784edeb698e555ab2 (patch) | |
tree | 78b0f329087b6e96803b02e6c9414b83b0496904 | |
parent | Update to 0.5.2. (diff) |
Update to 1.0.21.
Notes
Notes:
svn path=/head/; revision=67662
-rw-r--r-- | devel/bonobo/Makefile | 8 | ||||
-rw-r--r-- | devel/bonobo/distinfo | 2 | ||||
-rw-r--r-- | devel/bonobo/files/patch-ab | 19 | ||||
-rw-r--r-- | devel/bonobo/files/patch-configure | 13 | ||||
-rw-r--r-- | devel/bonobo/files/patch-libefs::configure | 13 | ||||
-rw-r--r-- | devel/bonobo/files/patch-ltmain.sh | 45 | ||||
-rw-r--r-- | devel/bonobo/files/patch-storage-modules::Makefile.in | 22 | ||||
-rw-r--r-- | devel/bonobo/pkg-plist | 1 |
8 files changed, 69 insertions, 54 deletions
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 97f2b293c02a..5ef8fdd324f6 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -6,8 +6,7 @@ # PORTNAME= bonobo -PORTVERSION= 1.0.20 -PORTREVISION= 2 +PORTVERSION= 1.0.21 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/bonobo/1.0 @@ -23,8 +22,9 @@ USE_GNOMENG= yes USE_GNOME= gnomehack gnomeprefix oaf gnomehier gnomeprint GNOME_HTML_DIR= ${PREFIX}/share/doc/bonobo INSTALLS_SHLIB= yes -USE_LIBTOOL= yes -LIBTOOLFILES= configure libefs/configure +#USE_LIBTOOL= yes +#LIBTOOLFILES= configure libefs/configure +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo index d42a4528c705..46cf0ede095e 100644 --- a/devel/bonobo/distinfo +++ b/devel/bonobo/distinfo @@ -1 +1 @@ -MD5 (gnome/bonobo-1.0.20.tar.bz2) = c4c586e2f8670a0adf6116f9b7e6e496 +MD5 (gnome/bonobo-1.0.21.tar.bz2) = 79265a2889db3cd2fba097b1064df4fb diff --git a/devel/bonobo/files/patch-ab b/devel/bonobo/files/patch-ab index 44c8d5374728..7b67117ddb67 100644 --- a/devel/bonobo/files/patch-ab +++ b/devel/bonobo/files/patch-ab @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- Makefile.in.orig Wed Jan 23 17:40:22 2002 -+++ Makefile.in Wed Jan 23 17:40:55 2002 -@@ -166,10 +166,10 @@ - - NULL = - --SUBDIRS = macros intl idl libefs bonobo storage-modules monikers components samples gshell tests doc po -+SUBDIRS = macros intl idl libefs bonobo storage-modules monikers components samples gshell doc po +--- Makefile.in.orig Tue Oct 8 01:30:21 2002 ++++ Makefile.in Tue Oct 8 01:32:12 2002 +@@ -174,10 +174,10 @@ + monikers \ + components samples \ + gshell \ +- tests doc po ++ doc po -confexecdir = $(libdir) diff --git a/devel/bonobo/files/patch-configure b/devel/bonobo/files/patch-configure deleted file mode 100644 index 59bac8984902..000000000000 --- a/devel/bonobo/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/05/01 00:28:19 1.1 -+++ configure 2002/05/01 00:28:29 -@@ -7377,6 +7377,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/devel/bonobo/files/patch-libefs::configure b/devel/bonobo/files/patch-libefs::configure deleted file mode 100644 index b1beaffbc526..000000000000 --- a/devel/bonobo/files/patch-libefs::configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- libefs/configure 2002/05/01 00:30:49 1.1 -+++ libefs/configure 2002/05/01 00:30:58 -@@ -6397,6 +6397,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/devel/bonobo/files/patch-ltmain.sh b/devel/bonobo/files/patch-ltmain.sh new file mode 100644 index 000000000000..91713d2306f8 --- /dev/null +++ b/devel/bonobo/files/patch-ltmain.sh @@ -0,0 +1,45 @@ + +$FreeBSD$ + +--- ltmain.sh.orig Wed Jan 23 11:38:40 2002 ++++ ltmain.sh Sun Feb 3 01:44:17 2002 +@@ -1037,8 +1037,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2412,6 +2420,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +@@ -4179,10 +4190,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/bonobo/files/patch-storage-modules::Makefile.in b/devel/bonobo/files/patch-storage-modules::Makefile.in index 448f47666038..783fba3fae59 100644 --- a/devel/bonobo/files/patch-storage-modules::Makefile.in +++ b/devel/bonobo/files/patch-storage-modules::Makefile.in @@ -1,14 +1,12 @@ - -$FreeBSD$ - ---- storage-modules/Makefile.in 2002/05/01 01:03:30 1.1 -+++ storage-modules/Makefile.in 2002/05/01 01:15:16 -@@ -180,7 +180,7 @@ - libstorage_efs_la_SOURCES = bonobo-storage-efs.c bonobo-storage-efs.h bonobo-stream-efs.c bonobo-stream-efs.h - - --libstorage_efs_la_LDFLAGS = $(common_ldflags) -L$(top_builddir)/libefs/src -lefs -+libstorage_efs_la_LDFLAGS = $(common_ldflags) $(top_builddir)/libefs/src/libefs.la - +--- storage-modules/Makefile.in.orig Tue Oct 8 02:07:53 2002 ++++ storage-modules/Makefile.in Tue Oct 8 02:09:33 2002 +@@ -196,8 +196,7 @@ + libstorage_efs_la_LDFLAGS = \ + $(common_ldflags) \ + -L$(top_builddir)/libefs/src \ +- -lefs +- ++ $(top_builddir)/libefs/src/libefs.la # + # File-system based storage diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist index 140e6e747380..ddecc19ff65d 100644 --- a/devel/bonobo/pkg-plist +++ b/devel/bonobo/pkg-plist @@ -178,6 +178,7 @@ share/doc/bonobo/bonobo/bonobo-ui.html share/doc/bonobo/bonobo/bonobo-view.html share/doc/bonobo/bonobo/book1.html share/gnome/help/audio_ulaw/C/index.html +share/gnome/help/audio_ulaw/C/t1.html share/gnome/idl/Bonobo.idl share/gnome/idl/Bonobo_Advise.idl share/gnome/idl/Bonobo_Canvas.idl |