Update to 2.8.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17014 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 130 insertions, 32 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 1a2c5f658..fad824fa4 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#    $MCom: ports/textproc/libxml2/Makefile,v 1.11 2012/01/16 17:10:53 ahze Exp $
+#    $MCom: ports/textproc/libxml2/Makefile,v 1.12 2012/01/24 01:15:19 ahze Exp $
 #
 # WITHOUT_SCHEMA disable XML schema support
 # WITHOUT_THREADS disable threads support
@@ -13,11 +13,10 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.7.8
-PORTREVISION?=	3
+PORTVERSION=	2.8.0
+PORTREVISION?=	0
 CATEGORIES?=	textproc gnome
-MASTER_SITES=	ftp://fr.rpmfind.net/pub/libxml/ \
-		ftp://gd.tuwien.ac.at/pub/libxml/ \
+MASTER_SITES=	ftp://gd.tuwien.ac.at/pub/libxml/ \
 		ftp://xmlsoft.org/libxml2/
 DIST_SUBDIR=	gnome2
 
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 41f22cc4c..19079f765 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libxml2-2.7.8.tar.gz) = cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec
-SIZE (gnome2/libxml2-2.7.8.tar.gz) = 4881808
+SHA256 (gnome2/libxml2-2.8.0.tar.gz) = f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a
+SIZE (gnome2/libxml2-2.8.0.tar.gz) = 4915203
diff --git a/textproc/libxml2/files/patch-config.h.in b/textproc/libxml2/files/patch-config.h.in
index e86bbf40e..419a2c5de 100644
--- a/textproc/libxml2/files/patch-config.h.in
+++ b/textproc/libxml2/files/patch-config.h.in
@@ -1,11 +1,11 @@
---- config.h.in.orig	Sun Nov  3 16:55:05 2002
-+++ config.h.in	Tue Nov 19 00:06:05 2002
-@@ -1,4 +1,8 @@
+--- config.h.in.orig	2012-05-23 10:56:31.000000000 +0200
++++ config.h.in	2012-07-23 09:34:22.000000000 +0200
+@@ -1,5 +1,8 @@
  /* config.h.in.  Generated from configure.in by autoheader.  */
-+
+ 
 +/* XXX */
 +#define HAVE_VFSCANF
 +
- #undef PACKAGE
- #undef VERSION
- #undef HAVE_LIBZ
+ /* Define to 1 if you have the <ansidecl.h> header file. */
+ #undef HAVE_ANSIDECL_H
+ 
diff --git a/textproc/libxml2/files/patch-configure b/textproc/libxml2/files/patch-configure
index 9187f174f..e930a1da7 100644
--- a/textproc/libxml2/files/patch-configure
+++ b/textproc/libxml2/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	2010-11-27 15:40:06.000000000 +0100
-+++ configure	2010-11-27 15:40:06.000000000 +0100
-@@ -11414,7 +11414,7 @@ else
-   esac
- fi
- 
-- if test -z "$VERSION_SCRIPT_FLAGS"; then
-+ if test -n "$VERSION_SCRIPT_FLAGS"; then
-   USE_VERSION_SCRIPT_TRUE=
-   USE_VERSION_SCRIPT_FALSE='#'
- else
-@@ -13501,11 +13501,12 @@ fi
+--- configure.orig	2012-08-04 11:48:19.000000000 +0200
++++ configure	2012-08-04 11:50:50.000000000 +0200
+@@ -14228,11 +14228,12 @@ fi
      fi
      if test "$PYTHON_VERSION" != ""
      then
@@ -23,7 +14,7 @@
  	else
  	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
  	    then
-@@ -13901,6 +13902,8 @@ fi
+@@ -14635,6 +14636,8 @@ fi
  	       fi
  	   fi
         ;;
diff --git a/textproc/libxml2/files/patch-python_Makefile b/textproc/libxml2/files/patch-python_Makefile
index 37a01dce1..564271951 100644
--- a/textproc/libxml2/files/patch-python_Makefile
+++ b/textproc/libxml2/files/patch-python_Makefile
@@ -1,6 +1,6 @@
---- python/Makefile.in.orig	2008-05-23 22:39:11.000000000 -0500
-+++ python/Makefile.in	2008-05-23 22:40:42.000000000 -0500
-@@ -322,7 +322,7 @@
+--- python/Makefile.in.orig	2012-08-04 12:00:53.000000000 +0200
++++ python/Makefile.in	2012-08-04 12:02:59.000000000 +0200
+@@ -395,7 +395,7 @@
  	-I$(top_builddir)/include \
  	-I$(top_builddir)/$(subdir)
  
@@ -9,7 +9,7 @@
  # libxml2class.txt is generated
  dist_docs_DATA = TODO
  EXTRA_DIST = \
-@@ -335,7 +335,7 @@
+@@ -408,12 +408,12 @@
  
  libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version 
  @WITH_PYTHON_TRUE@mylibs = \
@@ -17,4 +17,10 @@
 +@WITH_PYTHON_TRUE@	-lxml2
  
  @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
- @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c types.c
+ @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = $(srcdir)/libxml.c $(srcdir)/types.c
+ @WITH_PYTHON_TRUE@nodist_libxml2mod_la_SOURCES = libxml2-py.c
+-@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@ -lpython$(PYTHON_VERSION)
++@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@
+ @WITH_PYTHON_TRUE@python_DATA = \
+ @WITH_PYTHON_TRUE@	libxml2.py
+ 
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
new file mode 100644
index 000000000..cd4136816
--- /dev/null
+++ b/textproc/py-libxml2/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	py-libxml2
+# Date created:				30 Jun 2004
+# Whom:					Alexander Nedotsukov <bland@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTREVISION=	0
+CATEGORIES=	textproc gnome python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Python interface for XML parser library for GNOME
+
+MASTERDIR=	${.CURDIR}/../libxml2
+BUILD_WRKSRC=	${WRKSRC}/python
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+USE_GNOME=	gnomehack libxml2
+USE_PYTHON=	yes
+CPPFLAGS+=	`${PYTHON_VERSION}-config --cflags`
+LDFLAGS+=	`${PYTHON_VERSION}-config --libs`
+CONFIGURE_ARGS=	--with-iconv=${LOCALBASE} \
+		--with-html-dir=${PREFIX}/share/doc \
+		--with-html-subdir=${PORTNAME} \
+		--with-python=${PYTHON_CMD}
+
+DOCSDIR=	${PREFIX}/share/doc/py-libxml2
+EXAMPLESDIR=	${PREFIX}/share/examples/py-libxml2
+
+post-install:
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py-libxml2/pkg-descr b/textproc/py-libxml2/pkg-descr
new file mode 100644
index 000000000..afb7cf4dd
--- /dev/null
+++ b/textproc/py-libxml2/pkg-descr
@@ -0,0 +1,3 @@
+Python interface for XML parser library for GNOME
+
+WWW: http://xmlsoft.org/
diff --git a/textproc/py-libxml2/pkg-plist b/textproc/py-libxml2/pkg-plist
new file mode 100644
index 000000000..bfa1da59c
--- /dev/null
+++ b/textproc/py-libxml2/pkg-plist
@@ -0,0 +1,62 @@
+%%PYTHON_SITELIBDIR%%/drv_libxml2.py
+%%PYTHON_SITELIBDIR%%/drv_libxml2.pyc
+%%PYTHON_SITELIBDIR%%/drv_libxml2.pyo
+%%PYTHON_SITELIBDIR%%/libxml2.py
+%%PYTHON_SITELIBDIR%%/libxml2.pyc
+%%PYTHON_SITELIBDIR%%/libxml2.pyo
+%%PYTHON_SITELIBDIR%%/libxml2mod.a
+%%PYTHON_SITELIBDIR%%/libxml2mod.la
+%%PYTHON_SITELIBDIR%%/libxml2mod.so
+%%DOCSDIR%%/TODO
+%%EXAMPLESDIR%%/attribs.py
+%%EXAMPLESDIR%%/build.py
+%%EXAMPLESDIR%%/compareNodes.py
+%%EXAMPLESDIR%%/ctxterror.py
+%%EXAMPLESDIR%%/cutnpaste.py
+%%EXAMPLESDIR%%/dtdvalid.py
+%%EXAMPLESDIR%%/error.py
+%%EXAMPLESDIR%%/inbuf.py
+%%EXAMPLESDIR%%/indexes.py
+%%EXAMPLESDIR%%/invalid.xml
+%%EXAMPLESDIR%%/nsdel.py
+%%EXAMPLESDIR%%/outbuf.py
+%%EXAMPLESDIR%%/push.py
+%%EXAMPLESDIR%%/pushSAX.py
+%%EXAMPLESDIR%%/pushSAXhtml.py
+%%EXAMPLESDIR%%/reader.py
+%%EXAMPLESDIR%%/reader2.py
+%%EXAMPLESDIR%%/reader3.py
+%%EXAMPLESDIR%%/reader4.py
+%%EXAMPLESDIR%%/reader5.py
+%%EXAMPLESDIR%%/reader6.py
+%%EXAMPLESDIR%%/reader7.py
+%%EXAMPLESDIR%%/reader8.py
+%%EXAMPLESDIR%%/readererr.py
+%%EXAMPLESDIR%%/readernext.py
+%%EXAMPLESDIR%%/regexp.py
+%%EXAMPLESDIR%%/relaxng.py
+%%EXAMPLESDIR%%/resolver.py
+%%EXAMPLESDIR%%/schema.py
+%%EXAMPLESDIR%%/serialize.py
+%%EXAMPLESDIR%%/sync.py
+%%EXAMPLESDIR%%/test.dtd
+%%EXAMPLESDIR%%/thread2.py
+%%EXAMPLESDIR%%/tst.py
+%%EXAMPLESDIR%%/tst.xml
+%%EXAMPLESDIR%%/tstLastError.py
+%%EXAMPLESDIR%%/tstURI.py
+%%EXAMPLESDIR%%/tstmem.py
+%%EXAMPLESDIR%%/tstxpath.py
+%%EXAMPLESDIR%%/valid.xml
+%%EXAMPLESDIR%%/validDTD.py
+%%EXAMPLESDIR%%/validRNG.py
+%%EXAMPLESDIR%%/validSchemas.py
+%%EXAMPLESDIR%%/validate.py
+%%EXAMPLESDIR%%/walker.py
+%%EXAMPLESDIR%%/xpath.py
+%%EXAMPLESDIR%%/xpathext.py
+%%EXAMPLESDIR%%/xpathleak.py
+%%EXAMPLESDIR%%/xpathns.py
+%%EXAMPLESDIR%%/xpathret.py
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%