Index: branches/2014Q4/textproc/libxml2/Makefile =================================================================== --- branches/2014Q4/textproc/libxml2/Makefile (revision 371274) +++ branches/2014Q4/textproc/libxml2/Makefile (revision 371275) @@ -1,68 +1,68 @@ # Created by: Yukihiro Nakai # $FreeBSD$ # $MCom: ports/trunk/textproc/libxml2/Makefile 19578 2014-04-25 21:50:30Z kwm $ PORTNAME= libxml2 -PORTVERSION= 2.9.1 -PORTREVISION?= 1 +PORTVERSION= 2.9.2 +PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ ftp://gd.tuwien.ac.at/pub/libxml/ DIST_SUBDIR= gnome2 MAINTAINER?= gnome@FreeBSD.org COMMENT?= XML parser library for GNOME .if !defined(REFERENCE_PORT) GNU_CONFIGURE= yes -USES= gmake iconv libtool:keepla pathfix pkgconfig shebangfix +USES+= gmake iconv libtool pathfix pkgconfig shebangfix USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-lzma=/usr \ --without-python INSTALL_TARGET= install-strip SHEBANG_FILES= *.py */*.py */*/*.py PLIST_SUB+= LIBVERSION=${PORTVERSION} .if !defined(MASTERDIR) OPTIONS_DEFINE= SCHEMA THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC OPTIONS_DEFAULT=SCHEMA THREADS SCHEMA_DESC= XML schema support SCHEMA_CONFIGURE_WITH= schemas THREADS_DESC= Threads support THREADS_CONFIGURE_WITH= threads MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!) MEM_DEBUG_CONFIGURE_WITH= mem-debug XMLLINT_HIST_DESC= History for xmllint XMLLINT_HIST_CONFIGURE_WITH= history THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!) THREAD_ALLOC_CONFIGURE_WITH= thread-alloc .endif # !defined(MASTERDIR) post-patch: .for d in . doc doc/devhelp doc/examples @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \ ${WRKSRC}/${d}/Makefile.in .endfor .for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1 @${REINPLACE_CMD} -e \ 's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \ s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \ ${WRKSRC}/${f} .endfor .if !defined(MASTERDIR) post-install: @${RM} -rf ${STAGEDIR}${PREFIX}/share/gtk-doc .endif .include .endif Index: branches/2014Q4/textproc/libxml2/distinfo =================================================================== --- branches/2014Q4/textproc/libxml2/distinfo (revision 371274) +++ branches/2014Q4/textproc/libxml2/distinfo (revision 371275) @@ -1,2 +1,2 @@ -SHA256 (gnome2/libxml2-2.9.1.tar.gz) = fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb -SIZE (gnome2/libxml2-2.9.1.tar.gz) = 5172503 +SHA256 (gnome2/libxml2-2.9.2.tar.gz) = 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc +SIZE (gnome2/libxml2-2.9.2.tar.gz) = 5444991 Index: branches/2014Q4/textproc/libxml2/files/patch-python_drv-libxml2.py =================================================================== --- branches/2014Q4/textproc/libxml2/files/patch-python_drv-libxml2.py (revision 371274) +++ branches/2014Q4/textproc/libxml2/files/patch-python_drv-libxml2.py (nonexistent) @@ -1,46 +0,0 @@ -From 6c9c611beed57f001ca3ae6b964518d9c7336a69 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 11 Jul 2013 03:00:54 +0000 -Subject: python: fix drv_libxml2.py for python3 compatibility - -https://bugzilla.gnome.org/show_bug.cgi?id=703979 ---- -diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py -index e43fb1d..c9075e6 100644 ---- python/drv_libxml2.py -+++ python/drv_libxml2.py -@@ -34,12 +34,20 @@ TODO - - """ - --__author__ = u"Stéphane Bidoul " -+__author__ = "Stéphane Bidoul " - __version__ = "0.3" - -+import sys - import codecs --from types import StringType, UnicodeType --StringTypes = (StringType,UnicodeType) -+ -+if sys.version < "3": -+ __author__ = codecs.unicode_escape_decode(__author__)[0] -+ -+ from types import StringType, UnicodeType -+ StringTypes = (StringType,UnicodeType) -+ -+else: -+ StringTypes = (str) - - from xml.sax._exceptions import * - from xml.sax import xmlreader, saxutils -@@ -65,7 +73,7 @@ def _d(s): - - try: - import libxml2 --except ImportError, e: -+except ImportError as e: - raise SAXReaderNotAvailable("libxml2 not available: " \ - "import error was: %s" % e) - --- -cgit v0.9.2 Property changes on: branches/2014Q4/textproc/libxml2/files/patch-python_drv-libxml2.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: mcom:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/textproc/libxml2/files/patch-python_setup.py.in =================================================================== --- branches/2014Q4/textproc/libxml2/files/patch-python_setup.py.in (revision 371274) +++ branches/2014Q4/textproc/libxml2/files/patch-python_setup.py.in (nonexistent) @@ -1,142 +0,0 @@ ---- python/setup.py.in.orig 2014-03-24 21:27:16.000000000 +0100 -+++ python/setup.py.in 2014-03-24 21:31:10.000000000 +0100 -@@ -67,7 +67,7 @@ - for dir in includes_dir: - if not missing(dir + "/libxml2/libxml/tree.h"): - xml_includes=dir + "/libxml2" -- break; -+ break; - - if xml_includes == "": - print("failed to find headers for libxml2: update includes_dir") -@@ -77,7 +77,7 @@ - for dir in includes_dir: - if not missing(dir + "/iconv.h"): - iconv_includes=dir -- break; -+ break; - - if iconv_includes == "": - print("failed to find headers for libiconv: update includes_dir") -@@ -90,22 +90,22 @@ - - xml_files = ["libxml2-api.xml", "libxml2-python-api.xml", - "libxml.c", "libxml.py", "libxml_wrap.h", "types.c", -- "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"] -+ "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"] - - xslt_files = ["libxslt-api.xml", "libxslt-python-api.xml", - "libxslt.c", "libxsl.py", "libxslt_wrap.h", -- "xsltgenerator.py"] -+ "xsltgenerator.py"] - - if missing("libxml2-py.c") or missing("libxml2.py"): - try: -- try: -- import xmlgenerator -- except: -- import generator -+ try: -+ import xmlgenerator -+ except: -+ import generator - except: -- print("failed to find and generate stubs for libxml2, aborting ...") -- print(sys.exc_info()[0], sys.exc_info()[1]) -- sys.exit(1) -+ print("failed to find and generate stubs for libxml2, aborting ...") -+ print(sys.exc_info()[0], sys.exc_info()[1]) -+ sys.exit(1) - - head = open("libxml.py", "r") - generated = open("libxml2class.py", "r") -@@ -116,7 +116,7 @@ - else: - result.write(line) - for line in generated.readlines(): -- result.write(line) -+ result.write(line) - head.close() - generated.close() - result.close() -@@ -126,39 +126,39 @@ - if missing("xsltgenerator.py") or missing("libxslt-api.xml"): - print("libxslt stub generator not found, libxslt not built") - else: -- try: -- import xsltgenerator -- except: -- print("failed to generate stubs for libxslt, aborting ...") -- print(sys.exc_info()[0], sys.exc_info()[1]) -- else: -- head = open("libxsl.py", "r") -- generated = open("libxsltclass.py", "r") -- result = open("libxslt.py", "w") -- for line in head.readlines(): -+ try: -+ import xsltgenerator -+ except: -+ print("failed to generate stubs for libxslt, aborting ...") -+ print(sys.exc_info()[0], sys.exc_info()[1]) -+ else: -+ head = open("libxsl.py", "r") -+ generated = open("libxsltclass.py", "r") -+ result = open("libxslt.py", "w") -+ for line in head.readlines(): - if WITHDLLS: - result.write(altImport(line)) - else: - result.write(line) -- for line in generated.readlines(): -- result.write(line) -- head.close() -- generated.close() -- result.close() -- with_xslt=1 -+ for line in generated.readlines(): -+ result.write(line) -+ head.close() -+ generated.close() -+ result.close() -+ with_xslt=1 - else: - with_xslt=1 - - if with_xslt == 1: - xslt_includes="" - for dir in includes_dir: -- if not missing(dir + "/libxslt/xsltconfig.h"): -- xslt_includes=dir + "/libxslt" -- break; -+ if not missing(dir + "/libxslt/xsltconfig.h"): -+ xslt_includes=dir + "/libxslt" -+ break; - - if xslt_includes == "": -- print("failed to find headers for libxslt: update includes_dir") -- with_xslt = 0 -+ print("failed to find headers for libxslt: update includes_dir") -+ with_xslt = 0 - - - descr = "libxml2 package" -@@ -198,7 +198,7 @@ - libraries=libs, define_macros=macros)] - if with_xslt == 1: - extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes, -- library_dirs=libdirs, -+ library_dirs=libdirs, - libraries=libs, define_macros=macros)) - - if missing("MANIFEST"): -@@ -208,8 +208,8 @@ - for file in xml_files: - manifest.write(file + "\n") - if with_xslt == 1: -- for file in xslt_files: -- manifest.write(file + "\n") -+ for file in xslt_files: -+ manifest.write(file + "\n") - manifest.close() - - if WITHDLLS: Property changes on: branches/2014Q4/textproc/libxml2/files/patch-python_setup.py.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: mcom:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/textproc/libxml2/files/patch-Makefile.in =================================================================== --- branches/2014Q4/textproc/libxml2/files/patch-Makefile.in (revision 371274) +++ branches/2014Q4/textproc/libxml2/files/patch-Makefile.in (revision 371275) @@ -1,29 +1,29 @@ ---- Makefile.in.orig 2013-11-24 09:26:25.000000000 +0100 -+++ Makefile.in 2013-11-24 09:26:37.000000000 +0100 -@@ -1130,7 +1130,7 @@ +--- Makefile.in.orig 2014-10-17 20:26:52.547793054 +0200 ++++ Makefile.in 2014-10-17 20:27:34.868791352 +0200 +@@ -1234,7 +1234,7 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@@ -1635,7 +1635,7 @@ +@@ -1712,7 +1712,7 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ config.h install-binPROGRAMS: install-libLTLIBRARIES -@@ -1703,7 +1703,7 @@ +@@ -1780,7 +1780,7 @@ info-am: --install-data-am: install-data-local install-m4dataDATA install-man \ -+install-data-am: install-m4dataDATA install-man \ - install-pkgconfigDATA +-install-data-am: install-cmakeDATA install-data-local \ ++install-data-am: install-cmakeDATA \ + install-m4dataDATA install-man install-pkgconfigDATA install-dvi: install-dvi-recursive Index: branches/2014Q4/textproc/libxml2/pkg-plist =================================================================== --- branches/2014Q4/textproc/libxml2/pkg-plist (revision 371274) +++ branches/2014Q4/textproc/libxml2/pkg-plist (revision 371275) @@ -1,64 +1,62 @@ bin/xml2-config bin/xmlcatalog bin/xmllint include/libxml2/libxml/DOCBparser.h include/libxml2/libxml/HTMLparser.h include/libxml2/libxml/HTMLtree.h include/libxml2/libxml/SAX.h include/libxml2/libxml/SAX2.h include/libxml2/libxml/c14n.h include/libxml2/libxml/catalog.h include/libxml2/libxml/chvalid.h include/libxml2/libxml/debugXML.h include/libxml2/libxml/dict.h include/libxml2/libxml/encoding.h include/libxml2/libxml/entities.h include/libxml2/libxml/globals.h include/libxml2/libxml/hash.h include/libxml2/libxml/list.h include/libxml2/libxml/nanoftp.h include/libxml2/libxml/nanohttp.h include/libxml2/libxml/parser.h include/libxml2/libxml/parserInternals.h include/libxml2/libxml/pattern.h include/libxml2/libxml/relaxng.h include/libxml2/libxml/schemasInternals.h include/libxml2/libxml/schematron.h include/libxml2/libxml/threads.h include/libxml2/libxml/tree.h include/libxml2/libxml/uri.h include/libxml2/libxml/valid.h include/libxml2/libxml/xinclude.h include/libxml2/libxml/xlink.h include/libxml2/libxml/xmlIO.h include/libxml2/libxml/xmlautomata.h include/libxml2/libxml/xmlerror.h include/libxml2/libxml/xmlexports.h include/libxml2/libxml/xmlmemory.h include/libxml2/libxml/xmlmodule.h include/libxml2/libxml/xmlreader.h include/libxml2/libxml/xmlregexp.h include/libxml2/libxml/xmlsave.h include/libxml2/libxml/xmlschemas.h include/libxml2/libxml/xmlschemastypes.h include/libxml2/libxml/xmlstring.h include/libxml2/libxml/xmlunicode.h include/libxml2/libxml/xmlversion.h include/libxml2/libxml/xmlwriter.h include/libxml2/libxml/xpath.h include/libxml2/libxml/xpathInternals.h include/libxml2/libxml/xpointer.h +lib/cmake/libxml2/libxml2-config.cmake lib/libxml2.a -lib/libxml2.la lib/libxml2.so lib/libxml2.so.2 lib/libxml2.so.%%LIBVERSION%% lib/xml2Conf.sh libdata/pkgconfig/libxml-2.0.pc share/aclocal/libxml.m4 man/man1/xml2-config.1.gz man/man1/xmlcatalog.1.gz man/man1/xmllint.1.gz man/man3/libxml.3.gz -@dirrm include/libxml2/libxml -@dirrm include/libxml2 Index: branches/2014Q4/textproc/py-libxml2/Makefile =================================================================== --- branches/2014Q4/textproc/py-libxml2/Makefile (revision 371274) +++ branches/2014Q4/textproc/py-libxml2/Makefile (revision 371275) @@ -1,36 +1,36 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ # $MCom: ports/trunk/textproc/py-libxml2/Makefile 18999 2014-02-04 18:55:27Z kwm $ PORTREVISION= 0 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface for XML parser library for GNOME MASTERDIR= ${.CURDIR}/../libxml2 BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 -USE_PYTHON= 2 +USES+= python:2 USE_PYDISTUTILS=yes PYDISTUTILS_EGGINFO= libxml2_python-${PORTVERSION}-py${PYTHON_VER}.egg-info CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs` CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-python=${PYTHON_CMD} DOCSDIR= ${PREFIX}/share/doc/py-libxml2 EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2 post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so .include "${MASTERDIR}/Makefile" Index: branches/2014Q4/textproc/py3-libxml2/Makefile =================================================================== --- branches/2014Q4/textproc/py3-libxml2/Makefile (revision 371274) +++ branches/2014Q4/textproc/py3-libxml2/Makefile (revision 371275) @@ -1,37 +1,38 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ # $MCom: ports/trunk/textproc/py3-libxml2/Makefile 19293 2014-03-24 20:46:10Z kwm $ PORTREVISION= 0 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface for XML parser library for GNOME MASTERDIR= ${.CURDIR}/../libxml2 BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 -USE_PYTHON= 3 +USES= python:3 USE_PYDISTUTILS=yes +#USE_PYTHON= distutils:3 PYDISTUTILS_EGGINFO= libxml2_python-${PORTVERSION}-py${PYTHON_VER}.egg-info PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//} CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs` CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-python=${PYTHON_CMD} DOCSDIR= ${PREFIX}/share/doc/py-libxml2 EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2 post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so .include "${MASTERDIR}/Makefile" Index: branches/2014Q4 =================================================================== --- branches/2014Q4 (revision 371274) +++ branches/2014Q4 (revision 371275) Property changes on: branches/2014Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r371120