Index: head/textproc/libxml2/Makefile =================================================================== --- head/textproc/libxml2/Makefile (revision 518267) +++ head/textproc/libxml2/Makefile (revision 518268) @@ -1,81 +1,81 @@ # Created by: Yukihiro Nakai # $FreeBSD$ PORTNAME= libxml2 -PORTVERSION= 2.9.9 +DISTVERSION= 2.9.10 PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= http://xmlsoft.org/sources/ DIST_SUBDIR= gnome2 MAINTAINER?= desktop@FreeBSD.org COMMENT?= XML parser library for GNOME .if !defined(REFERENCE_PORT) LICENSE= MIT TRIO LICENSE_COMB= multi LICENSE_NAME_TRIO= Trio License LICENSE_FILE_MIT= ${WRKSRC}/COPYING LICENSE_FILE_TRIO= ${FILESDIR}/LICENSE.TRIO LICENSE_PERMS_TRIO= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes USES+= compiler cpe gmake iconv libtool pathfix pkgconfig shebangfix CPE_VENDOR= xmlsoft USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --without-icu \ --with-lzma=/usr \ --without-python INSTALL_TARGET= install-strip SHEBANG_FILES= *.py */*.py */*/*.py PLIST_SUB+= LIBVERSION=${PORTVERSION} .if !defined(MASTERDIR) OPTIONS_DEFINE= SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC OPTIONS_DEFAULT=SCHEMA VALID THREADS SCHEMA_DESC= XML schema support SCHEMA_CONFIGURE_WITH= schemas VALID_DESC= Validation support VALID_CONFIGURE_OFF= --without-valid 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) .if !defined(MASTERDIR) post-install: @${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc .endif .include 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 ${CHOSEN_COMPILER_TYPE} == gcc @${REINPLACE_CMD} -e 's/ -Wno-array-bounds//' ${WRKSRC}/configure .endif .include .endif Index: head/textproc/libxml2/distinfo =================================================================== --- head/textproc/libxml2/distinfo (revision 518267) +++ head/textproc/libxml2/distinfo (revision 518268) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559577911 -SHA256 (gnome2/libxml2-2.9.9.tar.gz) = 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 -SIZE (gnome2/libxml2-2.9.9.tar.gz) = 5476717 +TIMESTAMP = 1573915139 +SHA256 (gnome2/libxml2-2.9.10.tar.gz) = aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f +SIZE (gnome2/libxml2-2.9.10.tar.gz) = 5624761 Index: head/textproc/libxml2/files/patch-Makefile.in =================================================================== --- head/textproc/libxml2/files/patch-Makefile.in (revision 518267) +++ head/textproc/libxml2/files/patch-Makefile.in (revision 518268) @@ -1,29 +1,29 @@ ---- Makefile.in.orig 2017-09-20 18:23:56 UTC +--- Makefile.in.orig 2019-11-16 14:42:34 UTC +++ Makefile.in -@@ -1245,7 +1245,7 @@ distclean-compile: +@@ -1284,7 +1284,7 @@ am--depfiles: $(am__depfiles_remade) @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(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@ -@@ -1730,7 +1730,7 @@ distcleancheck: distclean - check-am: all-am +@@ -1773,7 +1773,7 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ +-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ config.h install-binPROGRAMS: install-libLTLIBRARIES -@@ -1798,7 +1798,7 @@ info: info-recursive +@@ -1910,7 +1910,7 @@ info: info-recursive info-am: -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: head/textproc/libxml2/files/patch-configure =================================================================== --- head/textproc/libxml2/files/patch-configure (revision 518267) +++ head/textproc/libxml2/files/patch-configure (revision 518268) @@ -1,11 +1,11 @@ ---- configure.orig 2016-05-23 08:00:35 UTC +--- configure.orig 2019-10-30 19:14:22 UTC +++ configure -@@ -15639,6 +15639,8 @@ fi +@@ -15525,6 +15525,8 @@ fi fi fi ;; + *freebsd*) THREAD_LIBS="" + ;; esac if test "$WITH_THREADS" = "1" ; then THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT" Index: head/textproc/libxml2/files/patch-python_Makefile.in =================================================================== --- head/textproc/libxml2/files/patch-python_Makefile.in (revision 518267) +++ head/textproc/libxml2/files/patch-python_Makefile.in (revision 518268) @@ -1,20 +1,20 @@ ---- python/Makefile.in.orig 2017-09-20 18:23:56 UTC +--- python/Makefile.in.orig 2019-11-16 14:42:34 UTC +++ python/Makefile.in -@@ -489,7 +489,7 @@ top_srcdir = @top_srcdir@ +@@ -493,7 +493,7 @@ top_srcdir = @top_srcdir@ # Makefile for libxml2 python library AUTOMAKE_OPTIONS = 1.4 foreign -SUBDIRS = . tests +SUBDIRS = . docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION) dist_docs_DATA = TODO EXTRA_DIST = \ -@@ -509,7 +509,7 @@ EXTRA_DIST = \ +@@ -513,7 +513,7 @@ EXTRA_DIST = \ @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \ -@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) +@WITH_PYTHON_TRUE@ -lxml2 $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) @WITH_PYTHON_TRUE@BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c @WITH_PYTHON_TRUE@dist_python_DATA = \ Index: head/textproc/libxml2/files/patch-python_tests_Makefile.in =================================================================== --- head/textproc/libxml2/files/patch-python_tests_Makefile.in (revision 518267) +++ head/textproc/libxml2/files/patch-python_tests_Makefile.in (revision 518268) @@ -1,11 +1,11 @@ ---- python/tests/Makefile.in.orig 2017-09-20 18:23:56 UTC +--- python/tests/Makefile.in.orig 2019-11-16 14:42:34 UTC +++ python/tests/Makefile.in -@@ -385,7 +385,7 @@ target_alias = @target_alias@ +@@ -387,7 +387,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples +exampledir = $(datadir)/examples/py-libxml2 dist_example_DATA = $(PYTESTS) $(XMLS) PYTESTS = \ build.py \ Index: head/textproc/libxml2/files/patch-uri.c =================================================================== --- head/textproc/libxml2/files/patch-uri.c (revision 518267) +++ head/textproc/libxml2/files/patch-uri.c (revision 518268) @@ -1,25 +1,25 @@ Revert the following commit, it makes the freebsd doc chain fail. From 8eb55d782a2b9afacc7938694891cc6fad7b42a5 Mon Sep 17 00:00:00 2001 From: Dennis Filder Date: Fri, 13 Jun 2014 14:56:14 +0800 Subject: xmlSaveUri() incorrectly recomposes URIs with rootless paths For https://bugzilla.gnome.org/show_bug.cgi?id=731063 xmlSaveUri() of libxml2 (snapshot 2014-05-31 and earlier) returns bogus values when called with URIs that have rootless paths (e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be correct) ---- uri.c.orig 2016-05-22 01:49:02 UTC +--- uri.c.orig 2019-10-22 18:46:01 UTC +++ uri.c -@@ -1199,6 +1199,8 @@ xmlSaveUri(xmlURIPtr uri) { +@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) { if (temp == NULL) goto mem_error; ret = temp; } + ret[len++] = '/'; + ret[len++] = '/'; } if (uri->path != NULL) { p = uri->path; Index: head/textproc/libxml2/files/patch-xml2Conf.sh.in =================================================================== --- head/textproc/libxml2/files/patch-xml2Conf.sh.in (revision 518267) +++ head/textproc/libxml2/files/patch-xml2Conf.sh.in (revision 518268) @@ -1,15 +1,15 @@ ---- xml2Conf.sh.in.orig 2009-07-30 15:24:35 UTC +--- xml2Conf.sh.in.orig 2019-10-22 18:28:43 UTC +++ xml2Conf.sh.in @@ -1,6 +1,12 @@ # # Configuration file for using the XML library in GNOME applications # + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ + XML2_LIBDIR="@XML_LIBDIR@" - XML2_LIBS="@XML_LIBS@" + XML2_LIBS="@XML_LIBS@ @XML_PRIVATE_LIBS@" XML2_INCLUDEDIR="@XML_INCLUDEDIR@" Index: head/textproc/py-libxml2/Makefile =================================================================== --- head/textproc/py-libxml2/Makefile (revision 518267) +++ head/textproc/py-libxml2/Makefile (revision 518268) @@ -1,33 +1,33 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= gnome@FreeBSD.org +MAINTAINER= desktop@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 USES= gettext-runtime gnome python USE_PYTHON= autoplist distutils CPPFLAGS+= `${PYTHON_CMD}-config --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_CMD}-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"