Attachment #191511 for bug #222580

Lines 13-20 Link Here

(-)Makefile (-6 / +10 lines)
13		13
14	.if !defined(REFERENCE_PORT)	14	.if !defined(REFERENCE_PORT)
15		15
16	LICENSE= MIT	16	LICENSE= MIT TRIO
17	LICENSE_FILE= ${WRKSRC}/COPYING	17	LICENSE_COMB= multi
		18	LICENSE_NAME_TRIO= Trio License
		19	LICENSE_FILE_MIT= ${WRKSRC}/COPYING
		20	LICENSE_FILE_TRIO= ${FILESDIR}/LICENSE.TRIO
		21	LICENSE_PERMS_TRIO= ${_LICENSE_PERMS_DEFAULT}
18		22
19	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
20	USES+= cpe gmake iconv libtool pathfix pkgconfig shebangfix	24	USES+= cpe gmake iconv libtool pathfix pkgconfig shebangfix
Lines 33-39 Link Here
33		37
34	.if !defined(MASTERDIR)	38	.if !defined(MASTERDIR)
35		39
36	OPTIONS_DEFINE= SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC	40	OPTIONS_DEFINE= SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
37	OPTIONS_DEFAULT=SCHEMA VALID THREADS	41	OPTIONS_DEFAULT=SCHEMA VALID THREADS
38	SCHEMA_DESC= XML schema support	42	SCHEMA_DESC= XML schema support
39	SCHEMA_CONFIGURE_WITH= schemas	43	SCHEMA_CONFIGURE_WITH= schemas
Lines 41-51 Link Here
41	VALID_CONFIGURE_OFF= --without-valid	45	VALID_CONFIGURE_OFF= --without-valid
42	THREADS_DESC= Threads support	46	THREADS_DESC= Threads support
43	THREADS_CONFIGURE_WITH= threads	47	THREADS_CONFIGURE_WITH= threads
44	MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)	48	MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)
45	MEM_DEBUG_CONFIGURE_WITH= mem-debug	49	MEM_DEBUG_CONFIGURE_WITH= mem-debug
46	XMLLINT_HIST_DESC= History for xmllint	50	XMLLINT_HIST_DESC= History for xmllint
47	XMLLINT_HIST_CONFIGURE_WITH= history	51	XMLLINT_HIST_CONFIGURE_WITH= history
48	THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)	52	THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
49	THREAD_ALLOC_CONFIGURE_WITH= thread-alloc	53	THREAD_ALLOC_CONFIGURE_WITH= thread-alloc
50		54
51	.endif # !defined(MASTERDIR)	55	.endif # !defined(MASTERDIR)




(Following sentences are from trio.c of libxml2-2.9.4.tar.gz.)

Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.

Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.




--- Makefile.in.orig	2017-09-20 18:23:56 UTC
+++ Makefile.in
@@ -1245,7 +1245,7 @@ distclean-compile:
 @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_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
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive

 		config.h
 install-binPROGRAMS: install-libLTLIBRARIES
 
@@ -1798,7 +1798,7 @@ info: info-recursive
 
 info-am:
 

Lines 1-7 Link Here

(-)files/patch-config.h.in (-4 / +5 lines)
1	--- config.h.in.orig 2012-05-23 10:56:31.000000000 +0200	1	--- config.h.in.orig 2016-05-23 08:00:35 UTC
2	+++ config.h.in 2012-07-23 09:34:22.000000000 +0200	2	+++ config.h.in
3	@@ -1,5 +1,8 @@	3	@@ -3,6 +3,9 @@
4	/* config.h.in. Generated from configure.in by autoheader. */	4	/* Type cast for the gethostbyname() argument */
		5	#undef GETHOSTBYNAME_ARG_CAST
5		6
6	+/* XXX */	7	+/* XXX */
7	+#define HAVE_VFSCANF	8	+#define HAVE_VFSCANF

Lines 1-6 Link Here

(-)files/patch-configure (-3 / +3 lines)
1	--- configure.orig 2013-11-24 09:41:13.000000000 +0100	1	--- configure.orig 2016-05-23 08:00:35 UTC
2	+++ configure 2013-11-24 09:41:55.000000000 +0100	2	+++ configure
3	@@ -14499,6 +14499,8 @@	3	@@ -15639,6 +15639,8 @@ fi
4	fi	4	fi
5	fi	5	fi
6	;;	6	;;

Lines 1-6 Link Here

(-)files/patch-libxml-2.0-uninstalled.pc.in (-3 / +3 lines)
1	--- libxml-2.0-uninstalled.pc.in.orig 2014-10-03 11:00:53.000000000 +0200	1	--- libxml-2.0-uninstalled.pc.in.orig 2016-02-09 10:17:32 UTC
2	+++ libxml-2.0-uninstalled.pc.in 2015-07-31 13:26:13.641069000 +0200	2	+++ libxml-2.0-uninstalled.pc.in
3	@@ -8,5 +8,5 @@	3	@@ -8,5 +8,5 @@ Name: libXML
4	Version: @VERSION@	4	Version: @VERSION@
5	Description: libXML library version2.	5	Description: libXML library version2.
6	Requires:	6	Requires:

Lines 1-6 Link Here

(-)files/patch-libxml-2.0.pc.in (-3 / +3 lines)
1	--- libxml-2.0.pc.in.orig 2014-10-03 11:00:53.000000000 +0200	1	--- libxml-2.0.pc.in.orig 2016-02-09 10:17:32 UTC
2	+++ libxml-2.0.pc.in 2015-07-31 13:26:13.647320000 +0200	2	+++ libxml-2.0.pc.in
3	@@ -9,5 +9,5 @@	3	@@ -9,5 +9,5 @@ Version: @VERSION@
4	Description: libXML library version2.	4	Description: libXML library version2.
5	Requires:	5	Requires:
6	Libs: -L${libdir} -lxml2	6	Libs: -L${libdir} -lxml2

Lines 1-6 Link Here

(-)files/patch-python_Makefile.in (-4 / +4 lines)
1	--- python/Makefile.in.orig 2013-11-24 08:47:04.000000000 +0100	1	--- python/Makefile.in.orig 2017-09-20 18:23:56 UTC
2	+++ python/Makefile.in 2013-11-24 08:51:02.000000000 +0100	2	+++ python/Makefile.in
3	@@ -415,7 +415,7 @@	3	@@ -489,7 +489,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	@@ -435,7 +435,7 @@	12	@@ -509,7 +509,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-7 Link Here

(-)files/patch-python_tests_Makefile.in (-4 / +4 lines)
1	--- python/tests/Makefile.in.orig 2008-05-23 22:41:49.000000000 -0500	1	--- python/tests/Makefile.in.orig 2017-09-20 18:23:56 UTC
2	+++ python/tests/Makefile.in 2008-05-23 22:42:12.000000000 -0500	2	+++ python/tests/Makefile.in
3	@@ -270,7 +270,7 @@	3	@@ -385,7 +385,7 @@ target_alias = @target_alias@
4	target_alias = @target_alias@	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@
7	-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples	7	-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples

Lines 12-20 Link Here

(-)files/patch-uri.c (-3 / +3 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 2014-10-03 13:28:06.000000000 +0200	15	--- uri.c.orig 2016-05-22 01:49:02 UTC
16	+++ uri.c 2014-10-20 14:22:57.677231158 +0200	16	+++ uri.c
17	@@ -1198,6 +1198,8 @@	17	@@ -1199,6 +1199,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-5 Link Here

(-)files/patch-xml2Conf.sh.in (-2 / +2 lines)
1	--- xml2Conf.sh.in 2001/05/19 19:57:43 1.1	1	--- xml2Conf.sh.in.orig 2009-07-30 15:24:35 UTC
2	+++ xml2Conf.sh.in 2001/05/19 19:59:40	2	+++ xml2Conf.sh.in
3	@@ -1,6 +1,12 @@	3	@@ -1,6 +1,12 @@
4	#	4	#
5	# Configuration file for using the XML library in GNOME applications	5	# Configuration file for using the XML library in GNOME applications

Return to bug 222580

Line 0 Link Here

(-)files/LICENSE.TRIO (+12 lines)
	1	(Following sentences are from trio.c of libxml2-2.9.4.tar.gz.)
	2
	3	Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
	4
	5	Permission to use, copy, modify, and distribute this software for any
	6	purpose with or without fee is hereby granted, provided that the above
	7	copyright notice and this permission notice appear in all copies.
	8
	9	THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
	10	WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
	11	MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
	12	CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.

Lines 1-7 Link Here

(-)files/patch-Makefile.in (-6 / +6 lines)
1	--- Makefile.in.orig 2014-10-17 20:26:52.547793054 +0200	1	--- Makefile.in.orig 2017-09-20 18:23:56 UTC
2	+++ Makefile.in 2014-10-17 20:27:34.868791352 +0200	2	+++ Makefile.in
3	@@ -1234,7 +1234,7 @@	3	@@ -1245,7 +1245,7 @@ distclean-compile:
4	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`	4	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
5		5
6	.c.lo:	6	.c.lo:
7	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<	7	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
Lines 9-15 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	@@ -1712,7 +1712,7 @@	12	@@ -1730,7 +1730,7 @@ distcleancheck: distclean
13	check-am: all-am	13	check-am: all-am
14	check: $(BUILT_SOURCES)	14	check: $(BUILT_SOURCES)
15	$(MAKE) $(AM_MAKEFLAGS) check-recursive	15	$(MAKE) $(AM_MAKEFLAGS) check-recursive
Lines 18-24 Link Here
18	config.h	18	config.h
19	install-binPROGRAMS: install-libLTLIBRARIES	19	install-binPROGRAMS: install-libLTLIBRARIES
20		20
21	@@ -1780,7 +1780,7 @@	21	@@ -1798,7 +1798,7 @@ info: info-recursive
22		22
23	info-am:	23	info-am:
24		24