cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to version 2.4.28

Browse Source
This commit is contained in:
kevlo 2002-11-30 13:03:31 +00:00
parent 78cea3036a
commit c029ec1db4
7 changed files with 79 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/libxml/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.54 2002/10/22 06:09:28 kevlo Exp $ # $OpenBSD: Makefile,v 1.55 2002/11/30 13:03:31 kevlo Exp $
COMMENT= "XML parsing library" COMMENT= "XML parsing library"
VERSION= 2.4.26 VERSION= 2.4.28
DISTNAME= libxml2-${VERSION} DISTNAME= libxml2-${VERSION}
PKGNAME= libxml-${VERSION} PKGNAME= libxml-${VERSION}
CATEGORIES= textproc CATEGORIES= textproc

6
textproc/libxml/distinfo
View File

@ -1,3 +1,3 @@
MD5 (libxml2-2.4.26.tar.gz) = 744e9d5c12b053fa80a23f634590176d MD5 (libxml2-2.4.28.tar.gz) = 28c6fdbb0897dbc444f5a59ee6efde2c
RMD160 (libxml2-2.4.26.tar.gz) = 0bb7efdbc158dced17e4d46610cfa128761bc7a1 RMD160 (libxml2-2.4.28.tar.gz) = 9ab4752cb7b8f5903545e69df1cad08b76d1e4c6
SHA1 (libxml2-2.4.26.tar.gz) = c1f813bd2b4c9a8fccf9cdbc4180c8fd98c45598 SHA1 (libxml2-2.4.28.tar.gz) = c1631ac83872fa73d7b33a9ac8411864dbafd8ff

8
textproc/libxml/patches/patch-Makefile.in
View File

@ -1,9 +1,9 @@
--- Makefile.in.orig Tue Mar 12 17:55:24 2002 --- Makefile.in.orig Fri Nov 22 15:37:12 2002
+++ Makefile.in Tue Mar 12 23:13:17 2002 +++ Makefile.in Sat Nov 30 17:13:09 2002
@@ -233,7 +233,7 @@ @@ -257,7 +257,7 @@
# Instll the tests program sources as examples # Instll the tests program sources as examples
# #
BASE_DIR = @HTML_DIR@ BASE_DIR = $(datadir)/doc
-DOC_MODULE = libxml2-$(VERSION) -DOC_MODULE = libxml2-$(VERSION)
+DOC_MODULE = libxml2 +DOC_MODULE = libxml2
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples

84
textproc/libxml/patches/patch-configure
View File

@ -1,84 +1,6 @@
--- configure.orig Tue Mar 19 15:05:41 2002 --- configure.orig Fri Nov 22 15:36:34 2002
+++ configure Tue Mar 19 15:18:18 2002 +++ configure Sat Nov 30 17:16:21 2002
@@ -2964,7 +2964,14 @@ @@ -12409,7 +12409,7 @@
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Allow CC to be a program name with arguments.
@@ -3462,6 +3469,10 @@
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
+
esac
ld_shlibs=yes
@@ -3865,10 +3876,21 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -4345,9 +4367,23 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -7098,7 +7134,7 @@
XML_LIBDIR='-L${libdir}' XML_LIBDIR='-L${libdir}'

15
textproc/libxml/patches/patch-doc_Makefile_in
View File

@ -1,6 +1,6 @@
--- doc/Makefile.in.orig Thu Jul 19 17:43:01 2001 --- doc/Makefile.in.orig Fri Nov 22 15:37:42 2002
+++ doc/Makefile.in Thu Jul 19 17:43:26 2001 +++ doc/Makefile.in Sat Nov 30 17:28:11 2002
@@ -117,7 +117,7 @@ @@ -136,7 +136,7 @@
Z_CFLAGS = @Z_CFLAGS@ Z_CFLAGS = @Z_CFLAGS@
Z_LIBS = @Z_LIBS@ Z_LIBS = @Z_LIBS@
@ -9,11 +9,12 @@
# The top-level SGML file. # The top-level SGML file.
DOC_MAIN_SGML_FILE = gnome-xml.sgml DOC_MAIN_SGML_FILE = gnome-xml.sgml
@@ -263,7 +263,6 @@ @@ -363,8 +363,6 @@
-@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(DESTDIR)$(TARGET_DIR) -@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif $(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(TARGET_DIR)
-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
- -(cd $(DESTDIR); gtkdoc-fixxref --module=libxml --html-dir=$(HTML_DIR)) - -(cd $(DESTDIR); gtkdoc-fixxref --module=libxml --html-dir=$(HTML_DIR))
- -@(tar cf - tutorial | (cd $(DESTDIR)$(TARGET_DIR) && tar xvf -)
.PHONY : html sgml templates scan
dist-hook:
(cd $(srcdir) ; tar cvf - *.html *.gif html/*.html html/*.sgml) | (cd $(distdir); tar xf -)

4
textproc/libxml/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.34 2002/10/22 06:09:36 kevlo Exp $ @comment $OpenBSD: PFRAG.shared,v 1.35 2002/11/30 13:03:35 kevlo Exp $
lib/libxml2.so.6.26 lib/libxml2.so.6.28
DYNLIBDIR(%B) DYNLIBDIR(%B)

115
textproc/libxml/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.22 2002/10/22 06:09:36 kevlo Exp $ @comment $OpenBSD: PLIST,v 1.23 2002/11/30 13:03:35 kevlo Exp $
bin/xml2-config bin/xml2-config
bin/xmlcatalog bin/xmlcatalog
bin/xmllint bin/xmllint
@ -34,13 +34,11 @@ include/libxml/xmlschemas.h
include/libxml/xmlschemastypes.h include/libxml/xmlschemastypes.h
include/libxml/xmlunicode.h include/libxml/xmlunicode.h
include/libxml/xmlversion.h include/libxml/xmlversion.h
include/libxml/xmlwin32version.h
include/libxml/xpath.h include/libxml/xpath.h
include/libxml/xpathInternals.h include/libxml/xpathInternals.h
include/libxml/xpointer.h include/libxml/xpointer.h
lib/libxml2.a lib/libxml2.a
lib/libxml2.la lib/libxml2.la
%%SHARED%%
lib/pkgconfig/libxml-2.0.pc lib/pkgconfig/libxml-2.0.pc
lib/xml2Conf.sh lib/xml2Conf.sh
man/man1/xml2-config.1 man/man1/xml2-config.1
@ -48,59 +46,60 @@ man/man1/xmlcatalog.1
man/man1/xmllint.1 man/man1/xmllint.1
man/man3/libxml.3 man/man3/libxml.3
share/aclocal/libxml.m4 share/aclocal/libxml.m4
share/libxml2/Copyright share/doc/libxml2/Copyright
share/libxml2/examples/testHTML.c share/doc/libxml2/examples/testHTML.c
share/libxml2/examples/testSAX.c share/doc/libxml2/examples/testSAX.c
share/libxml2/examples/testXPath.c share/doc/libxml2/examples/testXPath.c
share/libxml2/examples/xmllint.c share/doc/libxml2/examples/xmllint.c
share/libxml2/html/DOM.gif share/doc/libxml2/html/DOM.gif
share/libxml2/html/FAQ.html share/doc/libxml2/html/FAQ.html
share/libxml2/html/Libxml2-Logo-180x168.gif share/doc/libxml2/html/Libxml2-Logo-180x168.gif
share/libxml2/html/Libxml2-Logo-90x34.gif share/doc/libxml2/html/Libxml2-Logo-90x34.gif
share/libxml2/html/book1.html share/doc/libxml2/html/book1.html
share/libxml2/html/encoding.html share/doc/libxml2/html/encoding.html
share/libxml2/html/index.sgml share/doc/libxml2/html/index.sgml
share/libxml2/html/libxml-c14n.html share/doc/libxml2/html/libxml-c14n.html
share/libxml2/html/libxml-catalog.html share/doc/libxml2/html/libxml-catalog.html
share/libxml2/html/libxml-debugxml.html share/doc/libxml2/html/libxml-debugxml.html
share/libxml2/html/libxml-docbparser.html share/doc/libxml2/html/libxml-docbparser.html
share/libxml2/html/libxml-encoding.html share/doc/libxml2/html/libxml-encoding.html
share/libxml2/html/libxml-entities.html share/doc/libxml2/html/libxml-entities.html
share/libxml2/html/libxml-globals.html share/doc/libxml2/html/libxml-globals.html
share/libxml2/html/libxml-hash.html share/doc/libxml2/html/libxml-hash.html
share/libxml2/html/libxml-htmlparser.html share/doc/libxml2/html/libxml-htmlparser.html
share/libxml2/html/libxml-htmltree.html share/doc/libxml2/html/libxml-htmltree.html
share/libxml2/html/libxml-lib.html share/doc/libxml2/html/libxml-lib.html
share/libxml2/html/libxml-nanoftp.html share/doc/libxml2/html/libxml-nanoftp.html
share/libxml2/html/libxml-nanohttp.html share/doc/libxml2/html/libxml-nanohttp.html
share/libxml2/html/libxml-notes.html share/doc/libxml2/html/libxml-notes.html
share/libxml2/html/libxml-parser.html share/doc/libxml2/html/libxml-parser.html
share/libxml2/html/libxml-parserinternals.html share/doc/libxml2/html/libxml-parserinternals.html
share/libxml2/html/libxml-sax.html share/doc/libxml2/html/libxml-sax.html
share/libxml2/html/libxml-schemasinternals.html share/doc/libxml2/html/libxml-schemasinternals.html
share/libxml2/html/libxml-threads.html share/doc/libxml2/html/libxml-threads.html
share/libxml2/html/libxml-tree.html share/doc/libxml2/html/libxml-tree.html
share/libxml2/html/libxml-uri.html share/doc/libxml2/html/libxml-uri.html
share/libxml2/html/libxml-valid.html share/doc/libxml2/html/libxml-valid.html
share/libxml2/html/libxml-xinclude.html share/doc/libxml2/html/libxml-xinclude.html
share/libxml2/html/libxml-xmlautomata.html share/doc/libxml2/html/libxml-xmlautomata.html
share/libxml2/html/libxml-xmlerror.html share/doc/libxml2/html/libxml-xmlerror.html
share/libxml2/html/libxml-xmlio.html share/doc/libxml2/html/libxml-xmlio.html
share/libxml2/html/libxml-xmlmemory.html share/doc/libxml2/html/libxml-xmlmemory.html
share/libxml2/html/libxml-xmlregexp.html share/doc/libxml2/html/libxml-xmlregexp.html
share/libxml2/html/libxml-xmlschemas.html share/doc/libxml2/html/libxml-xmlschemas.html
share/libxml2/html/libxml-xmlschemastypes.html share/doc/libxml2/html/libxml-xmlschemastypes.html
share/libxml2/html/libxml-xmlunicode.html share/doc/libxml2/html/libxml-xmlunicode.html
share/libxml2/html/libxml-xpath.html share/doc/libxml2/html/libxml-xpath.html
share/libxml2/html/libxml-xpathinternals.html share/doc/libxml2/html/libxml-xpathinternals.html
share/libxml2/html/libxml-xpointer.html share/doc/libxml2/html/libxml-xpointer.html
share/libxml2/html/libxml.gif share/doc/libxml2/html/libxml.gif
share/libxml2/html/redhat.gif share/doc/libxml2/html/redhat.gif
share/libxml2/html/smallfootonly.gif share/doc/libxml2/html/smallfootonly.gif
share/libxml2/html/structure.gif share/doc/libxml2/html/structure.gif
share/libxml2/html/w3c.png share/doc/libxml2/html/w3c.png
share/libxml2/html/xml.html share/doc/libxml2/html/xml.html
@dirrm share/libxml2/html %%SHARED%%
@dirrm share/libxml2/examples @dirrm share/doc/libxml2/html
@dirrm share/libxml2 @dirrm share/doc/libxml2/examples
@dirrm share/doc/libxml2
@dirrm include/libxml @dirrm include/libxml