Update to 1.9.0

5 files changed, 84 insertions, 43 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index eb3dd72ddc9b..286246c6206b 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgsf
-PORTVERSION=	1.8.2
-PORTREVISION=	2
+PORTVERSION=	1.9.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 90eeecf0d04e..c6767400286b 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgsf-1.8.2.tar.bz2) = 3a575469f9a2880d8ca78a70ddb93e78
-SIZE (gnome2/libgsf-1.8.2.tar.bz2) = 330342
+MD5 (gnome2/libgsf-1.9.0.tar.bz2) = a6e784925c1aee055af60d635aa6733a
+SIZE (gnome2/libgsf-1.9.0.tar.bz2) = 380030
diff --git a/devel/libgsf/files/patch-configure b/devel/libgsf/files/patch-configure
deleted file mode 100644
index de62becfec42..000000000000
--- a/devel/libgsf/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue Dec 10 17:56:28 2002
-+++ configure	Wed Dec 25 03:03:11 2002
-@@ -7565,6 +7565,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/libgsf/files/patch-ltmain.sh b/devel/libgsf/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1d5a5c7b87e1
--- /dev/null
+++ b/devel/libgsf/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Fri Sep 12 14:51:51 2003
++++ ltmain.sh	Sun Sep 21 17:49:07 2003
+@@ -1280,7 +1280,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,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
+ 	;;
+ 
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,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/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index 1ac330b1e8cd..fc61ffb7c10f 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -3,14 +3,18 @@ include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h
 include/libgsf-1/gsf-gnome/gsf-output-bonobo.h
 include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h
 include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h
+include/libgsf-1/gsf-win32/gsf-input-win32.h
+include/libgsf-1/gsf-win32/gsf-output-win32.h
 include/libgsf-1/gsf/gsf-doc-meta-data.h
 include/libgsf-1/gsf/gsf-impl-utils.h
+include/libgsf-1/gsf/gsf-infile-impl.h
 include/libgsf-1/gsf/gsf-infile-msole.h
-include/libgsf-1/gsf/gsf-infile-msvba.h
+include/libgsf-1/gsf/gsf-infile-stdio.h
 include/libgsf-1/gsf/gsf-infile-zip.h
 include/libgsf-1/gsf/gsf-infile.h
 include/libgsf-1/gsf/gsf-input-bzip.h
 include/libgsf-1/gsf/gsf-input-gzip.h
+include/libgsf-1/gsf/gsf-input-impl.h
 include/libgsf-1/gsf/gsf-input-iochannel.h
 include/libgsf-1/gsf/gsf-input-memory.h
 include/libgsf-1/gsf/gsf-input-stdio.h
@@ -18,11 +22,14 @@ include/libgsf-1/gsf/gsf-input-textline.h
 include/libgsf-1/gsf/gsf-input.h
 include/libgsf-1/gsf/gsf-libxml.h
 include/libgsf-1/gsf/gsf-msole-utils.h
-include/libgsf-1/gsf/gsf-output-bzip.h
+include/libgsf-1/gsf/gsf-outfile-impl.h
 include/libgsf-1/gsf/gsf-outfile-msole.h
+include/libgsf-1/gsf/gsf-outfile-stdio.h
 include/libgsf-1/gsf/gsf-outfile-zip.h
 include/libgsf-1/gsf/gsf-outfile.h
+include/libgsf-1/gsf/gsf-output-bzip.h
 include/libgsf-1/gsf/gsf-output-gzip.h
+include/libgsf-1/gsf/gsf-output-impl.h
 include/libgsf-1/gsf/gsf-output-iochannel.h
 include/libgsf-1/gsf/gsf-output-memory.h
 include/libgsf-1/gsf/gsf-output-stdio.h
@@ -33,16 +40,15 @@ include/libgsf-1/gsf/gsf-utils.h
 include/libgsf-1/gsf/gsf.h
 lib/libgsf-1.a
 lib/libgsf-1.so
-lib/libgsf-1.so.9
+lib/libgsf-1.so.10
 lib/libgsf-gnome-1.a
 lib/libgsf-gnome-1.so
-lib/libgsf-gnome-1.so.9
+lib/libgsf-gnome-1.so.10
 libdata/pkgconfig/libgsf-1.pc
 libdata/pkgconfig/libgsf-gnome-1.pc
 share/doc/gsf/gsf-gsf-impl-utils.html
 share/doc/gsf/gsf-gsf-infile-msole.html
 share/doc/gsf/gsf-gsf-infile-zip.html
-share/doc/gsf/gsf-gsf-infile.html
 share/doc/gsf/gsf-gsf-input-gnomevfs.html
 share/doc/gsf/gsf-gsf-input-gzip.html
 share/doc/gsf/gsf-gsf-input-memory.html
@@ -50,39 +56,34 @@ share/doc/gsf/gsf-gsf-input-stdio.html
 share/doc/gsf/gsf-gsf-input-textline.html
 share/doc/gsf/gsf-gsf-input.html
 share/doc/gsf/gsf-gsf-libxml.html
-share/doc/gsf/gsf-gsf-outfile.html
 share/doc/gsf/gsf-gsf-output.html
 share/doc/gsf/gsf-gsf-shared-memory.html
 share/doc/gsf/gsf-gsf-utils.html
 share/doc/gsf/gsf-gsf.html
-share/doc/gsf/gsf-gsfinfile.html
-share/doc/gsf/gsf-gsfinput.html
-share/doc/gsf/gsf-gsfoutput.html
+share/doc/gsf/gsf-infile-reading-structed-files.html
+share/doc/gsf/gsf-outfile-writing-structed-files.html
 share/doc/gsf/gsf.html
 share/doc/gsf/home.png
-share/doc/gsf/i1987.html
+share/doc/gsf/i3309.html
 share/doc/gsf/index.html
 share/doc/gsf/index.sgml
 share/doc/gsf/left.png
-share/doc/gsf/r1058.html
-share/doc/gsf/r1189.html
-share/doc/gsf/r1284.html
-share/doc/gsf/r1420.html
-share/doc/gsf/r1492.html
+share/doc/gsf/r1039.html
+share/doc/gsf/r1096.html
+share/doc/gsf/r1247.html
+share/doc/gsf/r1357.html
 share/doc/gsf/r14.html
-share/doc/gsf/r1524.html
-share/doc/gsf/r1704.html
-share/doc/gsf/r1748.html
-share/doc/gsf/r1879.html
-share/doc/gsf/r189.html
-share/doc/gsf/r331.html
-share/doc/gsf/r363.html
-share/doc/gsf/r459.html
-share/doc/gsf/r555.html
-share/doc/gsf/r64.html
-share/doc/gsf/r819.html
-share/doc/gsf/r944.html
-share/doc/gsf/r962.html
+share/doc/gsf/r1551.html
+share/doc/gsf/r197.html
+share/doc/gsf/r2466.html
+share/doc/gsf/r2559.html
+share/doc/gsf/r373.html
+share/doc/gsf/r447.html
+share/doc/gsf/r510.html
+share/doc/gsf/r72.html
+share/doc/gsf/r736.html
+share/doc/gsf/r792.html
+share/doc/gsf/r902.html
 share/doc/gsf/right.png
 share/doc/gsf/up.png
 @dirrm share/doc/gsf