From c02a62174cf0ec0e15197b925a5a44a9221f1253 Mon Sep 17 00:00:00 2001 From: kevlo Date: Sun, 4 Mar 2001 14:41:23 +0000 Subject: [PATCH] Upgrade to version 2.3.2 --- textproc/libxml/Makefile | 6 +- textproc/libxml/files/md5 | 6 +- textproc/libxml/patches/patch-Makefile.in | 10 +-- textproc/libxml/patches/patch-doc_Makefile_in | 28 +++++++ textproc/libxml/pkg/PFRAG.shared | 4 +- textproc/libxml/pkg/PLIST | 76 +++++++++---------- 6 files changed, 78 insertions(+), 52 deletions(-) create mode 100644 textproc/libxml/patches/patch-doc_Makefile_in diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index 2b2be6f6a63..8d72cadb3fc 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.15 2001/01/09 14:49:31 brad Exp $ +# $OpenBSD: Makefile,v 1.16 2001/03/04 14:41:23 kevlo Exp $ -DISTNAME= libxml2-2.2.11 -PKGNAME= libxml-2.2.11 +DISTNAME= libxml2-2.3.2 +PKGNAME= libxml-2.3.2 CATEGORIES= textproc NEED_VERSION= 1.341 MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/textproc/libxml/files/md5 b/textproc/libxml/files/md5 index b8abb7e525d..78ba0bf0cd0 100644 --- a/textproc/libxml/files/md5 +++ b/textproc/libxml/files/md5 @@ -1,3 +1,3 @@ -MD5 (libxml2-2.2.11.tar.gz) = df3fce3245cd2a5c32ff243d6f6a3609 -RMD160 (libxml2-2.2.11.tar.gz) = 4673e0693427e8457259855f6c229161699d0736 -SHA1 (libxml2-2.2.11.tar.gz) = 051be3f7e949f3fb2950cb49087dc519d76f610d +MD5 (libxml2-2.3.2.tar.gz) = 76a9e015c3be783d163997eb6020d9a5 +RMD160 (libxml2-2.3.2.tar.gz) = feed0c99aae26e6f47dc0ad15ca75b0771562c65 +SHA1 (libxml2-2.3.2.tar.gz) = ebe0fd6abfbd2dcf55167e834c2e4275ba2133b5 diff --git a/textproc/libxml/patches/patch-Makefile.in b/textproc/libxml/patches/patch-Makefile.in index 0089e176094..c170d830f5c 100644 --- a/textproc/libxml/patches/patch-Makefile.in +++ b/textproc/libxml/patches/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jan 5 02:13:43 2001 -+++ Makefile.in Tue Jan 9 09:17:34 2001 +--- Makefile.in.orig Sat Mar 3 23:47:19 2001 ++++ Makefile.in Sat Mar 3 23:48:39 2001 @@ -205,7 +205,7 @@ MANS = $(man_MANS) @@ -9,16 +9,16 @@ DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \ INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \ -@@ -823,7 +823,7 @@ +@@ -829,7 +829,7 @@ install-binSCRIPTS install-confexecDATA install-exec: install-exec-recursive -install-data-am: install-man install-m4dataDATA install-pkgconfigDATA -+install-data-am: install-man install-m4dataDATA ++install-data-am: install-man install-m4dataDATA install-data: install-data-recursive install-am: all-am -@@ -843,8 +843,7 @@ +@@ -849,8 +849,7 @@ installdirs-am: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \ diff --git a/textproc/libxml/patches/patch-doc_Makefile_in b/textproc/libxml/patches/patch-doc_Makefile_in new file mode 100644 index 00000000000..23916c9135e --- /dev/null +++ b/textproc/libxml/patches/patch-doc_Makefile_in @@ -0,0 +1,28 @@ +--- doc/Makefile.in.orig Sat Feb 24 19:00:48 2001 ++++ doc/Makefile.in Sun Mar 4 21:57:02 2001 +@@ -112,7 +112,7 @@ + Z_CFLAGS = @Z_CFLAGS@ + Z_LIBS = @Z_LIBS@ + +-DOC_MODULE = libxml2-$(VERSION) ++DOC_MODULE = libxml2 + + # The top-level SGML file. + DOC_MAIN_SGML_FILE = gnome-xml.sgml +@@ -120,7 +120,7 @@ + # The directory containing the source code (if it contains documentation). + DOC_SOURCE_DIR = .. + +-HTML_DIR = $(prefix)/doc ++HTML_DIR = $(datadir) + + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -261,7 +261,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)/html/*.html $(DESTDIR)$(TARGET_DIR) + -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) +- -(cd $(DESTDIR); gtkdoc-fixxref --module=libxml --html-dir=$(HTML_DIR)) + + dist-hook: + (cd $(srcdir) ; tar cvf - *.html *.gif html/*.html html/*.sgml) | (cd $(distdir); tar xf -) diff --git a/textproc/libxml/pkg/PFRAG.shared b/textproc/libxml/pkg/PFRAG.shared index a5b4f450417..7433157a6d9 100644 --- a/textproc/libxml/pkg/PFRAG.shared +++ b/textproc/libxml/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2001/01/09 14:49:32 brad Exp $ -lib/libxml.so.4.11 +@comment $OpenBSD: PFRAG.shared,v 1.6 2001/03/04 14:41:32 kevlo Exp $ +lib/libxml2.so.5.2 DYNLIBDIR(%B) diff --git a/textproc/libxml/pkg/PLIST b/textproc/libxml/pkg/PLIST index f030a07ac49..4f258b17e29 100644 --- a/textproc/libxml/pkg/PLIST +++ b/textproc/libxml/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.5 2000/12/10 14:40:15 kevlo Exp $ -bin/xml-config +@comment $OpenBSD: PLIST,v 1.6 2001/03/04 14:41:32 kevlo Exp $ +bin/xml2-config bin/xmllint include/libxml/HTMLparser.h include/libxml/HTMLtree.h @@ -8,6 +8,7 @@ include/libxml/debugXML.h include/libxml/encoding.h include/libxml/entities.h include/libxml/hash.h +include/libxml/list.h include/libxml/nanoftp.h include/libxml/nanohttp.h include/libxml/parser.h @@ -24,45 +25,42 @@ include/libxml/xmlversion.h include/libxml/xpath.h include/libxml/xpathInternals.h include/libxml/xpointer.h -lib/libxml.a -lib/libxml.la +lib/libxml2.a +lib/libxml2.la %%SHARED%% -lib/xmlConf.sh -man/man1/xml-config.1 +lib/xml2Conf.sh +man/man1/xml2-config.1 man/man1/xmllint.1 man/man4/libxml.4 share/aclocal/libxml.m4 -share/gnome-xml/html/gnome-xml/DOM.gif -share/gnome-xml/html/gnome-xml/FAQ.html -share/gnome-xml/html/gnome-xml/book1.html -share/gnome-xml/html/gnome-xml/encoding.html -share/gnome-xml/html/gnome-xml/gnome-xml-debugxml.html -share/gnome-xml/html/gnome-xml/gnome-xml-encoding.html -share/gnome-xml/html/gnome-xml/gnome-xml-entities.html -share/gnome-xml/html/gnome-xml/gnome-xml-error.html -share/gnome-xml/html/gnome-xml/gnome-xml-htmlparser.html -share/gnome-xml/html/gnome-xml/gnome-xml-htmltree.html -share/gnome-xml/html/gnome-xml/gnome-xml-nanoftp.html -share/gnome-xml/html/gnome-xml/gnome-xml-nanohttp.html -share/gnome-xml/html/gnome-xml/gnome-xml-parser.html -share/gnome-xml/html/gnome-xml/gnome-xml-parserinternals.html -share/gnome-xml/html/gnome-xml/gnome-xml-sax.html -share/gnome-xml/html/gnome-xml/gnome-xml-tree.html -share/gnome-xml/html/gnome-xml/gnome-xml-uri.html -share/gnome-xml/html/gnome-xml/gnome-xml-valid.html -share/gnome-xml/html/gnome-xml/gnome-xml-xinclude.html -share/gnome-xml/html/gnome-xml/gnome-xml-xml-error.html -share/gnome-xml/html/gnome-xml/gnome-xml-xmlio.html -share/gnome-xml/html/gnome-xml/gnome-xml-xmlmemory.html -share/gnome-xml/html/gnome-xml/gnome-xml-xpath.html -share/gnome-xml/html/gnome-xml/gnome-xml-xpathinternals.html -share/gnome-xml/html/gnome-xml/gnome-xml-xpointer.html -share/gnome-xml/html/gnome-xml/index.sgml -share/gnome-xml/html/gnome-xml/libxml-lib.html -share/gnome-xml/html/gnome-xml/libxml-notes.html -share/gnome-xml/html/gnome-xml/structure.gif -share/gnome-xml/html/gnome-xml/xml.html -@dirrm share/gnome-xml/html/gnome-xml -@dirrm share/gnome-xml/html -@dirrm share/gnome-xml +share/libxml2/html/DOM.gif +share/libxml2/html/FAQ.html +share/libxml2/html/book1.html +share/libxml2/html/encoding.html +share/libxml2/html/index.sgml +share/libxml2/html/libxml-debugxml.html +share/libxml2/html/libxml-encoding.html +share/libxml2/html/libxml-entities.html +share/libxml2/html/libxml-htmlparser.html +share/libxml2/html/libxml-htmltree.html +share/libxml2/html/libxml-lib.html +share/libxml2/html/libxml-nanoftp.html +share/libxml2/html/libxml-nanohttp.html +share/libxml2/html/libxml-notes.html +share/libxml2/html/libxml-parser.html +share/libxml2/html/libxml-parserinternals.html +share/libxml2/html/libxml-sax.html +share/libxml2/html/libxml-tree.html +share/libxml2/html/libxml-uri.html +share/libxml2/html/libxml-valid.html +share/libxml2/html/libxml-xinclude.html +share/libxml2/html/libxml-xmlio.html +share/libxml2/html/libxml-xmlmemory.html +share/libxml2/html/libxml-xpath.html +share/libxml2/html/libxml-xpathinternals.html +share/libxml2/html/libxml-xpointer.html +share/libxml2/html/structure.gif +share/libxml2/html/xml.html +@dirrm share/libxml2/html +@dirrm share/libxml2 @dirrm include/libxml