diff options
-rw-r--r-- | textproc/libxml2/Makefile | 4 | ||||
-rw-r--r-- | textproc/libxml2/PLIST | 4 | ||||
-rw-r--r-- | textproc/libxml2/buildlink3.mk | 3 | ||||
-rw-r--r-- | textproc/libxml2/distinfo | 10 | ||||
-rw-r--r-- | textproc/libxml2/patches/patch-aa | 6 | ||||
-rw-r--r-- | textproc/libxml2/patches/patch-ab | 6 | ||||
-rw-r--r-- | textproc/py-libxml2/Makefile | 4 | ||||
-rw-r--r-- | textproc/py-libxml2/distinfo | 8 | ||||
-rw-r--r-- | textproc/py-libxml2/patches/patch-aa | 6 |
9 files changed, 26 insertions, 25 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 08f0269a320..8d9a58e154d 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2004/09/02 11:13:27 jmmv Exp $ +# $NetBSD: Makefile,v 1.59.2.1 2004/11/30 00:04:43 salo Exp $ -DISTNAME= libxml2-2.6.13 +DISTNAME= libxml2-2.6.16 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.6/} EXTRACT_SUFX= .tar.bz2 diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST index b7e02d5217c..f42f34f5e88 100644 --- a/textproc/libxml2/PLIST +++ b/textproc/libxml2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.33 2004/09/02 11:13:27 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.33.2.1 2004/11/30 00:04:43 salo Exp $ bin/xml2-config bin/xmlcatalog bin/xmllint @@ -51,7 +51,7 @@ lib/libxml2.a lib/libxml2.la lib/libxml2.so lib/libxml2.so.8 -lib/libxml2.so.8.13 +lib/libxml2.so.8.16 lib/pkgconfig/libxml-2.0.pc lib/xml2Conf.sh man/man1/xml2-config.1 diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk index 92d7415537c..405b6a6873f 100644 --- a/textproc/libxml2/buildlink3.mk +++ b/textproc/libxml2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4.6.1 2004/11/30 00:04:43 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+ @@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+= libxml2 .if !empty(LIBXML2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.2 +BUILDLINK_RECOMMENDED.libxml2+= libxml2>=2.6.15 BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2 .endif # LIBXML2_BUILDLINK3_MK diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index 69deece9bc2..f8d88e74e18 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.42 2004/09/02 11:13:27 jmmv Exp $ +$NetBSD: distinfo,v 1.42.2.1 2004/11/30 00:04:43 salo Exp $ -SHA1 (libxml2-2.6.13.tar.bz2) = 990700b9c97430cd6d416a1f7a673925d62d99c1 -Size (libxml2-2.6.13.tar.bz2) = 2783813 bytes -SHA1 (patch-aa) = 79ca42b0b78dda1581eb567fd02c77cbd500fe10 -SHA1 (patch-ab) = 90def7e936411ee7a28a51050e43a55d85526935 +SHA1 (libxml2-2.6.16.tar.bz2) = 0bd0e7217f75abadf0b6389c126e63b6c1b7972b +Size (libxml2-2.6.16.tar.bz2) = 3100259 bytes +SHA1 (patch-aa) = dee768bf9ff0fe7de232bcdc4a55bc250ec9ad1a +SHA1 (patch-ab) = d9dd03a12fc53435804e7a163841bc5d834a48b5 diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa index e31c28722ba..dbf3b10302c 100644 --- a/textproc/libxml2/patches/patch-aa +++ b/textproc/libxml2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.17 2004/08/04 11:19:31 wiz Exp $ +$NetBSD: patch-aa,v 1.17.2.1 2004/11/30 00:04:43 salo Exp $ ---- Makefile.in.orig 2004-07-05 19:46:31.000000000 +0200 +--- Makefile.in.orig Wed Nov 10 15:36:58 2004 +++ Makefile.in -@@ -521,7 +521,7 @@ pkgconfig_DATA = libxml-2.0.pc +@@ -538,7 +538,7 @@ pkgconfig_DATA = libxml-2.0.pc # BASE_DIR = $(datadir)/doc DOC_MODULE = libxml2-$(VERSION) diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab index eb8ba17005b..6b5e9534075 100644 --- a/textproc/libxml2/patches/patch-ab +++ b/textproc/libxml2/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.9 2004/08/04 11:20:00 wiz Exp $ +$NetBSD: patch-ab,v 1.9.2.1 2004/11/30 00:04:43 salo Exp $ ---- configure.orig 2004-07-05 19:35:47.000000000 +0200 +--- configure.orig Wed Nov 10 15:33:00 2004 +++ configure -@@ -26250,7 +26250,7 @@ fi +@@ -26449,7 +26449,7 @@ fi fi diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index 0bb5d0bffd9..82d35c13404 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2004/08/24 11:43:32 drochner Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2004/11/30 00:04:43 salo Exp $ -DISTNAME= libxml2-2.6.12 +DISTNAME= libxml2-2.6.16 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.6/} diff --git a/textproc/py-libxml2/distinfo b/textproc/py-libxml2/distinfo index 4f1f56f9a9c..1fb93ab3f4a 100644 --- a/textproc/py-libxml2/distinfo +++ b/textproc/py-libxml2/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2004/08/24 11:43:32 drochner Exp $ +$NetBSD: distinfo,v 1.6.2.1 2004/11/30 00:04:43 salo Exp $ -SHA1 (libxml2-2.6.12.tar.bz2) = c141f9491c03340bd6c72b490f2a2a5840d6a0f4 -Size (libxml2-2.6.12.tar.bz2) = 2773187 bytes -SHA1 (patch-aa) = 8466178808ae179a4e952c7304e1a79b639c8174 +SHA1 (libxml2-2.6.16.tar.bz2) = 0bd0e7217f75abadf0b6389c126e63b6c1b7972b +Size (libxml2-2.6.16.tar.bz2) = 3100259 bytes +SHA1 (patch-aa) = 54ce6f91dd29144f22247d15093d6d273f5f433b diff --git a/textproc/py-libxml2/patches/patch-aa b/textproc/py-libxml2/patches/patch-aa index ff79943d85d..af7fefffdda 100644 --- a/textproc/py-libxml2/patches/patch-aa +++ b/textproc/py-libxml2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/01/04 11:47:17 recht Exp $ +$NetBSD: patch-aa,v 1.1.1.1.6.1 2004/11/30 00:04:43 salo Exp $ ---- libxml.py.orig 2003-12-25 00:17:24.000000000 -0600 +--- libxml.py.orig 2004-09-28 05:59:58.000000000 -0500 +++ libxml.py -@@ -278,7 +278,7 @@ class xmlCore: +@@ -281,7 +281,7 @@ class xmlCore: # defined as python2 properties # import sys |