Upgrade to libxslt-1.0.5
- bump VERSION - regen patch for lt-1.4
This commit is contained in:
shell
parent
eb43e7b64e
commit
8054d18b87
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2001/09/21 17:31:55 shell Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2001/10/27 08:39:13 shell Exp $
|
||||
|
||||
COMMENT= "XSLT C Library for GNOME"
|
||||
|
||||
DISTNAME= libxslt-1.0.4
|
||||
DISTNAME= libxslt-1.0.5
|
||||
CATEGORIES= textproc
|
||||
NEED_VERSION= 1.460
|
||||
NEED_VERSION= 1.484
|
||||
HOMEPAGE= http://xmlsoft.org/XSLT/
|
||||
|
||||
MAINTAINER= Shell Hung <shell@openbsd.org>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (libxslt-1.0.4.tar.gz) = 2861ebab16dc6307a2f17b103577c026
|
||||
RMD160 (libxslt-1.0.4.tar.gz) = d94c77ecae77d0ee7fcc9c93b82e28e5bb1c660c
|
||||
SHA1 (libxslt-1.0.4.tar.gz) = f6a2dab075781e2d652b3f3e7acaa4ee5325f233
|
||||
MD5 (libxslt-1.0.5.tar.gz) = 165befb6486b573d151934b1decc7e75
|
||||
RMD160 (libxslt-1.0.5.tar.gz) = 5eece02845b5d0b27071fafb060b06deaf7ceacc
|
||||
SHA1 (libxslt-1.0.5.tar.gz) = cd05a7a99df1b67671ba7aa446892916e48ca8e5
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.2 2001/09/22 03:17:19 shell Exp $
|
||||
--- configure.orig Thu Sep 13 05:06:53 2001
|
||||
+++ configure Sat Sep 22 11:10:05 2001
|
||||
@@ -2942,6 +2942,14 @@
|
||||
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.
|
||||
@@ -3439,6 +3447,9 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
+openbsd*)
|
||||
+ with_gnu_id=no
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
ld_shlibs=yes
|
||||
@@ -3842,10 +3853,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*)
|
||||
@@ -4322,9 +4344,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'
|
||||
@@ -6359,7 +6395,7 @@
|
||||
# Check whether --with-libxml-include-prefix or --without-libxml-include-prefix was given.
|
||||
if test "${with_libxml_include_prefix+set}" = set; then
|
||||
withval="$with_libxml_include_prefix"
|
||||
- LIBXML_CFLAGS="-I$withval"
|
||||
+ LIBXML_CFLAGS_ORIG="-I$withval"
|
||||
|
||||
fi
|
||||
|
||||
@@ -6400,7 +6436,7 @@
|
||||
if test "$vers" -ge `echo $LIBXML_REQUIRED_VERSION | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
|
||||
then
|
||||
LIBXML_LIBS="`$XML_CONFIG --libs`"
|
||||
- LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
|
||||
+ LIBXML_CFLAGS="`$XML_CONFIG --cflags` $LIBXML_CFLAGS_ORIG"
|
||||
echo "$ac_t""found" 1>&6
|
||||
else
|
||||
{ echo "configure: error: You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt" 1>&2; exit 1; }
|
||||
@ -1,45 +1,118 @@
|
||||
$OpenBSD: patch-ltmain.sh,v 1.4 2001/09/21 17:31:55 shell Exp $
|
||||
--- ltmain.sh.orig Sat Sep 22 00:01:04 2001
|
||||
+++ ltmain.sh Sat Sep 22 00:04:54 2001
|
||||
@@ -1031,12 +1031,28 @@
|
||||
# These systems don't actually have a C library (as such)
|
||||
test "X$arg" = "X-lc" && continue
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ elif test "$arg" = "-lc_r"; then
|
||||
+ case "$host" in
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc_r directly, use -pthread flag.
|
||||
+ continue
|
||||
+ ;;
|
||||
esac
|
||||
$OpenBSD: patch-ltmain.sh,v 1.5 2001/10/27 08:39:13 shell Exp $
|
||||
--- ltmain.sh.orig Sat Oct 27 16:20:59 2001
|
||||
+++ ltmain.sh Sat Oct 27 16:20:32 2001
|
||||
@@ -745,6 +745,7 @@
|
||||
linker_flags=
|
||||
dllsearchpath=
|
||||
lib_search_path=`pwd`
|
||||
+ inst_prefix_dir=
|
||||
|
||||
avoid_version=no
|
||||
dlfiles=
|
||||
@@ -875,6 +876,11 @@
|
||||
prev=
|
||||
continue
|
||||
;;
|
||||
+ inst_prefix)
|
||||
+ inst_prefix_dir="$arg"
|
||||
+ prev=
|
||||
+ continue
|
||||
+ ;;
|
||||
release)
|
||||
release="-$arg"
|
||||
prev=
|
||||
@@ -975,6 +981,10 @@
|
||||
fi
|
||||
deplibs="$deplibs $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -?thread)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ -inst-prefix-dir)
|
||||
+ prev=inst_prefix
|
||||
+ continue
|
||||
+ ;;
|
||||
|
||||
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
|
||||
# so, if we see these flags be careful not to treat them like -L
|
||||
@@ -1068,6 +1078,17 @@
|
||||
|
||||
-o) prev=output ;;
|
||||
|
||||
+ -pthread)
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
-release)
|
||||
prev=release
|
||||
continue
|
||||
@@ -2405,7 +2421,7 @@
|
||||
# Rhapsody C library is in the System framework
|
||||
deplibs="$deplibs -framework System"
|
||||
;;
|
||||
- *-*-netbsd*)
|
||||
+ *-*-netbsd* | *-*-openbsd*)
|
||||
# Don't link with libc until the a.out ld.so is fixed.
|
||||
;;
|
||||
*)
|
||||
@@ -4412,40 +4428,6 @@
|
||||
@@ -1845,6 +1866,7 @@
|
||||
|
||||
if test "$linkmode" = prog || test "$mode" = relink; then
|
||||
add_shlibpath=
|
||||
+ add_prefix_dir=
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
@@ -1865,10 +1887,20 @@
|
||||
add="-l$name"
|
||||
fi
|
||||
|
||||
+ if test -n "$inst_prefix_dir"; then
|
||||
+ case "$libdir" in
|
||||
+ [\\/]*)
|
||||
+ add_prefix_dir="-L$inst_prefix_dir$libdir"
|
||||
+ ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+
|
||||
if test "$linkmode" = prog; then
|
||||
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
|
||||
+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
|
||||
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
|
||||
else
|
||||
+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
|
||||
test -n "$add_dir" && deplibs="$add_dir $deplibs"
|
||||
test -n "$add" && deplibs="$add $deplibs"
|
||||
fi
|
||||
@@ -3823,7 +3855,7 @@
|
||||
fi
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
|
||||
+ relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
|
||||
# Only create the output if not a dry run.
|
||||
@@ -4124,6 +4156,23 @@
|
||||
dir="$dir$objdir"
|
||||
|
||||
if test -n "$relink_command"; then
|
||||
+ # Determine the prefix the user has applied to our future dir.
|
||||
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
|
||||
+
|
||||
+ # Don't allow the user to place us outside of our expected
|
||||
+ # location b/c this prevents finding dependent libraries that
|
||||
+ # are installed to the same prefix.
|
||||
+ if test "$inst_prefix_dir" = "$destdir"; then
|
||||
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+
|
||||
+ if test -n "$inst_prefix_dir"; then
|
||||
+ # Stick the inst_prefix_dir data into the link command.
|
||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
||||
+ else
|
||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
|
||||
+ fi
|
||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
||||
$show "$relink_command"
|
||||
if $run eval "$relink_command"; then :
|
||||
@@ -4412,40 +4461,6 @@
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = ":" && exit 0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.7 2001/09/21 17:31:55 shell Exp $
|
||||
lib/libexslt.so.4.0
|
||||
lib/libxslt.so.1.4
|
||||
DYNLIBDIR(%B)
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.8 2001/10/27 08:39:13 shell Exp $
|
||||
lib/libexslt.so.5.0
|
||||
lib/libxslt.so.1.5
|
||||
DYNLIBDIR(%D/lib)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2001/09/21 17:31:55 shell Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2001/10/27 08:39:13 shell Exp $
|
||||
bin/xslt-config
|
||||
bin/xsltproc
|
||||
include/libexslt/exslt.h
|
||||
@ -26,6 +26,7 @@ lib/libexslt.la
|
||||
lib/libxslt.a
|
||||
lib/libxslt.la
|
||||
lib/xsltConf.sh
|
||||
man/man1/xsltproc.1
|
||||
man/man4/libexslt.4
|
||||
man/man4/libxslt.4
|
||||
share/doc/libxslt/html/book1.html
|
||||
|
||||
Loading…
Reference in New Issue
Block a user