[Midnightbsd-cvs] mports: textproc/libxml2: update to 2.6.31

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Mar 27 23:37:23 EDT 2008 

Log Message:
-----------
update to 2.6.31

Modified Files:
--------------
    mports/textproc/libxml2:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
    mports/textproc/libxml2/files:
        patch-aa (r1.1 -> r1.2)
        patch-doc_devhelp_Makefile.in (r1.1 -> r1.2)
        patch-python::Makefile.in (r1.1 -> r1.2)
        patch-python::tests::Makefile.in (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/textproc/libxml2/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L textproc/libxml2/Makefile -L textproc/libxml2/Makefile -u -r1.2 -r1.3
--- textproc/libxml2/Makefile
+++ textproc/libxml2/Makefile
@@ -3,9 +3,9 @@
 # Whom:					Yukihiro Nakai <Nakai at technologist.com>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/textproc/libxml2/Makefile,v 1.142 2006/06/07 19:20:30 marcus Exp $
+# $FreeBSD: ports/textproc/libxml2/Makefile,v 1.148 2008/01/22 20:59:41 marcus Exp $
 #
-# WITH_THREADS enable pthread support (WILL BREAK OTHER PORTS!)
+# WITH_THREADS_BREAK enable pthread support (WILL BREAK OTHER PORTS!)
 # WITHOUT_SCHEMA disable XML schema support
 # WITH_MEM_DEBUG enable memory debugging (DEVELOPERS ONLY!)
 # WITH_XMLLINT_HIST enable history for xmllint
@@ -13,17 +13,16 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.6.26
+PORTVERSION=	2.6.31
 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?=	ports at MidnightBSD.org
 COMMENT?=	XML parser library for GNOME
-
-USE_BZIP2=	yes
+LICENSE=	bsd3
 
 .if !defined(REFERENCE_PORT)
 
@@ -31,7 +30,7 @@
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME?=	gnomehack gnometarget pkgconfig
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS?= --with-iconv=${LOCALBASE} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
@@ -44,7 +43,7 @@
 MAN3=		libxml.3
 .endif
 
-.if defined(WITH_THREADS)
+.if defined(WITH_THREADS_BREAK)
 CONFIGURE_ARGS+=	--with-threads
 .else
 CONFIGURE_ARGS+=	--without-threads
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/textproc/libxml2/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/libxml2/distinfo -L textproc/libxml2/distinfo -u -r1.1 -r1.2
--- textproc/libxml2/distinfo
+++ 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.31.tar.gz) = 714b0683b1ec4bdc63bc356d729f9b18
+SHA256 (gnome2/libxml2-2.6.31.tar.gz) = 3e7982341bbb1f11d5df344177955769e16b4d271f1f5c271740b3d1fad9bac6
+SIZE (gnome2/libxml2-2.6.31.tar.gz) = 4734599
Index: patch-python::tests::Makefile.in
===================================================================
RCS file: /home/cvs/mports/textproc/libxml2/files/patch-python::tests::Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/libxml2/files/patch-python::tests::Makefile.in -L textproc/libxml2/files/patch-python::tests::Makefile.in -u -r1.1 -r1.2
--- textproc/libxml2/files/patch-python::tests::Makefile.in
+++ textproc/libxml2/files/patch-python::tests::Makefile.in
@@ -1,9 +1,9 @@
---- python/tests/Makefile.in.orig	Tue Mar 23 09:22:07 2004
-+++ python/tests/Makefile.in	Tue Mar 23 09:22:39 2004
-@@ -241,7 +241,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- python/tests/Makefile.in.orig	2008-01-22 15:51:51.000000000 -0500
++++ python/tests/Makefile.in	2008-01-22 15:52:12.000000000 -0500
+@@ -259,7 +259,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -EXAMPLE_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
 +EXAMPLE_DIR = $(datadir)/examples/py-libxml2
  PYTESTS = \
Index: patch-aa
===================================================================
RCS file: /home/cvs/mports/textproc/libxml2/files/patch-aa,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/libxml2/files/patch-aa -L textproc/libxml2/files/patch-aa -u -r1.1 -r1.2
--- textproc/libxml2/files/patch-aa
+++ textproc/libxml2/files/patch-aa
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Mon Jan 17 20:35:00 2005
-+++ Makefile.in	Mon Jan 17 20:36:53 2005
-@@ -417,13 +417,13 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- Makefile.in.orig	2008-01-22 15:47:56.000000000 -0500
++++ Makefile.in	2008-01-22 15:49:21.000000000 -0500
+@@ -486,13 +486,13 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
 +SUBDIRS = include . doc example xstc @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@
  DIST_SUBDIRS = include . doc example python xstc
@@ -16,7 +16,7 @@
  @WITH_TRIO_SOURCES_FALSE at libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
  @WITH_TRIO_SOURCES_FALSE@		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \
  @WITH_TRIO_SOURCES_FALSE@		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  \
-@@ -512,7 +512,7 @@
+@@ -590,7 +590,7 @@ testapi_LDFLAGS = 
  testapi_DEPENDENCIES = $(DEPS)
  testapi_LDADD = $(LDADDS)
  CLEANFILES = xml2Conf.sh
@@ -25,7 +25,7 @@
  confexec_DATA = xml2Conf.sh
  CVS_EXTRA_DIST = 
  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
-@@ -534,8 +534,8 @@
+@@ -613,8 +613,8 @@ pkgconfig_DATA = libxml-2.0.pc
  # Install the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
@@ -36,7 +36,7 @@
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -1246,7 +1246,7 @@
+@@ -1344,7 +1344,7 @@ distcleancheck: distclean
  check-am: all-am
  	$(MAKE) $(AM_MAKEFLAGS) check-local
  check: check-recursive
Index: patch-python::Makefile.in
===================================================================
RCS file: /home/cvs/mports/textproc/libxml2/files/patch-python::Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/libxml2/files/patch-python::Makefile.in -L textproc/libxml2/files/patch-python::Makefile.in -u -r1.1 -r1.2
--- textproc/libxml2/files/patch-python::Makefile.in
+++ textproc/libxml2/files/patch-python::Makefile.in
@@ -1,29 +1,17 @@
---- 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)
- pythonLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(python_LTLIBRARIES)
-- at WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/libxml2.la
-+ at WITH_PYTHON_TRUE@am__DEPENDENCIES_1 =
- @WITH_PYTHON_TRUE at libxml2mod_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c
- @WITH_PYTHON_TRUE at am_libxml2mod_la_OBJECTS = libxml.lo types.lo \
-@@ -288,7 +288,7 @@
- 	-I$(PYTHON_INCLUDES) \
- 	-I$(top_srcdir)/include
+--- python/Makefile.in.orig	2008-01-22 15:50:22.000000000 -0500
++++ python/Makefile.in	2008-01-22 15:50:22.000000000 -0500
+@@ -313,7 +313,7 @@ INCLUDES = \
+ 	-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)
+@@ -330,7 +330,7 @@ EXTRA_DIST = \
  
--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 at mylibs = \
 - at WITH_PYTHON_TRUE@	$(top_builddir)/libxml2.la
 + at WITH_PYTHON_TRUE@	-lxml2
Index: patch-doc_devhelp_Makefile.in
===================================================================
RCS file: /home/cvs/mports/textproc/libxml2/files/patch-doc_devhelp_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/libxml2/files/patch-doc_devhelp_Makefile.in -L textproc/libxml2/files/patch-doc_devhelp_Makefile.in -u -r1.1 -r1.2
--- textproc/libxml2/files/patch-doc_devhelp_Makefile.in
+++ textproc/libxml2/files/patch-doc_devhelp_Makefile.in
@@ -1,9 +1,9 @@
---- doc/devhelp/Makefile.in.orig	Mon Sep 12 18:42:04 2005
-+++ doc/devhelp/Makefile.in	Mon Sep 12 18:42:20 2005
-@@ -258,7 +258,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- doc/devhelp/Makefile.in.orig	2008-01-22 15:49:34.000000000 -0500
++++ doc/devhelp/Makefile.in	2008-01-22 15:49:58.000000000 -0500
+@@ -259,7 +259,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -DEVHELP_DIR = $(datadir)/gtk-doc/html/libxml2
 +DEVHELP_DIR = $(datadir)/doc/libxml2/html
  HTML_FILES = index.html general.html $(HTML_MODULES)

More information about the Midnightbsd-cvs mailing list