From 9189f18b2995f913780315cc18c856e8ea6c3b21 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 1 Jan 2003 19:04:42 +0000
Subject: Update to 1.0.22.

---
 devel/bonobo/Makefile              |  5 ++---
 devel/bonobo/distinfo              |  2 +-
 devel/bonobo/files/patch-ltmain.sh | 40 ++++++++++++++++++--------------------
 devel/bonobo/pkg-plist             |  2 +-
 4 files changed, 23 insertions(+), 26 deletions(-)

(limited to 'devel/bonobo')

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 7357e49b08a6..04ee0d7f2992 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	bonobo
-PORTVERSION=	1.0.21
-PORTREVISION=	1
+PORTVERSION=	1.0.22
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bonobo/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 46cf0ede095e..fbf58b19f4a5 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome/bonobo-1.0.21.tar.bz2) = 79265a2889db3cd2fba097b1064df4fb
+MD5 (gnome/bonobo-1.0.22.tar.bz2) = 7718c374ed82911b24d95fa3ab55dda5
diff --git a/devel/bonobo/files/patch-ltmain.sh b/devel/bonobo/files/patch-ltmain.sh
index 768939afc47e..ecc06ccd0280 100644
--- a/devel/bonobo/files/patch-ltmain.sh
+++ b/devel/bonobo/files/patch-ltmain.sh
@@ -1,38 +1,36 @@
---- ltmain.sh.orig	Sun Oct  6 15:24:35 2002
-+++ ltmain.sh	Fri Oct 11 02:13:11 2002
-@@ -1249,8 +1249,17 @@
+--- ltmain.sh.orig	Sat Nov 30 21:32:08 2002
++++ ltmain.sh	Tue Dec  3 22:59:51 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
++        compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
 +
        -module)
  	module=yes
-+        build_old_libs=no
++	build_old_libs=no
  	continue
  	;;
  
-@@ -2841,6 +2850,9 @@
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
+@@ -2405,7 +2413,7 @@
+ 	    # Rhapsody C library is in the System framework
+ 	    deplibs="$deplibs -framework System"
+ 	    ;;
+-	  *-*-netbsd*)
++	  *-*-netbsd* | *-*-freebsd*)
+ 	    # 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
-@@ -4715,10 +4727,12 @@
+ 	  *)
+@@ -4175,10 +4183,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
-+        if /usr/bin/false; then
++	if /usr/bin/false; then
  	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
  	instname="$dir/$name"i
  	$show "$install_prog $instname $destdir/$name"
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index c7884ed82d7b..140e6e747380 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -177,7 +177,7 @@ share/doc/bonobo/bonobo/bonobo-support-utilities.html
 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/t1.html
+share/gnome/help/audio_ulaw/C/index.html
 share/gnome/idl/Bonobo.idl
 share/gnome/idl/Bonobo_Advise.idl
 share/gnome/idl/Bonobo_Canvas.idl
-- 
cgit v1.2.3