[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Update for textproc/libxslt to the latest version



Here's a patch to update libxslt to the latest version.

This time I actually checked my ports@ archive to see if someone
else had done it first.

diff -urN libxslt.orig/distinfo libxslt/distinfo
--- libxslt.orig/distinfo	Wed May 21 22:07:21 2003
+++ libxslt/distinfo	Wed May 21 22:08:05 2003
@@ -1,3 +1,3 @@
-MD5 (libxslt-1.0.22.tar.gz) = a73b12a5457ab12795b3c57c22df13bc
-RMD160 (libxslt-1.0.22.tar.gz) = b512fc1984992a2b377c763a34cc6c616b1c2299
-SHA1 (libxslt-1.0.22.tar.gz) = acb0255ad292e8cd9859431f2262264dfd0c336b
+MD5 (libxslt-1.0.30.tar.gz) = 67abfd49f4a32a06f783b33cb64507ac
+RMD160 (libxslt-1.0.30.tar.gz) = 31dd25591c5a61dc355994a53a9eaf443df910b4
+SHA1 (libxslt-1.0.30.tar.gz) = f5d3e61235ac04f5aa92e7518f4a847bd6e5719e
diff -urN libxslt.orig/patches/patch-configure libxslt/patches/patch-configure
--- libxslt.orig/patches/patch-configure	Wed May 21 22:07:20 2003
+++ libxslt/patches/patch-configure	Wed Dec 31 16:00:00 1969
@@ -1,73 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2002/07/29 08:31:43 shell Exp $
---- configure.orig	Sun Jul  7 04:12:34 2002
-+++ configure	Mon Jul 29 16:09:37 2002
-@@ -2001,6 +2001,16 @@ newos6*)
-   lt_cv_file_magic_test_file=/usr/lib/libnls.so
-   ;;
- 
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
- osf3* | osf4* | osf5*)
-   # this will be overridden with pass_all, but let us keep it just in case
-   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-@@ -2765,8 +2775,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
- 
- if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
- fi
- 
- # Allow CC to be a program name with arguments.
-@@ -3263,7 +3280,9 @@ cygwin* | mingw* | pw32* )
-     with_gnu_ld=no
-   fi
-   ;;
--
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
- esac
- 
- ld_shlibs=yes
-@@ -3667,8 +3686,8 @@ else
-     ;;
- 
-   openbsd*)
--    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 $compiler_flags'
-+    hardcode_libdir_flag_spec='${wl}-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-     ;;
-@@ -4147,10 +4166,9 @@ newsos6)
- 
- openbsd*)
-   version_type=sunos
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--    need_version=no
--  fi
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_overrides_runpath=yes
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
diff -urN libxslt.orig/patches/patch-doc_Makefile_in libxslt/patches/patch-doc_Makefile_in
--- libxslt.orig/patches/patch-doc_Makefile_in	Wed May 21 22:07:21 2003
+++ libxslt/patches/patch-doc_Makefile_in	Wed May 21 23:09:33 2003
@@ -1,6 +1,6 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.2 2002/09/14 07:52:03 shell Exp $
---- doc/Makefile.in.orig	Sat Sep 14 15:42:52 2002
-+++ doc/Makefile.in	Sat Sep 14 15:43:39 2002
+$OpenBSD$
+--- doc/Makefile.in.orig	Sun May  4 08:47:32 2003
++++ doc/Makefile.in	Wed May 21 23:09:22 2003
 @@ -22,7 +22,7 @@ exec_prefix = @exec_prefix@
  bindir = @bindir@
  sbindir = @sbindir@
@@ -10,7 +10,7 @@
  sysconfdir = @sysconfdir@
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
-@@ -123,7 +123,7 @@ EXTRA_DIST = \
+@@ -131,7 +131,7 @@ EXTRA_DIST = \
  
  
  # The name of the module.
@@ -18,21 +18,13 @@
 +DOC_MODULE = libxslt
  
  # The top-level SGML file.
- DOC_MAIN_SGML_FILE = libxslt.sgml
-@@ -131,7 +131,7 @@ DOC_MAIN_SGML_FILE = libxslt.sgml
+ DOC_MAIN_XML_FILE = libxslt.xml
+@@ -139,7 +139,7 @@ DOC_MAIN_XML_FILE = libxslt.xml
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = ..
  
--HTML_DIR = @HTML_DIR@
+-HTML_DIR = $(datadir)/doc
 +HTML_DIR = $(datadir)
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
  PAGES = API.html bugs.html contribs.html docs.html downloads.html \
-@@ -350,7 +350,6 @@ install-data-local: 
- 	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
- 	-@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial
--	-(cd $(DESTDIR); gtkdoc-fixxref --module=libxslt --html-dir=$(HTML_DIR))
- 
- dist-hook:
- 	(cd $(srcdir) ; tar cvf - *.1 *.html site.xsl *.gif html/*.html html/*.sgml tutorial/libxslt*) | (cd $(distdir); tar xf -)
diff -urN libxslt.orig/patches/patch-libxslt_extra_c libxslt/patches/patch-libxslt_extra_c
--- libxslt.orig/patches/patch-libxslt_extra_c	Wed May 21 22:07:21 2003
+++ libxslt/patches/patch-libxslt_extra_c	Wed May 21 22:54:25 2003
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libxslt_extra_c,v 1.1 2002/07/11 17:21:42 shell Exp $
---- libxslt/extra.c.orig	Tue Mar 19 04:09:55 2002
-+++ libxslt/extra.c	Fri Jul 12 00:58:24 2002
-@@ -244,10 +244,9 @@ xsltFunctionLocalTime(xmlXPathParserCont
+$OpenBSD$
+--- libxslt/extra.c.orig	Wed Feb  5 03:29:28 2003
++++ libxslt/extra.c	Wed May 21 22:52:54 2003
+@@ -241,10 +241,9 @@ xsltFunctionLocalTime(xmlXPathParserCont
      local_tm = localtime(&gmt);
  
      /*
diff -urN libxslt.orig/patches/patch-ltmain.sh libxslt/patches/patch-ltmain.sh
--- libxslt.orig/patches/patch-ltmain.sh	Wed May 21 22:07:21 2003
+++ libxslt/patches/patch-ltmain.sh	Wed Dec 31 16:00:00 1969
@@ -1,155 +0,0 @@
-$OpenBSD: patch-ltmain.sh,v 1.6 2002/07/11 17:21:42 shell Exp $
---- ltmain.sh.orig	Sun Jul  7 04:12:28 2002
-+++ ltmain.sh	Fri Jul 12 00:53:08 2002
-@@ -745,6 +745,7 @@ compiler."
-     linker_flags=
-     dllsearchpath=
-     lib_search_path=`pwd`
-+    inst_prefix_dir=
- 
-     avoid_version=no
-     dlfiles=
-@@ -875,6 +876,11 @@ compiler."
- 	  prev=
- 	  continue
- 	  ;;
-+	inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	release)
- 	  release="-$arg"
- 	  prev=
-@@ -975,6 +981,10 @@ compiler."
- 	fi
- 	continue
- 	;;
-+      -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 @@ compiler."
- 
-       -o) prev=output ;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -release)
- 	prev=release
- 	continue
-@@ -1845,6 +1866,7 @@ compiler."
- 
- 	  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 @@ compiler."
- 	      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\
- 	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 @@ relink_command=\"$relink_command\""
- 	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 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = ":" && exit 0
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      echo "   $libdir"
--    done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      echo "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      echo "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    echo
--    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 "----------------------------------------------------------------------"
-     exit 0
-     ;;
- 
diff -urN libxslt.orig/patches/patch-python_Makefile_in libxslt/patches/patch-python_Makefile_in
--- libxslt.orig/patches/patch-python_Makefile_in	Wed May 21 22:07:21 2003
+++ libxslt/patches/patch-python_Makefile_in	Wed May 21 22:54:25 2003
@@ -1,7 +1,7 @@
-$OpenBSD: patch-python_Makefile_in,v 1.3 2002/09/15 04:01:31 shell Exp $
---- python/Makefile.in.orig	Fri Aug 23 20:37:55 2002
-+++ python/Makefile.in	Sun Sep 15 11:55:54 2002
-@@ -400,7 +400,7 @@ installcheck: installcheck-recursive
+$OpenBSD$
+--- python/Makefile.in.orig	Sun May  4 08:47:16 2003
++++ python/Makefile.in	Wed May 21 22:52:54 2003
+@@ -425,7 +425,7 @@ installcheck: installcheck-recursive
  install-exec-am:
  install-exec: install-exec-recursive
  
@@ -10,7 +10,7 @@
  install-data: install-data-recursive
  
  install-am: all-am
-@@ -408,7 +408,7 @@ install-am: all-am
+@@ -433,7 +433,7 @@ install-am: all-am
  install: install-recursive
  uninstall-am: uninstall-pythonLTLIBRARIES
  uninstall: uninstall-recursive
diff -urN libxslt.orig/patches/patch-python_tests_Makefile_in libxslt/patches/patch-python_tests_Makefile_in
--- libxslt.orig/patches/patch-python_tests_Makefile_in	Wed May 21 22:07:21 2003
+++ libxslt/patches/patch-python_tests_Makefile_in	Wed May 21 22:54:25 2003
@@ -1,7 +1,7 @@
-$OpenBSD: patch-python_tests_Makefile_in,v 1.1 2002/07/11 17:21:42 shell Exp $
---- python/tests/Makefile.in.orig	Fri Jul 12 01:15:42 2002
-+++ python/tests/Makefile.in	Fri Jul 12 01:15:49 2002
-@@ -117,7 +117,7 @@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@
+$OpenBSD$
+--- python/tests/Makefile.in.orig	Sun May  4 08:47:16 2003
++++ python/tests/Makefile.in	Wed May 21 22:52:54 2003
+@@ -121,7 +121,7 @@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@
  XSLT_LIBDIR = @XSLT_LIBDIR@
  XSLT_LIBS = @XSLT_LIBS@
  
diff -urN libxslt.orig/patches/patch-tests_docs_Makefile_in libxslt/patches/patch-tests_docs_Makefile_in
--- libxslt.orig/patches/patch-tests_docs_Makefile_in	Wed May 21 22:07:21 2003
+++ libxslt/patches/patch-tests_docs_Makefile_in	Wed May 21 22:54:25 2003
@@ -1,7 +1,7 @@
-$OpenBSD: patch-tests_docs_Makefile_in,v 1.1 2002/10/28 22:17:39 naddy Exp $
---- tests/docs/Makefile.in.orig	Mon Oct 28 23:11:10 2002
-+++ tests/docs/Makefile.in	Mon Oct 28 23:11:29 2002
-@@ -254,7 +254,7 @@ info: info-am
+$OpenBSD$
+--- tests/docs/Makefile.in.orig	Sun May  4 08:47:38 2003
++++ tests/docs/Makefile.in	Wed May 21 22:52:54 2003
+@@ -287,7 +287,7 @@ info: info-am
  dvi-am:
  dvi: dvi-am
  check-am: all-am
diff -urN libxslt.orig/pkg/PFRAG.shared libxslt/pkg/PFRAG.shared
--- libxslt.orig/pkg/PFRAG.shared	Wed May 21 22:07:21 2003
+++ libxslt/pkg/PFRAG.shared	Wed May 21 23:15:09 2003
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.20 2002/10/29 10:59:39 shell Exp $
-lib/libexslt.so.7.13
-lib/libxslt.so.1.22
+@comment $OpenBSD$
+lib/libexslt.so.7.20
+lib/libxslt.so.1.30
 lib/libxsltbreakpoint.so.1.8
 DYNLIBDIR(%B)
diff -urN libxslt.orig/pkg/PLIST libxslt/pkg/PLIST
--- libxslt.orig/pkg/PLIST	Wed May 21 22:07:21 2003
+++ libxslt/pkg/PLIST	Wed May 21 23:14:57 2003
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2002/10/29 10:59:39 shell Exp $
+@comment $OpenBSD$
 bin/xslt-config
 bin/xsltproc
 include/libexslt/exslt.h
@@ -33,6 +33,7 @@
 man/man1/xsltproc.1
 man/man4/libexslt.4
 man/man4/libxslt.4
+share/aclocal/libxslt.m4
 share/doc/libxslt/html/API.html
 share/doc/libxslt/html/APIchunk0.html
 share/doc/libxslt/html/APIchunk1.html
@@ -41,6 +42,7 @@
 share/doc/libxslt/html/APIchunk4.html
 share/doc/libxslt/html/APIchunk5.html
 share/doc/libxslt/html/APIchunk6.html
+share/doc/libxslt/html/APIchunk7.html
 share/doc/libxslt/html/APIconstructors.html
 share/doc/libxslt/html/APIfiles.html
 share/doc/libxslt/html/APIfunctions.html
@@ -58,7 +60,6 @@
 share/doc/libxslt/html/extensions.html
 share/doc/libxslt/html/help.html
 share/doc/libxslt/html/index.html
-share/doc/libxslt/html/index.sgml
 share/doc/libxslt/html/internals.html
 share/doc/libxslt/html/intro.html
 share/doc/libxslt/html/libxslt-attributes.html
@@ -69,12 +70,14 @@
 share/doc/libxslt/html/libxslt-lib.html
 share/doc/libxslt/html/libxslt-namespaces.html
 share/doc/libxslt/html/libxslt-notes.html
+share/doc/libxslt/html/libxslt-numbersInternals.html
 share/doc/libxslt/html/libxslt-numbersinternals.html
 share/doc/libxslt/html/libxslt-pattern.html
 share/doc/libxslt/html/libxslt-templates.html
 share/doc/libxslt/html/libxslt-transform.html
 share/doc/libxslt/html/libxslt-variables.html
 share/doc/libxslt/html/libxslt-xslt.html
+share/doc/libxslt/html/libxslt-xsltInternals.html
 share/doc/libxslt/html/libxslt-xsltinternals.html
 share/doc/libxslt/html/libxslt-xsltutils.html
 share/doc/libxslt/html/news.html