Attachment #209186 for bug #242004

View | Details | Raw Unified | Return to bug 242004
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/textproc/libxml2/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libxml2	4	PORTNAME= libxml2
5	PORTVERSION= 2.9.9	5	DISTVERSION= 2.9.10
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES?= textproc gnome	7	CATEGORIES?= textproc gnome
8	MASTER_SITES= http://xmlsoft.org/sources/	8	MASTER_SITES= http://xmlsoft.org/sources/

Lines 1-3 Link Here

(-)b/textproc/libxml2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1559577911	1	TIMESTAMP = 1573915139
2	SHA256 (gnome2/libxml2-2.9.9.tar.gz) = 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871	2	SHA256 (gnome2/libxml2-2.9.10.tar.gz) = aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
3	SIZE (gnome2/libxml2-2.9.9.tar.gz) = 5476717	3	SIZE (gnome2/libxml2-2.9.10.tar.gz) = 5624761




--- Makefile.in.orig	2019-11-16 14:42:34 UTC
+++ Makefile.in
@@ -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_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@
@@ -1773,7 +1773,7 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
 		config.h
 install-binPROGRAMS: install-libLTLIBRARIES
 
@@ -1910,7 +1910,7 @@ info: info-recursive
 
 info-am:
 

Lines 1-6 Link Here

(-)b/textproc/libxml2/files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2016-05-23 08:00:35 UTC	1	--- configure.orig 2019-10-30 19:14:22 UTC
2	+++ configure	2	+++ configure
3	@@ -15639,6 +15639,8 @@ fi	3	@@ -15525,6 +15525,8 @@ fi
4	fi	4	fi
5	fi	5	fi
6	;;	6	;;

Lines 1-6 Link Here

(-)b/textproc/libxml2/files/patch-python_Makefile.in (-3 / +3 lines)
1	--- python/Makefile.in.orig 2017-09-20 18:23:56 UTC	1	--- python/Makefile.in.orig 2019-11-16 14:42:34 UTC
2	+++ python/Makefile.in	2	+++ python/Makefile.in
3	@@ -489,7 +489,7 @@ top_srcdir = @top_srcdir@	3	@@ -493,7 +493,7 @@ top_srcdir = @top_srcdir@
4		4
5	# Makefile for libxml2 python library	5	# Makefile for libxml2 python library
6	AUTOMAKE_OPTIONS = 1.4 foreign	6	AUTOMAKE_OPTIONS = 1.4 foreign
Lines 9-15 Link Here
9	docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)	9	docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
10	dist_docs_DATA = TODO	10	dist_docs_DATA = TODO
11	EXTRA_DIST = \	11	EXTRA_DIST = \
12	@@ -509,7 +509,7 @@ EXTRA_DIST = \	12	@@ -513,7 +513,7 @@ EXTRA_DIST = \
13	@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la	13	@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
14	@WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c	14	@WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
15	@WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \	15	@WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \

Lines 1-6 Link Here

(-)b/textproc/libxml2/files/patch-python_tests_Makefile.in (-2 / +2 lines)
1	--- python/tests/Makefile.in.orig 2017-09-20 18:23:56 UTC	1	--- python/tests/Makefile.in.orig 2019-11-16 14:42:34 UTC
2	+++ python/tests/Makefile.in	2	+++ python/tests/Makefile.in
3	@@ -385,7 +385,7 @@ target_alias = @target_alias@	3	@@ -387,7 +387,7 @@ target_alias = @target_alias@
4	top_build_prefix = @top_build_prefix@	4	top_build_prefix = @top_build_prefix@
5	top_builddir = @top_builddir@	5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@	6	top_srcdir = @top_srcdir@

Lines 12-20 bogus values when called with URIs that have rootless paths Link Here

(-)b/textproc/libxml2/files/patch-uri.c (-2 / +2 lines)
12	(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be	12	(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be
13	correct)	13	correct)
14		14
15	--- uri.c.orig 2016-05-22 01:49:02 UTC	15	--- uri.c.orig 2019-10-22 18:46:01 UTC
16	+++ uri.c	16	+++ uri.c
17	@@ -1199,6 +1199,8 @@ xmlSaveUri(xmlURIPtr uri) {	17	@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) {
18	if (temp == NULL) goto mem_error;	18	if (temp == NULL) goto mem_error;
19	ret = temp;	19	ret = temp;
20	}	20	}

Lines 1-4 Link Here

(-)b/textproc/libxml2/files/patch-xml2Conf.sh.in (-2 / +2 lines)
1	--- xml2Conf.sh.in.orig 2009-07-30 15:24:35 UTC	1	--- xml2Conf.sh.in.orig 2019-10-22 18:28:43 UTC
2	+++ xml2Conf.sh.in	2	+++ xml2Conf.sh.in
3	@@ -1,6 +1,12 @@	3	@@ -1,6 +1,12 @@
4	#	4	#
Lines 11-15 Link Here
11	+libdir=@libdir@	11	+libdir=@libdir@
12	+	12	+
13	XML2_LIBDIR="@XML_LIBDIR@"	13	XML2_LIBDIR="@XML_LIBDIR@"
14	XML2_LIBS="@XML_LIBS@"	14	XML2_LIBS="@XML_LIBS@ @XML_PRIVATE_LIBS@"
15	XML2_INCLUDEDIR="@XML_INCLUDEDIR@"	15	XML2_INCLUDEDIR="@XML_INCLUDEDIR@"

Lines 4-10 Link Here

(-)b/textproc/py-libxml2/Makefile (-1 / +1 lines)
4	CATEGORIES= textproc gnome python	4	CATEGORIES= textproc gnome python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6		6
7	MAINTAINER= gnome@FreeBSD.org	7	MAINTAINER= desktop@FreeBSD.org
8	COMMENT= Python interface for XML parser library for GNOME	8	COMMENT= Python interface for XML parser library for GNOME
9		9
10	MASTERDIR= ${.CURDIR}/../libxml2	10	MASTERDIR= ${.CURDIR}/../libxml2

Return to bug 242004

Lines 1-6 Link Here

(-)b/textproc/libxml2/files/patch-Makefile.in (-6 / +6 lines)
1	--- Makefile.in.orig 2017-09-20 18:23:56 UTC	1	--- Makefile.in.orig 2019-11-16 14:42:34 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -1245,7 +1245,7 @@ distclean-compile:	3	@@ -1284,7 +1284,7 @@ am--depfiles: $(am__depfiles_remade)
4	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`	4	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
5		5
6	.c.lo:	6	.c.lo:
Lines 9-24 Link Here
9	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo	9	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo
10	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@	10	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
11	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@	11	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
12	@@ -1730,7 +1730,7 @@ distcleancheck: distclean	12	@@ -1773,7 +1773,7 @@ check-am: all-am
13	check-am: all-am	13	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
14	check: $(BUILT_SOURCES)	14	check: $(BUILT_SOURCES)
15	$(MAKE) $(AM_MAKEFLAGS) check-recursive	15	$(MAKE) $(AM_MAKEFLAGS) check-recursive
16	-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \	16	-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
17	+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \	17	+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
18	config.h	18	config.h
19	install-binPROGRAMS: install-libLTLIBRARIES	19	install-binPROGRAMS: install-libLTLIBRARIES
20		20
21	@@ -1798,7 +1798,7 @@ info: info-recursive	21	@@ -1910,7 +1910,7 @@ info: info-recursive
22		22
23	info-am:	23	info-am:
24		24