- Update to 2.6.27

5 files changed, 20 insertions, 21 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 22baf9722900..0d52366000bf 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -12,18 +12,16 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.6.26
+PORTVERSION=	2.6.27
 PORTREVISION?=	0
 CATEGORIES?=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
+		ftp://fr.rpmfind.net/pub/libxml/
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	XML parser library for GNOME
 
-USE_BZIP2=	yes
-
 .if !defined(REFERENCE_PORT)
 
 USE_GMAKE=	yes
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index e77d9e80dba1..9b906a59b722 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libxml2-2.6.26.tar.bz2) = ce342b4d7b6d83e10cfa4d3f82bf75fd
-SHA256 (gnome2/libxml2-2.6.26.tar.bz2) = bd250980525ba7f786320590fff6d1d7da942ffaf2cffdea5ca1e6019c4d4515
-SIZE (gnome2/libxml2-2.6.26.tar.bz2) = 3418273
+MD5 (gnome2/libxml2-2.6.27.tar.gz) = f5806f5059ef7bd4d3fcf36cf116d1ef
+SHA256 (gnome2/libxml2-2.6.27.tar.gz) = d7549485c55e55041ad5a5e531b17935d89ebf474ae8bc98a51ea31eeeb876e9
+SIZE (gnome2/libxml2-2.6.27.tar.gz) = 4590835
diff --git a/textproc/libxml2/files/patch-python::Makefile.in b/textproc/libxml2/files/patch-python::Makefile.in
index 67c0c6c508e9..403493dc2937 100644
--- a/textproc/libxml2/files/patch-python::Makefile.in
+++ b/textproc/libxml2/files/patch-python::Makefile.in
@@ -1,7 +1,7 @@
---- python/Makefile.in.orig	Sun Aug 22 21:09:41 2004
-+++ python/Makefile.in	Sun Aug 22 21:11:12 2004
-@@ -51,7 +51,7 @@
- am__installdirs = $(DESTDIR)$(pythondir)
+--- python/Makefile.in.orig	Mon Jan 15 19:11:51 2007
++++ python/Makefile.in	Mon Jan 15 19:14:37 2007
+@@ -56,7 +56,7 @@
+ am__installdirs = "$(DESTDIR)$(pythondir)"
  pythonLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(python_LTLIBRARIES)
 -@WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/libxml2.la
@@ -9,21 +9,18 @@
  @WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
  am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c
  @WITH_PYTHON_TRUE@am_libxml2mod_la_OBJECTS = libxml.lo types.lo \
-@@ -288,7 +288,7 @@
- 	-I$(PYTHON_INCLUDES) \
- 	-I$(top_srcdir)/include
+@@ -309,7 +309,7 @@
+ 	-I$(top_builddir)/include \
+ 	-I$(top_builddir)/$(subdir)
  
 -DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
 +DOCS_DIR = $(datadir)/doc/py-libxml2
  # libxml2class.txt is generated
  DOCS = ${srcdir}/TODO
  EXTRA_DIST = \
-@@ -303,9 +303,9 @@
- 	libxml2-python-api.xml	\
- 	$(DOCS)
+@@ -326,7 +326,7 @@
  
--libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -L$(top_builddir)/.libs
-+libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version
+ libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version 
  @WITH_PYTHON_TRUE@mylibs = \
 -@WITH_PYTHON_TRUE@	$(top_builddir)/libxml2.la
 +@WITH_PYTHON_TRUE@	-lxml2
diff --git a/textproc/libxml2/pkg-descr b/textproc/libxml2/pkg-descr
index 962b4e38b0ac..c64953cf93a1 100644
--- a/textproc/libxml2/pkg-descr
+++ b/textproc/libxml2/pkg-descr
@@ -1,3 +1,6 @@
-XML parser library for GNOME
+Libxml2 is the XML C parser and toolkit developed for the Gnome project (but
+usable outside of the Gnome platform).  XML itself is a metalanguage to design
+markup languages, i.e. text language where semantic and structure are added to
+the content using extra "markup" information enclosed between angle brackets.
 
 WWW: http://xmlsoft.org/
diff --git a/textproc/py-libxml2/pkg-plist b/textproc/py-libxml2/pkg-plist
index dac231b26e5e..b1108e46f9be 100644
--- a/textproc/py-libxml2/pkg-plist
+++ b/textproc/py-libxml2/pkg-plist
@@ -10,6 +10,7 @@ lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.so
 %%DOCSDIR%%/TODO
 %%EXAMPLESDIR%%/attribs.py
 %%EXAMPLESDIR%%/build.py
+%%EXAMPLESDIR%%/compareNodes.py
 %%EXAMPLESDIR%%/ctxterror.py
 %%EXAMPLESDIR%%/cutnpaste.py
 %%EXAMPLESDIR%%/dtdvalid.py