Update to 1.10.0

This commit is contained in:
marcm 2004-07-25 00:15:34 +00:00
parent 7e41bd0f6c
commit 799e23d23b
7 changed files with 82 additions and 100 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2004/01/03 06:15:22 jolan Exp $ # $OpenBSD: Makefile,v 1.4 2004/07/25 00:15:34 marcm Exp $
COMMENT= "GNOME Structured File library" COMMENT= "GNOME Structured File library"
COMMENT-gnome= "GNOME specific extensions to libgsf" COMMENT-gnome= "GNOME specific extensions to libgsf"
VERSION= 1.8.2 VERSION= 1.10.0
DISTNAME= libgsf-${VERSION} DISTNAME= libgsf-${VERSION}
PKGNAME-gnome= libgsf-gnome-${VERSION} PKGNAME-gnome= libgsf-gnome-${VERSION}
CATEGORIES= devel CATEGORIES= devel
@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgsf/1.8/} MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgsf/1.10/}
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2
MODULES= gettext MODULES= gettext

View File

@ -1,3 +1,3 @@
MD5 (libgsf-1.8.2.tar.bz2) = 3a575469f9a2880d8ca78a70ddb93e78 MD5 (libgsf-1.10.0.tar.bz2) = d3b650ccef7e5278baf546025d4b3848
RMD160 (libgsf-1.8.2.tar.bz2) = 5670e7a6cb9243122793551166b53fd0d8c534de RMD160 (libgsf-1.10.0.tar.bz2) = 3d9e387339a1c4d78844d3e9575c6139b7a0b2ec
SHA1 (libgsf-1.8.2.tar.bz2) = 4fcf08be27cda3df9b9af8bc2658ff9b658a72e4 SHA1 (libgsf-1.10.0.tar.bz2) = 15d4e9b34c94f48945f5c528699ff7246818650a

View File

@ -1,35 +1,22 @@
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/06 17:12:02 marcm Exp $ $OpenBSD: patch-ltmain_sh,v 1.2 2004/07/25 00:15:34 marcm Exp $
--- ltmain.sh.orig 2003-08-01 18:57:12.000000000 -0700 --- ltmain.sh.orig Mon Apr 12 10:33:23 2004
+++ ltmain.sh 2003-09-15 09:29:07.000000000 -0700 +++ ltmain.sh Fri Jul 23 07:32:20 2004
@@ -1288,6 +1288,17 @@ EOF @@ -1857,9 +1857,12 @@ EOF
continue if test "$linkmode,$pass" = "prog,link"; then
;; compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
+ -pthread) - else
+ case $host in - deplibs="$deplib $deplibs"
+ *-*-openbsd*) + continue
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1965,6 +1976,9 @@ EOF
fi fi
+ if test "$linkmode" = "lib"; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ deplibs="$deplib $deplibs"
continue continue
;; ;;
+ -pthread) -l*)
+ continue @@ -2274,10 +2277,6 @@ EOF
+ ;;
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2213,10 +2227,6 @@ EOF
link_static=no # Whether the deplib will be linked statically link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" && if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -38,11 +25,11 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/06 17:12:02 marcm Exp $
- need_relink=yes - need_relink=yes
- fi - fi
# This is a shared library # This is a shared library
# Warn about portability, can't link against -module's on some systems (darwin) # Warn about portability, can't link against -module's on
@@ -5728,40 +5738,6 @@ relink_command=\"$relink_command\"" @@ -5827,40 +5826,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode. # Exit here if they wanted silent mode.
test "$show" = : && exit 0 test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------" - $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:" - $echo "Libraries have been installed in:"
@ -78,6 +65,6 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/06 17:12:02 marcm Exp $
- $echo "See any operating system documentation about shared libraries for" - $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------" - $echo "----------------------------------------------------------------------"
exit 0 exit $EXIT_SUCCESS
;; ;;

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2003/12/31 06:58:06 brad Exp $ @comment $OpenBSD: PFRAG.shared,v 1.3 2004/07/25 00:15:34 marcm Exp $
lib/libgsf-1.so.9.2 lib/libgsf-1.so.11.0
DYNLIBDIR(%D/lib) DYNLIBDIR(%D/lib)

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared-gnome,v 1.1 2003/12/31 06:58:06 brad Exp $ @comment $OpenBSD: PFRAG.shared-gnome,v 1.2 2004/07/25 00:15:34 marcm Exp $
lib/libgsf-gnome-1.so.9.2 lib/libgsf-gnome-1.so.11.0
DYNLIBDIR(%D/lib) DYNLIBDIR(%D/lib)

View File

@ -1,12 +1,20 @@
@comment $OpenBSD: PLIST,v 1.3 2003/12/31 06:58:06 brad Exp $ @comment $OpenBSD: PLIST,v 1.4 2004/07/25 00:15:34 marcm Exp $
include/libgsf-1/
include/libgsf-1/gsf/
include/libgsf-1/gsf-win32/
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-doc-meta-data.h
include/libgsf-1/gsf/gsf-impl-utils.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-msole.h
include/libgsf-1/gsf/gsf-infile-msvba.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-zip.h
include/libgsf-1/gsf/gsf-infile.h include/libgsf-1/gsf/gsf-infile.h
include/libgsf-1/gsf/gsf-input-bzip.h include/libgsf-1/gsf/gsf-input-bzip.h
include/libgsf-1/gsf/gsf-input-gzip.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-iochannel.h
include/libgsf-1/gsf/gsf-input-memory.h include/libgsf-1/gsf/gsf-input-memory.h
include/libgsf-1/gsf/gsf-input-stdio.h include/libgsf-1/gsf/gsf-input-stdio.h
@ -14,11 +22,14 @@ include/libgsf-1/gsf/gsf-input-textline.h
include/libgsf-1/gsf/gsf-input.h include/libgsf-1/gsf/gsf-input.h
include/libgsf-1/gsf/gsf-libxml.h include/libgsf-1/gsf/gsf-libxml.h
include/libgsf-1/gsf/gsf-msole-utils.h include/libgsf-1/gsf/gsf-msole-utils.h
include/libgsf-1/gsf/gsf-outfile-impl.h
include/libgsf-1/gsf/gsf-outfile-msole.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-zip.h
include/libgsf-1/gsf/gsf-outfile.h include/libgsf-1/gsf/gsf-outfile.h
include/libgsf-1/gsf/gsf-output-bzip.h include/libgsf-1/gsf/gsf-output-bzip.h
include/libgsf-1/gsf/gsf-output-gzip.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-iochannel.h
include/libgsf-1/gsf/gsf-output-memory.h include/libgsf-1/gsf/gsf-output-memory.h
include/libgsf-1/gsf/gsf-output-stdio.h include/libgsf-1/gsf/gsf-output-stdio.h
@ -29,56 +40,40 @@ include/libgsf-1/gsf/gsf-utils.h
include/libgsf-1/gsf/gsf.h include/libgsf-1/gsf/gsf.h
lib/libgsf-1.a lib/libgsf-1.a
lib/libgsf-1.la lib/libgsf-1.la
%%SHARED%%
lib/pkgconfig/libgsf-1.pc lib/pkgconfig/libgsf-1.pc
share/doc/libgsf/html/gsf-gsf-impl-utils.html share/gtk-doc/
share/doc/libgsf/html/gsf-gsf-infile-msole.html share/gtk-doc/html/
share/doc/libgsf/html/gsf-gsf-infile-zip.html share/gtk-doc/html/gsf/
share/doc/libgsf/html/gsf-gsf-infile.html share/gtk-doc/html/gsf/api.html
share/doc/libgsf/html/gsf-gsf-input-gnomevfs.html share/gtk-doc/html/gsf/gsf-Bononbo.html
share/doc/libgsf/html/gsf-gsf-input-gzip.html share/gtk-doc/html/gsf/gsf-Compression.html
share/doc/libgsf/html/gsf-gsf-input-memory.html share/gtk-doc/html/gsf/gsf-GIOChannel.html
share/doc/libgsf/html/gsf-gsf-input-stdio.html share/gtk-doc/html/gsf/gsf-GnomeVFS.html
share/doc/libgsf/html/gsf-gsf-input-textline.html share/gtk-doc/html/gsf/gsf-Infile-reading-structed-files.html
share/doc/libgsf/html/gsf-gsf-input.html share/gtk-doc/html/gsf/gsf-Input-from-unstructured-files.html
share/doc/libgsf/html/gsf-gsf-libxml.html share/gtk-doc/html/gsf/gsf-MS-OLE2.html
share/doc/libgsf/html/gsf-gsf-outfile.html share/gtk-doc/html/gsf/gsf-Outfile-writing-structed-files.html
share/doc/libgsf/html/gsf-gsf-output.html share/gtk-doc/html/gsf/gsf-Output-to-unstructured-files.html
share/doc/libgsf/html/gsf-gsf-shared-memory.html share/gtk-doc/html/gsf/gsf-Reading-and-Writing-from-local-files-and-directories.html
share/doc/libgsf/html/gsf-gsf-utils.html share/gtk-doc/html/gsf/gsf-Structured-Blobs.html
share/doc/libgsf/html/gsf-gsf.html share/gtk-doc/html/gsf/gsf-Text.html
share/doc/libgsf/html/gsf-gsfinfile.html share/gtk-doc/html/gsf/gsf-XML-and-libxml.html
share/doc/libgsf/html/gsf-gsfinput.html share/gtk-doc/html/gsf/gsf-Zip.html
share/doc/libgsf/html/gsf-gsfoutput.html share/gtk-doc/html/gsf/gsf-memory.html
share/doc/libgsf/html/gsf.html share/gtk-doc/html/gsf/gsf-metadata.html
share/doc/libgsf/html/home.png share/gtk-doc/html/gsf/gsf-utils.html
share/doc/libgsf/html/i1987.html share/gtk-doc/html/gsf/gsf.devhelp
share/doc/libgsf/html/index.html share/gtk-doc/html/gsf/home.png
share/doc/libgsf/html/index.sgml share/gtk-doc/html/gsf/index.html
share/doc/libgsf/html/left.png share/gtk-doc/html/gsf/index.sgml
share/doc/libgsf/html/r1058.html share/gtk-doc/html/gsf/into.html
share/doc/libgsf/html/r1189.html share/gtk-doc/html/gsf/io.html
share/doc/libgsf/html/r1284.html share/gtk-doc/html/gsf/ix01.html
share/doc/libgsf/html/r14.html share/gtk-doc/html/gsf/left.png
share/doc/libgsf/html/r1420.html share/gtk-doc/html/gsf/misc.html
share/doc/libgsf/html/r1492.html share/gtk-doc/html/gsf/parsers.html
share/doc/libgsf/html/r1524.html share/gtk-doc/html/gsf/right.png
share/doc/libgsf/html/r1704.html share/gtk-doc/html/gsf/sources.html
share/doc/libgsf/html/r1748.html share/gtk-doc/html/gsf/style.css
share/doc/libgsf/html/r1879.html share/gtk-doc/html/gsf/up.png
share/doc/libgsf/html/r189.html %%SHARED%%
share/doc/libgsf/html/r331.html
share/doc/libgsf/html/r363.html
share/doc/libgsf/html/r459.html
share/doc/libgsf/html/r555.html
share/doc/libgsf/html/r64.html
share/doc/libgsf/html/r819.html
share/doc/libgsf/html/r944.html
share/doc/libgsf/html/r962.html
share/doc/libgsf/html/right.png
share/doc/libgsf/html/up.png
@dirrm share/doc/libgsf/html
@dirrm share/doc/libgsf
@dirrm lib/pkgconfig
@dirrm include/libgsf-1/gsf
@dirrm include/libgsf-1

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-gnome,v 1.1 2003/12/31 06:58:06 brad Exp $ @comment $OpenBSD: PLIST-gnome,v 1.2 2004/07/25 00:15:34 marcm Exp $
include/libgsf-1/gsf-gnome/
include/libgsf-1/gsf-gnome/gsf-input-bonobo.h include/libgsf-1/gsf-gnome/gsf-input-bonobo.h
include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h 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-bonobo.h
@ -6,6 +7,5 @@ include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h
include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h
lib/libgsf-gnome-1.a lib/libgsf-gnome-1.a
lib/libgsf-gnome-1.la lib/libgsf-gnome-1.la
%%SHARED%%
lib/pkgconfig/libgsf-gnome-1.pc lib/pkgconfig/libgsf-gnome-1.pc
@dirrm include/libgsf-1/gsf-gnome %%SHARED%%