upgrade to version 2.4.18

This commit is contained in:
kevlo 2002-03-19 07:42:42 +00:00
parent 14426910d5
commit eaaed7cb51
5 changed files with 28 additions and 27 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.41 2002/03/12 15:47:13 kevlo Exp $
# $OpenBSD: Makefile,v 1.42 2002/03/19 07:42:42 kevlo Exp $
COMMENT= "XML parsing library"
VERSION= 2.4.17
VERSION= 2.4.18
DISTNAME= libxml2-${VERSION}
PKGNAME= libxml-${VERSION}
CATEGORIES= textproc

View File

@ -1,3 +1,3 @@
MD5 (libxml2-2.4.17.tar.gz) = a87a39b7ef04e740c9ab28ad2d37bf6d
RMD160 (libxml2-2.4.17.tar.gz) = 5900ca1cfb953d818587f8b70f8c90cc1e48f26d
SHA1 (libxml2-2.4.17.tar.gz) = b75b254caa649db159b04343f593b6b2825ccc55
MD5 (libxml2-2.4.18.tar.gz) = ddfddd8cb392eb34143220fc1b893e74
RMD160 (libxml2-2.4.18.tar.gz) = 8fbe413339dbdbdede63d92836d741c5868df692
SHA1 (libxml2-2.4.18.tar.gz) = b80fe612c3f0bab6626635e6a7d7107306f18359

View File

@ -1,6 +1,6 @@
--- configure.orig Fri Sep 14 17:36:02 2001
+++ configure Sat Sep 22 10:51:20 2001
@@ -2958,7 +2958,14 @@
--- configure.orig Tue Mar 19 15:05:41 2002
+++ configure Tue Mar 19 15:18:18 2002
@@ -2964,7 +2964,14 @@
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@ -16,18 +16,18 @@
fi
# Allow CC to be a program name with arguments.
@@ -3455,7 +3462,9 @@
with_gnu_ld=no
@@ -3462,6 +3469,10 @@
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
+
esac
ld_shlibs=yes
@@ -3859,10 +3868,21 @@
@@ -3865,10 +3876,21 @@
;;
openbsd*)
@ -37,21 +37,21 @@
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='$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
+ 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*)
@@ -4339,9 +4359,23 @@
@@ -4345,9 +4367,23 @@
openbsd*)
version_type=sunos
@ -72,18 +72,18 @@
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ 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'
@@ -7087,7 +7121,7 @@
@@ -7098,7 +7134,7 @@
XML_LIBDIR='-L${libdir}'
-XML_INCLUDEDIR='-I${includedir}/libxml2/libxml -I${includedir}/libxml2'
+XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
-XML_INCLUDEDIR='-I${includedir}/libxml2'
+XML_INCLUDEDIR='-I${includedir}/libxml'
XML_CFLAGS=""
RDL_LIBS=""

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.27 2002/03/12 15:47:17 kevlo Exp $
lib/libxml2.so.6.17
@comment $OpenBSD: PFRAG.shared,v 1.28 2002/03/19 07:42:50 kevlo Exp $
lib/libxml2.so.6.18
DYNLIBDIR(%B)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2002/03/12 15:47:17 kevlo Exp $
@comment $OpenBSD: PLIST,v 1.19 2002/03/19 07:42:50 kevlo Exp $
bin/xml2-config
bin/xmlcatalog
bin/xmllint
@ -52,6 +52,7 @@ share/libxml2/html/FAQ.html
share/libxml2/html/book1.html
share/libxml2/html/encoding.html
share/libxml2/html/index.sgml
share/libxml2/html/libxml-c14n.html
share/libxml2/html/libxml-catalog.html
share/libxml2/html/libxml-debugxml.html
share/libxml2/html/libxml-docbparser.html