Date: Tue, 26 Feb 2002 21:47:48 +0300 (MSK) From: "Lev A. Serebryakov" <lev@serebryakov.spb.ru> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35349: [PATCH] Update for port textproc/libxml2 to version 2.4.16 (latest vendor's version). This PR OBSOLETES port/35002 ones! Message-ID: <200202261847.g1QIlm819687@ftp.translate.ru>
next in thread | raw e-mail | index | archive | help
>Number: 35349 >Category: ports >Synopsis: [PATCH] Update for port textproc/libxml2 to version 2.4.16 (latest vendor's version). This PR OBSOLETES port/35002 ones! >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 26 10:50:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Lev A. Serebryakov <lev@serebryakov.spb.ru> >Release: FreeBSD 4.4-STABLE i386 >Organization: >Environment: System: FreeBSD freebsd.sereb.net 4.4-STABLE FreeBSD 4.4-STABLE #1: Sat Dec 8 13:48:40 MSK 2001 root@freebsd.sereb.net:/usr/obj/usr/src/sys/LEVMAIL i386 Ports collection: 26 Feb 2002 >Description: This PR OBSOLETES port/35002 ones! It is latest version. This version includes experemental python support. I add knob to makefile `WITH_PYTHON', and turn off python support by default. ADDED FILES: files/patch-python::Makefile.in files/patch-python::tests::Makefile.in >How-To-Repeat: >Fix: diff -ruN libxml2.orig/Makefile libxml2/Makefile --- libxml2.orig/Makefile Tue Feb 26 20:11:56 2002 +++ libxml2/Makefile Tue Feb 26 20:12:13 2002 @@ -6,7 +6,7 @@ # PORTNAME= libxml2 -PORTVERSION= 2.4.13 +PORTVERSION= 2.4.16 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/libxml @@ -25,14 +25,32 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +.if defined(WITH_PYTHON) +USE_PYTHON= yes +PLIST_SUB+= PYTHON="" +.else +PLIST_SUB+= PYTHON="@comment " +CONFIGURE_ARGS+= --without-python +.endif + MAN1= xml2-config.1 xmllint.1 xmlcatalog.1 MAN4= libxml.4 +pre-everything: +.if !defined(WITH_PYTHON) + @${ECHO} "" + @${ECHO} "If you wnat python support, add WITH_PYTHON=yes to command line" + @${ECHO} "" +.endif + pre-patch: @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' @cd ${WRKSRC} && ${PERL} -pi -e \ 's|([^g])iconv.h|\1giconv.h|g ; s|-liconv|-lgiconv|g' \ configure include/libxml/encoding.h +.if !defined(WITH_PYTHON) + @cd ${WRKSRC} && ${PERL} -pi -e 's|SUBDIRS =(.+) python|SUBDIRS =\1|g' Makefile.in +.endif .include <bsd.port.mk> diff -ruN libxml2.orig/distinfo libxml2/distinfo --- libxml2.orig/distinfo Tue Feb 26 20:11:56 2002 +++ libxml2/distinfo Tue Feb 26 20:21:17 2002 @@ -1 +1 @@ -MD5 (libxml2-2.4.13.tar.gz) = df94fd00943a2bc8024517fb4db33553 +MD5 (libxml2-2.4.16.tar.gz) = 1144a6742405481509c2b70cf1c98db3 diff -ruN libxml2.orig/files/patch-aa libxml2/files/patch-aa --- libxml2.orig/files/patch-aa Tue Feb 26 20:11:56 2002 +++ libxml2/files/patch-aa Tue Feb 26 20:12:06 2002 @@ -1,24 +1,33 @@ ---- work/libxml2-2.4.5/Makefile.in.orig Tue Sep 18 20:11:32 2001 -+++ Makefile.in Tue Sep 18 20:11:32 2001 -@@ -137,7 +137,7 @@ +--- Makefile.in.orig Mon Feb 11 21:43:47 2002 ++++ Makefile.in Sat Feb 16 21:50:01 2002 +@@ -143,7 +143,7 @@ lib_LTLIBRARIES = libxml2.la libxml2_la_LIBADD = @Z_LIBS@ $(ICONV_LIBS) -lm -libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@ +libxml2_la_LDFLAGS = -version-info 5:0:0 - @WITH_TRIO_SOURCES_TRUE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c catalog.c strio.c trio.c - @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c catalog.c -@@ -185,7 +185,7 @@ - testURI_DEPENDENCIES = $(DEPS) - testURI_LDADD = $(LDADDS) + @WITH_TRIO_SOURCES_TRUE@libxml2_la_SOURCES = @WITH_TRIO_SOURCES_TRUE@SAX.c entities.c encoding.c error.c parserInternals.c \ + @WITH_TRIO_SOURCES_TRUE@ parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \ +@@ -206,7 +206,7 @@ + + CLEANFILES = xml2Conf.sh -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = xml2Conf.sh - - CLEANFILES = xml2Conf.sh -@@ -770,7 +770,7 @@ + EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml.spec \ + libxml.m4 Copyright \ +@@ -224,7 +224,7 @@ + # Instll the tests program sources as examples + # + BASE_DIR = @HTML_DIR@ +-DOC_MODULE = libxml2-$(VERSION) ++DOC_MODULE = libxml2 + EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -809,7 +809,7 @@ uninstall-confexecDATA uninstall-m4dataDATA \ uninstall-pkgconfigDATA uninstall: uninstall-recursive diff -ruN libxml2.orig/files/patch-python::Makefile.in libxml2/files/patch-python::Makefile.in --- libxml2.orig/files/patch-python::Makefile.in Thu Jan 1 03:00:00 1970 +++ libxml2/files/patch-python::Makefile.in Tue Feb 26 20:33:34 2002 @@ -0,0 +1,12 @@ +--- python/Makefile.in.orig Sat Feb 16 02:47:46 2002 ++++ python/Makefile.in Sat Feb 16 02:48:50 2002 +@@ -139,7 +139,7 @@ + -I$(top_srcdir)/include + + +-DOCS_DIR = $(prefix)/share/doc/libxml2-python-$(LIBXML_VERSION) ++DOCS_DIR = $(prefix)/share/doc/libxml2/python + DOCS = TODO libxml2class.txt + + EXTRA_DIST = \ + diff -ruN libxml2.orig/files/patch-python::tests::Makefile.in libxml2/files/patch-python::tests::Makefile.in --- libxml2.orig/files/patch-python::tests::Makefile.in Thu Jan 1 03:00:00 1970 +++ libxml2/files/patch-python::tests::Makefile.in Tue Feb 26 20:34:01 2002 @@ -0,0 +1,12 @@ +--- python/tests/Makefile.in.orig Sat Feb 16 02:47:46 2002 ++++ python/tests/Makefile.in Sat Feb 16 02:49:28 2002 +@@ -128,7 +128,7 @@ + Z_CFLAGS = @Z_CFLAGS@ + Z_LIBS = @Z_LIBS@ + +-EXAMPLE_DIR = $(prefix)/share/doc/libxml2-python-$(LIBXML_VERSION)/examples ++EXAMPLE_DIR = $(prefix)/share/doc/libxml2/python/examples + + PYTESTS = \ + build.py \ + diff -ruN libxml2.orig/pkg-plist libxml2/pkg-plist --- libxml2.orig/pkg-plist Tue Feb 26 20:11:56 2002 +++ libxml2/pkg-plist Tue Feb 26 20:12:06 2002 @@ -36,6 +36,11 @@ lib/libxml2.so.5 libdata/pkgconfig/libxml-2.0.pc share/aclocal/libxml.m4 +share/doc/libxml2/Copyright +share/doc/libxml2/examples/testHTML.c +share/doc/libxml2/examples/testSAX.c +share/doc/libxml2/examples/testXPath.c +share/doc/libxml2/examples/xmllint.c share/doc/libxml2/html/DOM.gif share/doc/libxml2/html/FAQ.html share/doc/libxml2/html/book1.html @@ -70,6 +75,25 @@ share/doc/libxml2/html/libxml-xpointer.html share/doc/libxml2/html/structure.gif share/doc/libxml2/html/xml.html +%%PYTHON%%lib/python2.2/site-packages/libxml2.py +%%PYTHON%%lib/python2.2/site-packages/libxml2mod.so +%%PYTHON%%share/doc/libxml2/python/TODO +%%PYTHON%%share/doc/libxml2/python/libxml2class.txt +%%PYTHON%%share/doc/libxml2/python/examples/build.py +%%PYTHON%%share/doc/libxml2/python/examples/error.py +%%PYTHON%%share/doc/libxml2/python/examples/invalid.xml +%%PYTHON%%share/doc/libxml2/python/examples/push.py +%%PYTHON%%share/doc/libxml2/python/examples/pushSAX.py +%%PYTHON%%share/doc/libxml2/python/examples/tst.py +%%PYTHON%%share/doc/libxml2/python/examples/tst.xml +%%PYTHON%%share/doc/libxml2/python/examples/tstxpath.py +%%PYTHON%%share/doc/libxml2/python/examples/valid.xml +%%PYTHON%%share/doc/libxml2/python/examples/validate.py +%%PYTHON%%share/doc/libxml2/python/examples/xpath.py +%%PYTHON%%share/doc/libxml2/python/examples/xpathext.py +%%PYTHON%%@dirrm share/doc/libxml2/python/examples +%%PYTHON%%@dirrm share/doc/libxml2/python +@dirrm share/doc/libxml2/examples @dirrm share/doc/libxml2/html @dirrm share/doc/libxml2 @dirrm include/libxml2/libxml >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202261847.g1QIlm819687>