mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-29 05:38:00 +00:00
Update to 2.4.5.
PR: 30648 Submitted by: Lev Serebryakov <lev@serebryakov.spb.ru>
This commit is contained in:
parent
ac406bd4d4
commit
53d84cb1d3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=47984
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= libxml2
|
||||
PORTVERSION= 2.4.3
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 2.4.5
|
||||
CATEGORIES= textproc gnome
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= stable/sources/libxml
|
||||
@ -26,7 +25,7 @@ CONFIGURE_ARGS= --with-iconv \
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LIBS="-L${LOCALBASE}/lib"
|
||||
|
||||
MAN1= xml2-config.1 xmllint.1
|
||||
MAN1= xml2-config.1 xmllint.1 xmlcatalog.1
|
||||
MAN4= libxml.4
|
||||
|
||||
pre-patch:
|
||||
|
@ -1 +1 @@
|
||||
MD5 (libxml2-2.4.3.tar.gz) = f3939fe9ced244e3476dd3859a79c0a7
|
||||
MD5 (libxml2-2.4.5.tar.gz) = a545febf89d453fd774eb8e086e31754
|
||||
|
@ -1,20 +1,29 @@
|
||||
--- work/libxml2-2.4.2/Makefile.in Wed Aug 15 08:26:06 2001
|
||||
+++ Makefile.in Thu Aug 23 17:02:39 2001
|
||||
@@ -137,5 +137,5 @@
|
||||
--- 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@ -lm
|
||||
+libxml2_la_LIBADD = @Z_LIBS@ -lm @ICONV_LIBS@
|
||||
libxml2_la_LIBADD = @Z_LIBS@ $(ICONV_LIBS) -lm
|
||||
|
||||
-libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
|
||||
+libxml2_la_LDFLAGS = -version-info 5:0:0
|
||||
|
||||
@@ -187,3 +187,3 @@
|
||||
@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
|
||||
@@ -772,3 +772,3 @@
|
||||
|
||||
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:
|
||||
|
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- 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=""
|
@ -1,22 +1,10 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- 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 @@
|
||||
--- 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 @@
|
||||
|
||||
|
||||
install-exec-hook:
|
||||
- $(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml
|
||||
- $(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.
|
||||
|
Loading…
Reference in New Issue
Block a user