Attachment #16781 for bug #30648

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

Lines 6-13 Link Here

(-)libxml2/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= libxml2	8	PORTNAME= libxml2
9	PORTVERSION= 2.4.3	9	PORTVERSION= 2.4.5
10	PORTREVISION= 1
11	CATEGORIES= textproc gnome	10	CATEGORIES= textproc gnome
12	MASTER_SITES= ${MASTER_SITE_GNOME}	11	MASTER_SITES= ${MASTER_SITE_GNOME}
13	MASTER_SITE_SUBDIR= stable/sources/libxml	12	MASTER_SITE_SUBDIR= stable/sources/libxml
Lines 26-32 Link Here
26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
27	LIBS="-L${LOCALBASE}/lib"	26	LIBS="-L${LOCALBASE}/lib"
28		27
29	MAN1= xml2-config.1 xmllint.1	28	MAN1= xml2-config.1 xmllint.1 xmlcatalog.1
30	MAN4= libxml.4	29	MAN4= libxml.4
31		30
32	pre-patch:	31	pre-patch:

Line 1 Link Here

(-)libxml2/distinfo (-1 / +1 lines)
1	MD5 (libxml2-2.4.3.tar.gz) = f3939fe9ced244e3476dd3859a79c0a7	1	MD5 (libxml2-2.4.5.tar.gz) = a545febf89d453fd774eb8e086e31754




--- work/libxml2-2.4.5/Makefile.in.orig	Tue Sep 18 20:11:32 2001
+++ Makefile.in				Tue Sep 18 20:11:32 2001
@@ -137,7 +137,7 @@
 lib_LTLIBRARIES = libxml2.la
 libxml2_la_LIBADD = @Z_LIBS@ $(ICONV_LIBS) -lm
+libxml2_la_LIBADD = @Z_LIBS@ -lm @ICONV_LIBS@
 
-libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
+libxml2_la_LDFLAGS = -version-info 5:0:0
 
 @WITH_TRIO_SOURCES_TRUE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c 		catalog.c strio.c trio.c
 @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c 		catalog.c 
@@ -185,7 +185,7 @@
 testURI_DEPENDENCIES = $(DEPS)
 testURI_LDADD = $(LDADDS)
 
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
 confexec_DATA = xml2Conf.sh
 
 CLEANFILES = xml2Conf.sh
@@ -770,7 +770,7 @@
 		uninstall-confexecDATA uninstall-m4dataDATA \
 		uninstall-pkgconfigDATA
 uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
 		config.h
 all-redirect: all-recursive-am
 install-strip:





$FreeBSD: ports/textproc/libxml2/files/patch-ab,v 1.9 2001/08/26 00:55:06 mi Exp $

--- configure.orig	Mon Jul 23 22:40:34 2001
+++ configure	Mon Jul 30 15:39:38 2001
@@ -3571,7 +3572,7 @@
 
 
 XML_LIBDIR='-L${libdir}'
-XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
+XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}/libxml2/libxml'
 
 XML_CFLAGS=""
 RDL_LIBS=""




--- work/libxml2-2.4.5/include/libxml/Makefile.in.orig	Tue Sep 18 19:43:09 2001
+++ include/libxml/Makefile.in				Tue Sep 18 19:43:18 2001
@@ -279,7 +279,7 @@
--- include/libxml/Makefile.in.orig	Wed Jul 11 10:26:41 2001
+++ include/libxml/Makefile.in	Wed Jul 11 10:34:18 2001
@@ -116,7 +116,7 @@
 Z_CFLAGS = @Z_CFLAGS@
 Z_LIBS = @Z_LIBS@
 
-xmlincdir = $(includedir)/libxml
+xmlincdir = $(includedir)/libxml2/libxml
 
 xmlinc_HEADERS =  		SAX.h 		entities.h 		encoding.h 		parser.h 		parserInternals.h 		xmlerror.h 		HTMLparser.h 		HTMLtree.h 		debugXML.h 		tree.h 		list.h 		hash.h 		xpath.h 		xpathInternals.h 		xpointer.h 		xinclude.h 		xmlIO.h 		xmlmemory.h 		nanohttp.h 		nanoftp.h 		uri.h 		valid.h 		xlink.h 		xmlversion.h 		xmlwin32version.h 		DOCBparser.h 		catalog.h
 
@@ -275,7 +275,7 @@
 
 
 install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(xmlincdir)/libxml2 $(DESTDIR)$(xmlincdir)/libxml2/libxml
+	$(mkinstalldirs) $(DESTDIR)$(xmlincdir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

Return to bug 30648

Lines 1-20 Link Here

(-)libxml2/files/patch-aa (-7 / +16 lines)
1	--- work/libxml2-2.4.2/Makefile.in Wed Aug 15 08:26:06 2001	1	--- work/libxml2-2.4.5/Makefile.in.orig Tue Sep 18 20:11:32 2001
2	+++ Makefile.in Thu Aug 23 17:02:39 2001	2	+++ Makefile.in Tue Sep 18 20:11:32 2001
3	@@ -137,5 +137,5 @@	3	@@ -137,7 +137,7 @@
4	lib_LTLIBRARIES = libxml2.la	4	lib_LTLIBRARIES = libxml2.la
5	-libxml2_la_LIBADD = @Z_LIBS@ -lm	5	libxml2_la_LIBADD = @Z_LIBS@ $(ICONV_LIBS) -lm
6	+libxml2_la_LIBADD = @Z_LIBS@ -lm @ICONV_LIBS@
7		6
8	-libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@	7	-libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
9	+libxml2_la_LDFLAGS = -version-info 5:0:0	8	+libxml2_la_LDFLAGS = -version-info 5:0:0
10		9
11	@@ -187,3 +187,3 @@	10	@WITH_TRIO_SOURCES_TRUE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c catalog.c strio.c trio.c
		11	@WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c catalog.c
		12	@@ -185,7 +185,7 @@
		13	testURI_DEPENDENCIES = $(DEPS)
		14	testURI_LDADD = $(LDADDS)
12		15
13	-confexecdir = $(libdir)	16	-confexecdir = $(libdir)
14	+confexecdir = $(sysconfdir)	17	+confexecdir = $(sysconfdir)
15	confexec_DATA = xml2Conf.sh	18	confexec_DATA = xml2Conf.sh
16	@@ -772,3 +772,3 @@	19
		20	CLEANFILES = xml2Conf.sh
		21	@@ -770,7 +770,7 @@
		22	uninstall-confexecDATA uninstall-m4dataDATA \
		23	uninstall-pkgconfigDATA
17	uninstall: uninstall-recursive	24	uninstall: uninstall-recursive
18	-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \	25	-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
19	+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \	26	+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
20	config.h	27	config.h
		28	all-redirect: all-recursive-am
		29	install-strip:

Lines 1-14 Link Here

(-)libxml2/files/patch-ab (-14 lines)
1
2	$FreeBSD: ports/textproc/libxml2/files/patch-ab,v 1.9 2001/08/26 00:55:06 mi Exp $
3
4	--- configure.orig Mon Jul 23 22:40:34 2001
5	+++ configure Mon Jul 30 15:39:38 2001
6	@@ -3571,7 +3572,7 @@
7
8
9	XML_LIBDIR='-L${libdir}'
10	-XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
11	+XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}/libxml2/libxml'
12
13	XML_CFLAGS=""
14	RDL_LIBS=""

Lines 1-22 Link Here

(-)libxml2/files/patch-include::libxml::Makefile.in (-16 / +4 lines)
1		1	--- work/libxml2-2.4.5/include/libxml/Makefile.in.orig Tue Sep 18 19:43:09 2001
2	$FreeBSD: ports/textproc/libxml2/files/patch-include::libxml::Makefile.in,v 1.1 2001/07/11 07:42:53 sobomax Exp $	2	+++ include/libxml/Makefile.in Tue Sep 18 19:43:18 2001
3		3	@@ -279,7 +279,7 @@
4	--- include/libxml/Makefile.in.orig Wed Jul 11 10:26:41 2001
5	+++ include/libxml/Makefile.in Wed Jul 11 10:34:18 2001
6	@@ -116,7 +116,7 @@
7	Z_CFLAGS = @Z_CFLAGS@
8	Z_LIBS = @Z_LIBS@
9
10	-xmlincdir = $(includedir)/libxml
11	+xmlincdir = $(includedir)/libxml2/libxml
12
13	xmlinc_HEADERS = SAX.h entities.h encoding.h parser.h parserInternals.h xmlerror.h HTMLparser.h HTMLtree.h debugXML.h tree.h list.h hash.h xpath.h xpathInternals.h xpointer.h xinclude.h xmlIO.h xmlmemory.h nanohttp.h nanoftp.h uri.h valid.h xlink.h xmlversion.h xmlwin32version.h DOCBparser.h catalog.h
14
15	@@ -275,7 +275,7 @@
16		4
17		5
18	install-exec-hook:	6	install-exec-hook:
19	- $(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml	7	- $(mkinstalldirs) $(DESTDIR)$(xmlincdir)/libxml2 $(DESTDIR)$(xmlincdir)/libxml2/libxml
20	+ $(mkinstalldirs) $(DESTDIR)$(xmlincdir)	8	+ $(mkinstalldirs) $(DESTDIR)$(xmlincdir)
21		9
22	# Tell versions [3.59,3.63) of GNU make to not export all variables.	10	# Tell versions [3.59,3.63) of GNU make to not export all variables.