Jeremie Courreges-Anglas [2017-11-04, 22:22:47]:
> On Fri, Nov 03 2017, Steven Mestdagh <ste...@openbsd.org> wrote:
> > could someone put this in a bulk build?
>
> The update looks good to me, the installed headers don't change much.
>
> One (small) problem though: the "compute_minrun" function isn't exported
> any more, thus you should bump the lib major version. It would probably
> be safe to cheat and omit the bump, since compute_minrun shouldn't have
> been exported in the first place, but I don't think it's worth it here.
indeed, it's safer.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.171
diff -u -p -u -r1.171 Makefile
--- Makefile 14 Sep 2017 14:56:41 -0000 1.171
+++ Makefile 6 Nov 2017 08:25:59 -0000
@@ -3,11 +3,11 @@
COMMENT-main= XML parsing library
COMMENT-python= Python bindings for libxml
-VERSION= 2.9.5
+VERSION= 2.9.7
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python= py-libxml-${VERSION}
-SHARED_LIBS += xml2 15.2 # 11.4
+SHARED_LIBS += xml2 16.0 # 11.4
CATEGORIES= textproc
MASTER_SITES= http://gd.tuwien.ac.at/pub/libxml/ \
ftp://xmlsoft.org/libxml/
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.53
diff -u -p -u -r1.53 distinfo
--- distinfo 14 Sep 2017 14:56:41 -0000 1.53
+++ distinfo 6 Nov 2017 08:25:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.5.tar.gz) = QDHB7O6c57pPMT6R72KEFkiFzbaZN6Ej9qg7tqctzTg=
-SIZE (libxml2-2.9.5.tar.gz) = 5466888
+SHA256 (libxml2-2.9.7.tar.gz) = 9jxefTA2LtKLOL+hrGMT+agCMHILf7bIBXXuqz/1kAw=
+SIZE (libxml2-2.9.7.tar.gz) = 5467389
Index: patches/patch-timsort_h
===================================================================
RCS file: /cvs/ports/textproc/libxml/patches/patch-timsort_h,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-timsort_h
--- patches/patch-timsort_h 25 Sep 2013 12:32:24 -0000 1.4
+++ patches/patch-timsort_h 6 Nov 2017 08:25:59 -0000
@@ -1,12 +1,13 @@
-$OpenBSD: patch-timsort_h,v 1.4 2013/09/25 12:32:24 jasper Exp $
---- timsort.h.orig Tue Sep 24 10:50:59 2013
-+++ timsort.h Tue Sep 24 10:51:40 2013
-@@ -48,7 +48,7 @@ typedef unsigned __int64 uint64_t;
- int compute_minrun(uint64_t);
+$OpenBSD: patch-timsort_h,v 1.3 2013/08/19 16:00:10 miod Exp $
+Index: timsort.h
+--- timsort.h.orig
++++ timsort.h
+@@ -74,7 +74,7 @@ typedef unsigned __int64 uint64_t;
+ static int compute_minrun(const uint64_t);
#ifndef CLZ
--#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__
> 3))
-+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >=
4))
+-#ifdef __GNUC__
++#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__
>= 4))
#define CLZ __builtin_clzll
#else
Index: patches/patch-xmllint_c
===================================================================
RCS file: /cvs/ports/textproc/libxml/patches/patch-xmllint_c,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-xmllint_c
--- patches/patch-xmllint_c 5 Jul 2007 16:05:09 -0000 1.4
+++ patches/patch-xmllint_c 6 Nov 2017 08:25:59 -0000
@@ -1,7 +1,8 @@
-$OpenBSD: patch-xmllint_c,v 1.4 2007/07/05 16:05:09 steven Exp $
---- xmllint.c.orig Tue Apr 17 14:28:16 2007
-+++ xmllint.c Mon Jul 2 12:50:32 2007
-@@ -103,7 +103,7 @@
+$OpenBSD: patch-xmllint_c,v 1.3 2006/03/20 13:36:54 steven Exp $
+Index: xmllint.c
+--- xmllint.c.orig
++++ xmllint.c
+@@ -87,7 +87,7 @@
#endif
#ifndef XML_XML_DEFAULT_CATALOG
