From: Charlie <root@crater.dragonflybsd.org>
Date: Wed, 10 Mar 2010 15:29:23 +0000 (-0800)
Subject: update Wed Mar 10 06:37:02 PST 2010
X-Git-Url: https://gitweb.dragonflybsd.org/pkgsrc.git/commitdiff_plain/3ee39f79d0df1210d81c51623fcc2f0143620efa

update Wed Mar 10 06:37:02 PST 2010
---

diff --git a/databases/p5-Catalyst-Model-DBIC-Schema/Makefile b/databases/p5-Catalyst-Model-DBIC-Schema/Makefile
index d39c598bf61c..5e3a40dd8149 100644
--- a/databases/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/databases/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2009/11/29 12:28:12 seb Exp $
+# $NetBSD: Makefile,v 1.10 2010/03/10 12:51:06 sno Exp $
 
-DISTNAME=	Catalyst-Model-DBIC-Schema-0.31
+DISTNAME=	Catalyst-Model-DBIC-Schema-0.40
 PKGNAME=	p5-${DISTNAME}
 #PKGREVISION=	1
 CATEGORIES=	www perl5
@@ -13,12 +13,10 @@ LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Carp-Clan-[0-9]*:../../devel/p5-Carp-Clan
 DEPENDS+=	p5-Catalyst-Runtime>=5.80005:../../www/p5-Catalyst-Runtime
-DEPENDS+=	p5-CatalystX-Component-Traits>=0.10:../../www/p5-CatalystX-Component-Traits
-DEPENDS+=	p5-Class-Accessor-Grouped>=0.09000:../../devel/p5-Class-Accessor-Grouped
-DEPENDS+=	p5-DBIx-Class>=0.08111:../../databases/p5-DBIx-Class
+DEPENDS+=	p5-CatalystX-Component-Traits>=0.14:../../www/p5-CatalystX-Component-Traits
+DEPENDS+=	p5-DBIx-Class>=0.08114:../../databases/p5-DBIx-Class
 DEPENDS+=	p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils
-DEPENDS+=	p5-Moose-[0-9]*:../../devel/p5-Moose
-DEPENDS+=	p5-Moose-Autobox-[0-9]*:../../devel/p5-Moose-Autobox
+DEPENDS+=	p5-Moose>=0.90:../../devel/p5-Moose
 DEPENDS+=	p5-MooseX-Types-[0-9]*:../../devel/p5-MooseX-Types
 DEPENDS+=	p5-Tie-IxHash-[0-9]*:../../devel/p5-Tie-IxHash
 DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
@@ -30,8 +28,10 @@ DEPENDS+=	p5-DBIx-Class-Schema-Loader>=0.04005:../../databases/p5-DBIx-Class-Sch
 # Caching support
 DEPENDS+=	p5-DBIx-Class-Cursor-Cached-[0-9]*:../../databases/p5-DBIx-Class-Cursor-Cached
 # Replication Support
-DEPENDS+=	p5-MooseX-AttributeHelpers-[0-9]*:../../devel/p5-MooseX-AttributeHelpers
 DEPENDS+=	p5-Hash-Merge-[0-9]*:../../devel/p5-Hash-Merge
+DEPENDS+=	p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
+
+BUILD_DEPENDS+=	p5-Test-Simple>=0.94:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Catalyst/Model/DBIC/Schema/.packlist
diff --git a/databases/p5-Catalyst-Model-DBIC-Schema/distinfo b/databases/p5-Catalyst-Model-DBIC-Schema/distinfo
index 8de77c125fdf..cb92d587e334 100644
--- a/databases/p5-Catalyst-Model-DBIC-Schema/distinfo
+++ b/databases/p5-Catalyst-Model-DBIC-Schema/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2009/11/29 12:28:12 seb Exp $
+$NetBSD: distinfo,v 1.8 2010/03/10 12:51:06 sno Exp $
 
-SHA1 (Catalyst-Model-DBIC-Schema-0.31.tar.gz) = 94d307d0252a00c14394564127216f82d3365cf7
-RMD160 (Catalyst-Model-DBIC-Schema-0.31.tar.gz) = 61d0f6d79cc94a7d6bf6a58b67aa01026d30e3b7
-Size (Catalyst-Model-DBIC-Schema-0.31.tar.gz) = 44946 bytes
+SHA1 (Catalyst-Model-DBIC-Schema-0.40.tar.gz) = 7ec9e95e275198860ce093b60eb2945cf0feba3a
+RMD160 (Catalyst-Model-DBIC-Schema-0.40.tar.gz) = 54793dc04326becd382c66ca69c4731a412b0179
+Size (Catalyst-Model-DBIC-Schema-0.40.tar.gz) = 44428 bytes
diff --git a/databases/p5-CatalystX-CRUD-ModelAdapter-DBIC/Makefile b/databases/p5-CatalystX-CRUD-ModelAdapter-DBIC/Makefile
index 55a2c089333f..1e609792f9ac 100644
--- a/databases/p5-CatalystX-CRUD-ModelAdapter-DBIC/Makefile
+++ b/databases/p5-CatalystX-CRUD-ModelAdapter-DBIC/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/09/24 06:50:11 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/10 13:03:22 sno Exp $
 
-DISTNAME=	CatalystX-CRUD-ModelAdapter-DBIC-0.10
+DISTNAME=	CatalystX-CRUD-ModelAdapter-DBIC-0.11
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=CatalystX/}
 
diff --git a/databases/p5-CatalystX-CRUD-ModelAdapter-DBIC/distinfo b/databases/p5-CatalystX-CRUD-ModelAdapter-DBIC/distinfo
index d11ca9fc6cbc..6da64e5dfb99 100644
--- a/databases/p5-CatalystX-CRUD-ModelAdapter-DBIC/distinfo
+++ b/databases/p5-CatalystX-CRUD-ModelAdapter-DBIC/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/07/15 06:26:14 sno Exp $
+$NetBSD: distinfo,v 1.4 2010/03/10 13:03:22 sno Exp $
 
-SHA1 (CatalystX-CRUD-ModelAdapter-DBIC-0.10.tar.gz) = 67eeb2a7f56e07e03479798520f16f49c369d4ea
-RMD160 (CatalystX-CRUD-ModelAdapter-DBIC-0.10.tar.gz) = 963364eb2f54aa841cb6e1a145be2c7c07f50bf4
-Size (CatalystX-CRUD-ModelAdapter-DBIC-0.10.tar.gz) = 53818 bytes
+SHA1 (CatalystX-CRUD-ModelAdapter-DBIC-0.11.tar.gz) = ff9e6b57e3b125135ab9fb9d717b4b316c396fb6
+RMD160 (CatalystX-CRUD-ModelAdapter-DBIC-0.11.tar.gz) = 73ae7489f0961735f19760cbf88dbc959610bc3c
+Size (CatalystX-CRUD-ModelAdapter-DBIC-0.11.tar.gz) = 53670 bytes
diff --git a/databases/p5-CatalystX-CRUD/Makefile b/databases/p5-CatalystX-CRUD/Makefile
index 3dffc638b803..5b593fa03936 100644
--- a/databases/p5-CatalystX-CRUD/Makefile
+++ b/databases/p5-CatalystX-CRUD/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/09/24 06:50:11 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/03/10 11:54:04 sno Exp $
 
-DISTNAME=	CatalystX-CRUD-0.45
+DISTNAME=	CatalystX-CRUD-0.48
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=CatalystX/}
 
@@ -13,7 +13,6 @@ LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Catalyst-Component-ACCEPT_CONTEXT>=0.06:../../www/p5-Catalyst-Component-ACCEPT_CONTEXT
 DEPENDS+=	p5-Catalyst-Runtime>=5.80003:../../www/p5-Catalyst-Runtime
-DEPENDS+=	p5-Class-C3>=0.2:../../devel/p5-Class-C3
 DEPENDS+=	p5-Data-Dump-[0-9]*:../../devel/p5-Data-Dump
 DEPENDS+=	p5-Data-Pageset-[0-9]*:../../devel/p5-Data-Pageset
 DEPENDS+=	p5-Moose-[0-9]*:../../devel/p5-Moose
@@ -21,7 +20,7 @@ DEPENDS+=	p5-MooseX-Emulate-Class-Accessor-Fast-[0-9]*:../../devel/p5-MooseX-Emu
 DEPENDS+=	p5-MRO-Compat>=0.1:../../devel/p5-MRO-Compat
 DEPENDS+=	p5-Path-Class-[0-9]*:../../devel/p5-Path-Class
 DEPENDS+=	p5-Search-QueryParser-SQL>=0.005:../../databases/p5-Search-QueryParser-SQL
-DEPENDS+=	p5-Sort-SQL>=0.04:../../databases/p5-Sort-SQL
+DEPENDS+=	p5-Sort-SQL>=0.07:../../databases/p5-Sort-SQL
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/CatalystX/CRUD/.packlist
diff --git a/databases/p5-CatalystX-CRUD/distinfo b/databases/p5-CatalystX-CRUD/distinfo
index b96d530fd2d2..6b863ab0bf5b 100644
--- a/databases/p5-CatalystX-CRUD/distinfo
+++ b/databases/p5-CatalystX-CRUD/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2009/06/15 22:13:54 sno Exp $
+$NetBSD: distinfo,v 1.11 2010/03/10 11:54:04 sno Exp $
 
-SHA1 (CatalystX-CRUD-0.45.tar.gz) = 141d4cb8f12ef7c9705aa99d9aeab1fc545385a2
-RMD160 (CatalystX-CRUD-0.45.tar.gz) = e8ff219c1fbaea37af34feadd9bc95c5de30597f
-Size (CatalystX-CRUD-0.45.tar.gz) = 37426 bytes
+SHA1 (CatalystX-CRUD-0.48.tar.gz) = 7ae5fdcdfd8baf46ae764d94fe0373a82268d570
+RMD160 (CatalystX-CRUD-0.48.tar.gz) = 066deeb510412b43d3d66bed566304ac69ada596
+Size (CatalystX-CRUD-0.48.tar.gz) = 38030 bytes
diff --git a/databases/p5-DBM-Deep/Makefile b/databases/p5-DBM-Deep/Makefile
index 52324e62220f..7ce8c4af55f2 100644
--- a/databases/p5-DBM-Deep/Makefile
+++ b/databases/p5-DBM-Deep/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2010/02/02 21:26:21 seb Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/10 08:46:57 sno Exp $
 
-DISTNAME=	DBM-Deep-1.0015
+DISTNAME=	DBM-Deep-1.0016
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBM/}
@@ -8,6 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBM/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/DBM-Deep/
 COMMENT=	Pure perl multi-level hash/array DBM that supports transactions
+LICENSE=	${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,7 +18,7 @@ PERL5_PACKLIST=	auto/DBM/Deep/.packlist
 BUILD_DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
 BUILD_DEPENDS+=	p5-Test-Deep>=0.095:../../devel/p5-Test-Deep
 BUILD_DEPENDS+=	p5-Test-Exception>=0.21:../../devel/p5-Test-Exception
-BUILD_DEPENDS+= p5-Test-Simple>=0.88:../../devel/p5-Test-Simple
+BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
 BUILD_DEPENDS+=	p5-Test-Warn>=0.08:../../devel/p5-Test-Warn
 
 # for test target
diff --git a/databases/p5-DBM-Deep/distinfo b/databases/p5-DBM-Deep/distinfo
index fbab65c574f3..71134b133c0b 100644
--- a/databases/p5-DBM-Deep/distinfo
+++ b/databases/p5-DBM-Deep/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/02/02 21:26:21 seb Exp $
+$NetBSD: distinfo,v 1.4 2010/03/10 08:46:57 sno Exp $
 
-SHA1 (DBM-Deep-1.0015.tar.gz) = bd7db084ce6117edbed5f82db0a3535b5b07e564
-RMD160 (DBM-Deep-1.0015.tar.gz) = 6e3bbce78157937ea64c122f1529137bc14c0aa0
-Size (DBM-Deep-1.0015.tar.gz) = 151720 bytes
+SHA1 (DBM-Deep-1.0016.tar.gz) = 2ae043df9c8a8c31a8bbe9dd2684eb0a2d725435
+RMD160 (DBM-Deep-1.0016.tar.gz) = 355aa64759a0815381ccce3e69eb582dfed15a6e
+Size (DBM-Deep-1.0016.tar.gz) = 152690 bytes
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index 2325654d1e6f..c9626c5da165 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2010/02/02 22:11:49 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/10 10:02:05 sno Exp $
 
-DISTNAME=	ORLite-1.40
+DISTNAME=	ORLite-1.41
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/A/AD/ADAMK/}
diff --git a/databases/p5-ORLite/distinfo b/databases/p5-ORLite/distinfo
index 5f00fcac3459..14864ea869c8 100644
--- a/databases/p5-ORLite/distinfo
+++ b/databases/p5-ORLite/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/02/02 22:11:49 sno Exp $
+$NetBSD: distinfo,v 1.4 2010/03/10 10:02:05 sno Exp $
 
-SHA1 (ORLite-1.40.tar.gz) = f6e4dc0fe35156ae22a0c433a791c037469f9cce
-RMD160 (ORLite-1.40.tar.gz) = 7ee7e1d27430ebc15c58a1a08ce5a65dd4cb5946
-Size (ORLite-1.40.tar.gz) = 46660 bytes
+SHA1 (ORLite-1.41.tar.gz) = 220d53987cc24cf9264d6e13e39c37f8915f4306
+RMD160 (ORLite-1.41.tar.gz) = 948ef8905f73bc6ef210279f3dc93252113f9987
+Size (ORLite-1.41.tar.gz) = 47482 bytes
diff --git a/devel/libdatrie/Makefile b/devel/libdatrie/Makefile
index b1d1c91121cf..2990dbec9f8c 100644
--- a/devel/libdatrie/Makefile
+++ b/devel/libdatrie/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/10 13:38:07 obache Exp $
 #
 
-DISTNAME=	libdatrie-0.2.2
+DISTNAME=	libdatrie-0.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://linux.thai.net/pub/thailinux/software/libthai/ \
 		ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
diff --git a/devel/libdatrie/distinfo b/devel/libdatrie/distinfo
index 82bb4c99ab6a..88b67149bca8 100644
--- a/devel/libdatrie/distinfo
+++ b/devel/libdatrie/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/05/15 08:52:42 obache Exp $
+$NetBSD: distinfo,v 1.3 2010/03/10 13:38:07 obache Exp $
 
-SHA1 (libdatrie-0.2.2.tar.gz) = 10b04eb93e99a0708012e0dc8f73867e4d1a1f0a
-RMD160 (libdatrie-0.2.2.tar.gz) = 19d001f31c2a97c98127641dca44c20714814c1f
-Size (libdatrie-0.2.2.tar.gz) = 351153 bytes
+SHA1 (libdatrie-0.2.3.tar.gz) = b5cc81aac438b46e6c79178ea069548ff86b38cb
+RMD160 (libdatrie-0.2.3.tar.gz) = de08e964a0c793b9f0b03f16ffd45b7aa0883df2
+Size (libdatrie-0.2.3.tar.gz) = 358424 bytes
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 44b1af2fe2ce..221d38e664d8 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/16 01:21:32 obache Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/10 13:41:37 obache Exp $
 #
 
-DISTNAME=	libthai-0.1.13
+DISTNAME=	libthai-0.1.14
 CATEGORIES=	devel
 MASTER_SITES=	http://linux.thai.net/pub/thailinux/software/libthai/ \
 		ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
diff --git a/devel/libthai/distinfo b/devel/libthai/distinfo
index df401d6dd410..9726e103c784 100644
--- a/devel/libthai/distinfo
+++ b/devel/libthai/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2010/01/16 01:21:32 obache Exp $
+$NetBSD: distinfo,v 1.5 2010/03/10 13:41:37 obache Exp $
 
-SHA1 (libthai-0.1.13.tar.gz) = 8363da6cd2691c854f797113b7c0ebbb77112c00
-RMD160 (libthai-0.1.13.tar.gz) = 5cc72505e084a7a82bec699ecb5a9462645582c1
-Size (libthai-0.1.13.tar.gz) = 503052 bytes
+SHA1 (libthai-0.1.14.tar.gz) = ceee653023bbd87c64f01607d6064ccda8ba3dc0
+RMD160 (libthai-0.1.14.tar.gz) = 77b8c806efc89599a096b4c54c76d5a38b202f05
+Size (libthai-0.1.14.tar.gz) = 503935 bytes
diff --git a/devel/p5-Devel-Declare/Makefile b/devel/p5-Devel-Declare/Makefile
index 6f24f0168af5..162b5dca1c47 100644
--- a/devel/p5-Devel-Declare/Makefile
+++ b/devel/p5-Devel-Declare/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/08/18 17:11:20 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/03/10 09:59:09 sno Exp $
 #
 
-DISTNAME=	Devel-Declare-0.005011
+DISTNAME=	Devel-Declare-0.006000
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Sub-Name-[0-9]*:../../devel/p5-Sub-Name
 
 BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:../../devel/p5-ExtUtils-Depends
 BUILD_DEPENDS+= p5-B-Compiling-[0-9]*:../../devel/p5-B-Compiling # t/lines.t
-BUILD_DEPENDS+=	p5-Test-Simple>=0.88:../../devel/p5-Test-Simple
+BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/devel/p5-Devel-Declare/distinfo b/devel/p5-Devel-Declare/distinfo
index c9ae7476a63d..66003965559a 100644
--- a/devel/p5-Devel-Declare/distinfo
+++ b/devel/p5-Devel-Declare/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2009/08/18 17:11:20 sno Exp $
+$NetBSD: distinfo,v 1.12 2010/03/10 09:59:09 sno Exp $
 
-SHA1 (Devel-Declare-0.005011.tar.gz) = 2ca3a1cf5906c7d834d96838ac305b38ea2ceb86
-RMD160 (Devel-Declare-0.005011.tar.gz) = de2d1c610576dda1e3d89e665fa618f4965fb40a
-Size (Devel-Declare-0.005011.tar.gz) = 44831 bytes
+SHA1 (Devel-Declare-0.006000.tar.gz) = 4a18a944fb12bc6459230d214a00e04e46a11c85
+RMD160 (Devel-Declare-0.006000.tar.gz) = 244916b6be47c0efa152ee0189b5fa6993f6b219
+Size (Devel-Declare-0.006000.tar.gz) = 46255 bytes
 SHA1 (patch-aa) = b96bc8644140eada9b52080c3eb0a4807e167265
diff --git a/devel/p5-Devel-REPL/Makefile b/devel/p5-Devel-REPL/Makefile
index e312ad1660c1..7b2f7ffc8a38 100644
--- a/devel/p5-Devel-REPL/Makefile
+++ b/devel/p5-Devel-REPL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2009/09/24 06:50:12 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/10 13:12:19 sno Exp $
 #
 
-DISTNAME=	Devel-REPL-1.003007
+DISTNAME=	Devel-REPL-1.003009
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
 
@@ -18,7 +18,6 @@ USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Devel/REPL/.packlist
 PERL5_MODULE_TYPE=	Module::Install
 
-DEPENDS+=	p5-Data-Dump-Streamer-[0-9]*:../../devel/p5-Data-Dump-Streamer
 DEPENDS+=	p5-File-HomeDir-[0-9]*:../../devel/p5-File-HomeDir
 DEPENDS+=	p5-Moose>=0.74:../../devel/p5-Moose
 DEPENDS+=	p5-MooseX-AttributeHelpers>=0.16:../../devel/p5-MooseX-AttributeHelpers
@@ -30,10 +29,12 @@ DEPENDS+=	p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
 # Recommended dependencies
 DEPENDS+=	p5-App-Nopaste-[0-9]*:../../www/p5-App-Nopaste
 DEPENDS+=	p5-B-Keywords-[0-9]*:../../devel/p5-B-Keywords
+DEPENDS+=	p5-Data-Dump-Streamer-[0-9]*:../../devel/p5-Data-Dump-Streamer
 DEPENDS+=	p5-File-Next-[0-9]*:../../devel/p5-File-Next
 DEPENDS+=	p5-Lexical-Persistence-[0-9]*:../../devel/p5-Lexical-Persistence
 DEPENDS+=	p5-Module-Refresh-[0-9]*:../../devel/p5-Module-Refresh
 DEPENDS+=	p5-PPI-[0-9]*:../../devel/p5-PPI
+DEPENDS+=	p5-Sys-SigAction-[0-9]*:../../sysutils/p5-Sys-SigAction
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Devel-REPL/distinfo b/devel/p5-Devel-REPL/distinfo
index 8c46d97eeb02..47dd72de3bc2 100644
--- a/devel/p5-Devel-REPL/distinfo
+++ b/devel/p5-Devel-REPL/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2009/07/20 09:38:04 sno Exp $
+$NetBSD: distinfo,v 1.8 2010/03/10 13:12:19 sno Exp $
 
-SHA1 (Devel-REPL-1.003007.tar.gz) = 4f7d7567509742be5cd48e0dc17c67369ebb5e24
-RMD160 (Devel-REPL-1.003007.tar.gz) = cf3c6cd30650686da48f8ff9d3b674e41b74d6c6
-Size (Devel-REPL-1.003007.tar.gz) = 44082 bytes
+SHA1 (Devel-REPL-1.003009.tar.gz) = 78ea103bce1a50ed512f851f9a29a97a82173019
+RMD160 (Devel-REPL-1.003009.tar.gz) = 99a981b6aa3cae430832b01eb52766ce91764b2a
+Size (Devel-REPL-1.003009.tar.gz) = 49226 bytes
diff --git a/devel/p5-MRO-Compat/Makefile b/devel/p5-MRO-Compat/Makefile
index d0bed61a9cb4..a6551ec0a2e9 100644
--- a/devel/p5-MRO-Compat/Makefile
+++ b/devel/p5-MRO-Compat/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/06/13 06:46:45 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/10 11:57:05 sno Exp $
 
 DISTNAME=	MRO-Compat-0.11
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/F/FL/FLORA/}
 
@@ -10,9 +11,6 @@ HOMEPAGE=	http://search.cpan.org/perldoc?MRO::Compat
 COMMENT=	MRO::* interface compatibility for Perls < 5.9.5
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	p5-Class-C3>=0.20:../../devel/p5-Class-C3
-DEPENDS+=	p5-Class-C3-XS>=0:../../devel/p5-Class-C3-XS
-
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/MRO/Compat/.packlist
 
diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index a565c71e6cc7..91fb9d303b25 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/02/16 10:35:49 sno Exp $
+# $NetBSD: Makefile,v 1.39 2010/03/10 08:48:23 sno Exp $
 #
 
-DISTNAME=	Moose-0.98
+DISTNAME=	Moose-0.99
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
diff --git a/devel/p5-Moose/distinfo b/devel/p5-Moose/distinfo
index b1c0ab1ab893..79a1248891ce 100644
--- a/devel/p5-Moose/distinfo
+++ b/devel/p5-Moose/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.34 2010/02/16 10:35:49 sno Exp $
+$NetBSD: distinfo,v 1.35 2010/03/10 08:48:23 sno Exp $
 
-SHA1 (Moose-0.98.tar.gz) = 72b6979a2d435a92c5386f4c4bf335539f781c1b
-RMD160 (Moose-0.98.tar.gz) = 2675765b55958b3902f6ce9df7345845ec0333a1
-Size (Moose-0.98.tar.gz) = 421195 bytes
+SHA1 (Moose-0.99.tar.gz) = 83aed3bacb32c9aa22e50e20670c512374eea8b6
+RMD160 (Moose-0.99.tar.gz) = c0692d756d05eda53f3a7e15a6c3756827c32522
+Size (Moose-0.99.tar.gz) = 421366 bytes
diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010
index 0f2ccc601e67..1e277acd8475 100644
--- a/doc/CHANGES-2010
+++ b/doc/CHANGES-2010
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.1107 2010/03/09 23:21:43 snj Exp $
+$NetBSD: CHANGES-2010,v 1.1135 2010/03/10 14:07:08 obache Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -1310,3 +1310,32 @@ Changes to the packages collection and infrastructure in 2010:
 	Updated www/p5-HTML-Selector-XPath to 0.04 [sno 2010-03-09]
 	Added games/ioquake3-pk3 version 0 [snj 2010-03-09]
 	Added games/tyrquake version 0.61 [snj 2010-03-09]
+	Updated databases/p5-DBM-Deep to 1.0016 [sno 2010-03-10]
+	Updated devel/p5-Moose to 0.99 [sno 2010-03-10]
+	Updated net/p5-Net-Interface to 1.012 [sno 2010-03-10]
+	Updated math/p5-Math-Pari to 2.010806.04 [sno 2010-03-10]
+	Updated time/p5-DateTime-TimeZone to 1.13 [sno 2010-03-10]
+	Updated time/p5-Time-Clock to 1.00 [sno 2010-03-10]
+	Updated devel/p5-Devel-Declare to 0.006000 [sno 2010-03-10]
+	Updated databases/p5-ORLite to 1.41 [sno 2010-03-10]
+	Updated www/p5-Catalyst-Runtime to 5.80021 [sno 2010-03-10]
+	Updated www/p5-Catalyst-Model-Adaptor to 0.08 [sno 2010-03-10]
+	Updated www/p5-Catalyst-View-TT to 0.32 [sno 2010-03-10]
+	Updated www/p5-Catalyst-View-JSON to 0.28 [sno 2010-03-10]
+	Updated www/p5-Catalyst-Manual to 5.8004 [sno 2010-03-10]
+	Updated www/p5-Catalyst-Devel to 1.27 [sno 2010-03-10]
+	Updated www/p5-Catalyst-Action-REST to 0.83 [sno 2010-03-10]
+	Updated www/p5-Catalyst-Authentication-Store-DBIx-Class to 0.1083 [sno 2010-03-10]
+	Updated www/p5-Catalyst-Authentication-Credential-HTTP to 1.012 [sno 2010-03-10]
+	Updated www/p5-Test-WWW-Mechanize-Catalyst to 0.52 [sno 2010-03-10]
+	Updated geography/gdal-lib to 1.7.1 [adam 2010-03-10]
+	Updated databases/p5-CatalystX-CRUD to 0.48 [sno 2010-03-10]
+	Updated devel/p5-MRO-Compat to 0.11nb1 [sno 2010-03-10]
+	Updated databases/p5-Catalyst-Model-DBIC-Schema to 0.40 [sno 2010-03-10]
+	Updated databases/p5-CatalystX-CRUD-ModelAdapter-DBIC to 0.11 [sno 2010-03-10]
+	Updated devel/p5-Devel-REPL to 1.003009 [sno 2010-03-10]
+	Updated devel/libdatrie to 0.2.3 [obache 2010-03-10]
+	Updated devel/libthai to 0.1.14 [obache 2010-03-10]
+	Updated inputmethod/gtk-im-libthai to 0.1.5 [obache 2010-03-10]
+	Updated editors/vim-share to 7.2.391 [martti 2010-03-10]
+	Updated textproc/py-pygments to 1.3.1 [obache 2010-03-10]
diff --git a/doc/TODO b/doc/TODO
index ca8ef25dba9f..2fe643574966 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9118 2010/03/09 22:50:19 gls Exp $
+$NetBSD: TODO,v 1.9119 2010/03/10 11:48:03 adam Exp $
 
 Suggested new packages
 ======================
@@ -651,7 +651,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o gcombust-0.1.55
 	o gcompris-9.0
 	o gcpio-2.10
-	o gdal-lib-1.7.1 [pkg/42891]
 	o gdb-7.0.1
 	o gdeskcal-1.01
 	o gdl-2.28.2 [GNOME 2.28]
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 0e32ff73b6df..5c24cb7636ec 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.136 2010/03/03 16:06:26 martti Exp $
+# $NetBSD: Makefile.common,v 1.137 2010/03/10 14:04:22 martti Exp $
 
 # used by editors/vim/Makefile
 # used by editors/vim-gtk/Makefile
@@ -40,7 +40,7 @@ PATCHFILES+=		7.2.357 7.2.358 7.2.359 7.2.360 7.2.361 7.2.362 7.2.363
 PATCHFILES+=		7.2.364 7.2.365 7.2.366 7.2.367 7.2.368 7.2.369 7.2.370
 PATCHFILES+=		7.2.371 7.2.372 7.2.373 7.2.374 7.2.375 7.2.376 7.2.377
 PATCHFILES+=		7.2.378 7.2.379 7.2.380 7.2.381 7.2.382 7.2.383 7.2.384
-PATCHFILES+=		7.2.385
+PATCHFILES+=		7.2.385 7.2.386 7.2.387 7.2.388 7.2.389 7.2.390 7.2.391
 
 MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.vim.org/
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 58d3e2ab1d04..412897f4d67f 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.124 2010/03/03 16:06:26 martti Exp $
+$NetBSD: distinfo,v 1.125 2010/03/10 14:04:22 martti Exp $
 
 SHA1 (vim7.2/7.2.001-100.gz) = 36c684cca2e78243bc7f0d3418eee8228fad8ec5
 RMD160 (vim7.2/7.2.001-100.gz) = 22df0a2380e486b83ef7406ef684e4ae2125fbba
@@ -264,6 +264,24 @@ Size (vim7.2/7.2.384) = 1849 bytes
 SHA1 (vim7.2/7.2.385) = 702983372e4e7e407cc70e6a132297dab5917fa7
 RMD160 (vim7.2/7.2.385) = af3ddba8c39af1784689d1d2138cf159c4774a9e
 Size (vim7.2/7.2.385) = 2147 bytes
+SHA1 (vim7.2/7.2.386) = af37d4afe3eb5bbd33cee30d8da0f6e26ee50029
+RMD160 (vim7.2/7.2.386) = 725002faeb5eacb9122bb6897533a3bbe0d1fa99
+Size (vim7.2/7.2.386) = 2051 bytes
+SHA1 (vim7.2/7.2.387) = 425ca94964d67d0482b6615649bb762be3d21498
+RMD160 (vim7.2/7.2.387) = de85e4e7c9711f9c76de7b4a6bd13318d42b68ad
+Size (vim7.2/7.2.387) = 8233 bytes
+SHA1 (vim7.2/7.2.388) = 492e9f404c5d63445df093d5cc476ea13c31db4b
+RMD160 (vim7.2/7.2.388) = 920ff634838ccf4cb6aa6cd4deedb0822ab5345f
+Size (vim7.2/7.2.388) = 2486 bytes
+SHA1 (vim7.2/7.2.389) = 78d1e30bc1b6c0dba89778f6c39fc051b7c92783
+RMD160 (vim7.2/7.2.389) = 1431248d48eb5f78070fceb980497343ddedaf19
+Size (vim7.2/7.2.389) = 4805 bytes
+SHA1 (vim7.2/7.2.390) = b033f32a25d05a11dac3dbc6049103e004e05986
+RMD160 (vim7.2/7.2.390) = 944d5341a4a50c5908cfded574b7d419d47a8f15
+Size (vim7.2/7.2.390) = 2302 bytes
+SHA1 (vim7.2/7.2.391) = 0a85f61fc3311ee28d0fe7a625f3164b302408b2
+RMD160 (vim7.2/7.2.391) = 21f0c7a57ac2823be6e58a08565d07359478aed8
+Size (vim7.2/7.2.391) = 3426 bytes
 SHA1 (vim7.2/vim-7.2-extra.tar.gz) = 6a17629093e59958bff336b6c122dea1b8b1b649
 RMD160 (vim7.2/vim-7.2-extra.tar.gz) = 05976466c8a6c1bd2fb2b1d58eb4613947de07df
 Size (vim7.2/vim-7.2-extra.tar.gz) = 720290 bytes
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index 8025f46092b4..921dfdb5cc08 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.77 2010/03/03 16:06:26 martti Exp $
+# $NetBSD: version.mk,v 1.78 2010/03/10 14:04:22 martti Exp $
 
 VIM_VERSION=		7.2
-VIM_PATCHLEVEL=		385
+VIM_PATCHLEVEL=		391
 VIM_SUBDIR=		vim72
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 51f6adb87f7a..1316da2995d0 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2010/02/10 19:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/03/10 11:45:26 adam Exp $
 
-DISTNAME=	gdal-1.6.3
-PKGNAME=	gdal-lib-1.6.3
-PKGREVISION=	3
+DISTNAME=	gdal-1.7.1
+PKGNAME=	gdal-lib-1.7.1
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/gdal/
 
diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST
index 86bd2213549b..710ea61e3678 100644
--- a/geography/gdal-lib/PLIST
+++ b/geography/gdal-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:57:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/03/10 11:45:26 adam Exp $
 bin/gdal-config
 bin/gdal_contour
 bin/gdal_grid
@@ -6,6 +6,7 @@ bin/gdal_rasterize
 bin/gdal_translate
 bin/gdaladdo
 bin/gdalbuildvrt
+bin/gdaldem
 bin/gdalenhance
 bin/gdalinfo
 bin/gdalmanage
@@ -17,7 +18,9 @@ bin/ogr2ogr
 bin/ogrinfo
 bin/ogrtindex
 bin/testepsg
+include/cpl_atomic_ops.h
 include/cpl_config.h
+include/cpl_config_extras.h
 include/cpl_conv.h
 include/cpl_csv.h
 include/cpl_error.h
@@ -32,6 +35,7 @@ include/cpl_odbc.h
 include/cpl_port.h
 include/cpl_quad_tree.h
 include/cpl_string.h
+include/cpl_time.h
 include/cpl_vsi.h
 include/cpl_vsi_virtual.h
 include/cpl_win32ce_api.h
@@ -65,27 +69,6 @@ include/rawdataset.h
 include/thinplatespline.h
 include/vrtdataset.h
 lib/libgdal.la
-man/man1/gdal-config.1
-man/man1/gdal2tiles.1
-man/man1/gdal_contour.1
-man/man1/gdal_grid.1
-man/man1/gdal_merge.1
-man/man1/gdal_rasterize.1
-man/man1/gdal_retile.1
-man/man1/gdal_translate.1
-man/man1/gdal_utilities.1
-man/man1/gdaladdo.1
-man/man1/gdalbuildvrt.1
-man/man1/gdalinfo.1
-man/man1/gdaltindex.1
-man/man1/gdaltransform.1
-man/man1/nearblack.1
-man/man1/ogr2ogr.1
-man/man1/ogr_utilities.1
-man/man1/ogrinfo.1
-man/man1/ogrtindex.1
-man/man1/pct2rgb.1
-man/man1/rgb2pct.1
 share/gdal/GDALLogoBW.svg
 share/gdal/GDALLogoColor.svg
 share/gdal/GDALLogoGS.svg
@@ -102,6 +85,7 @@ share/gdal/gdal_datum.csv
 share/gdal/gdalicon.png
 share/gdal/gt_datum.csv
 share/gdal/gt_ellips.csv
+share/gdal/header.dxf
 share/gdal/pcs.csv
 share/gdal/pcs.override.csv
 share/gdal/prime_meridian.csv
@@ -117,4 +101,5 @@ share/gdal/s57objectclasses_iw.csv
 share/gdal/seed_2d.dgn
 share/gdal/seed_3d.dgn
 share/gdal/stateplane.csv
+share/gdal/trailer.dxf
 share/gdal/unit_of_measure.csv
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 8bd58d1509bb..95b5e50731b4 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2010/01/18 09:36:09 adam Exp $
+$NetBSD: distinfo,v 1.8 2010/03/10 11:45:26 adam Exp $
 
-SHA1 (gdal-1.6.3.tar.gz) = b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f
-RMD160 (gdal-1.6.3.tar.gz) = aab37ae4b7a98f9af6c10511e2ce5205505b9769
-Size (gdal-1.6.3.tar.gz) = 7007613 bytes
-SHA1 (patch-aa) = 8403f7314a5529e0e47877329578a1c94528f326
+SHA1 (gdal-1.7.1.tar.gz) = 1ff42b51f416da966ee25c42631a3faa3cca5d4d
+RMD160 (gdal-1.7.1.tar.gz) = 337502e12e0eb4b5ff5fad806545752e677a4ab8
+Size (gdal-1.7.1.tar.gz) = 7709157 bytes
+SHA1 (patch-aa) = 2c017bda45d4ed4fb10f7e70d33b707ca33149d1
diff --git a/geography/gdal-lib/patches/patch-aa b/geography/gdal-lib/patches/patch-aa
index 4cd9d1fb6649..641631481e0e 100644
--- a/geography/gdal-lib/patches/patch-aa
+++ b/geography/gdal-lib/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2009/06/03 17:28:31 hasso Exp $
+$NetBSD: patch-aa,v 1.4 2010/03/10 11:45:26 adam Exp $
 
---- GNUmakefile.orig	2009-06-03 16:37:58 +0300
-+++ GNUmakefile	2009-06-03 16:38:31 +0300
-@@ -148,7 +148,7 @@ man:
+--- GNUmakefile.orig	2010-02-08 19:52:34.000000000 +0000
++++ GNUmakefile
+@@ -132,7 +132,7 @@ man:
  # Generate man pages
- 	(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps"; echo "FILE_PATTERNS=*utilities.dox gdalwarp.cpp"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen -
+ 	(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=apps swig/python/scripts"; echo "FILE_PATTERNS=*.cpp *.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen -
  
 -all:	default ogr-all
 +all:	default ogr-all man
  
  install-docs:
  	(cd ogr; $(MAKE) install-docs)
-@@ -162,7 +162,7 @@ install-man:
- web-update:	docs
- 	cp html/*.* $(WEB_DIR)
+@@ -147,7 +147,7 @@ web-update:	docs
+ 	cp html/*.* $(INST_HTML)
+ 	(cd ogr; make web-update)
  
 -install:	default install-actions
 +install:	default install-actions install-man
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index f27262c1e5a9..8531f96d27bc 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2010/03/04 08:13:15 obache Exp $
+# $NetBSD: Makefile,v 1.10 2010/03/10 12:35:22 obache Exp $
 #
 
 DISTNAME=	clutter-1.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.clutter-project.org/sources/clutter/1.2/ \
-		${MASTER_SITE_GNOME:=clutter/1.2/}
+		${MASTER_SITE_GNOME:=sources/clutter/1.2/}
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://clutter-project.org/
diff --git a/inputmethod/gtk-im-libthai/Makefile b/inputmethod/gtk-im-libthai/Makefile
index 7a947b9b78ce..4814418e73b5 100644
--- a/inputmethod/gtk-im-libthai/Makefile
+++ b/inputmethod/gtk-im-libthai/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/10 13:51:26 obache Exp $
 #
 
-DISTNAME=	gtk-im-libthai-0.1.4
-PKGREVISION=	1
+DISTNAME=	gtk-im-libthai-0.1.5
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://linux.thai.net/pub/thailinux/software/libthai/ \
 		ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
diff --git a/inputmethod/gtk-im-libthai/distinfo b/inputmethod/gtk-im-libthai/distinfo
index 74813d6b1d8d..146f6c422358 100644
--- a/inputmethod/gtk-im-libthai/distinfo
+++ b/inputmethod/gtk-im-libthai/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/06/01 08:15:36 obache Exp $
+$NetBSD: distinfo,v 1.3 2010/03/10 13:51:27 obache Exp $
 
-SHA1 (gtk-im-libthai-0.1.4.tar.gz) = 8c5a1ccbcca13cba7cf3ecb28ef066c64b1c5945
-RMD160 (gtk-im-libthai-0.1.4.tar.gz) = 8888a03bfbfe5aa69a3266b2c9237272c90e0771
-Size (gtk-im-libthai-0.1.4.tar.gz) = 335954 bytes
-SHA1 (patch-aa) = 3344de0fbf36622058addef5f5a9e9aca499ebbc
+SHA1 (gtk-im-libthai-0.1.5.tar.gz) = c95f4328c9007f871ff7350f70e8b9f0ee862410
+RMD160 (gtk-im-libthai-0.1.5.tar.gz) = a305ca8f0b0078fa7bff476ecc5a2278f731766b
+Size (gtk-im-libthai-0.1.5.tar.gz) = 295900 bytes
+SHA1 (patch-aa) = e2b08918d0859bdecf2bcaeb927ba3126420f224
diff --git a/inputmethod/gtk-im-libthai/patches/patch-aa b/inputmethod/gtk-im-libthai/patches/patch-aa
index 385c5da84605..39776286a5d7 100644
--- a/inputmethod/gtk-im-libthai/patches/patch-aa
+++ b/inputmethod/gtk-im-libthai/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2008/06/01 08:15:36 obache Exp $
+$NetBSD: patch-aa,v 1.2 2010/03/10 13:51:27 obache Exp $
 
---- src/Makefile.in.orig	2006-09-13 03:38:40.000000000 +0000
+Handled by pkgsrc package install script.
+
+--- src/Makefile.in.orig	2009-12-27 05:07:04.000000000 +0000
 +++ src/Makefile.in
-@@ -485,19 +485,7 @@ uninstall-am: uninstall-info-am uninstal
+@@ -542,19 +542,6 @@ uninstall-am: uninstall-moduleLTLIBRARIE
  # Running this if cross compiling or if DESTDIR is set is going to
  # not work at all, so skip it.
  install-data-hook:
@@ -19,7 +21,6 @@ $NetBSD: patch-aa,v 1.1 2008/06/01 08:15:36 obache Exp $
 -	  echo "*** system using gtk-query-immodules-2.0" ; \
 -	  echo "***" ; \
 -        fi
-+
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index e0b2fb75b197..06502d8ad9ce 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/03/08 14:01:21 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/10 12:36:25 obache Exp $
 #
 
 DISTNAME=	vala-0.7.10
 CATEGORIES=	lang gnome
-MASTER_SITES=	http://download.gnome.org/sources/vala/0.7/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vala/0.7/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ahoka@NetBSD.org
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 88da2f5a53ae..da68c0218370 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2010/02/04 02:00:36 joerg Exp $
+# $NetBSD: Makefile,v 1.66 2010/03/10 13:43:38 martti Exp $
 
 DISTNAME=	dspam-3.8.0
 PKGREVISION=	5
@@ -6,9 +6,11 @@ CATEGORIES=	mail
 MASTER_SITES=	http://dspam.nuclearelephant.com/sources/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://dspam.nuclearelephant.com/
+HOMEPAGE=	http://dspam.sourceforge.net/
 COMMENT=	Extremely scalable, statistical-hybrid anti-spam filter
 
+LICENSE=	gnu-gpl-v2
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
@@ -65,15 +67,15 @@ DSPAM_WWWGROUP?=	${APACHE_GROUP}
 PKG_GROUPS_VARS+=	DSPAM_GROUP DSPAM_WWWGROUP
 PKG_USERS_VARS+=	DSPAM_USER DSPAM_WWWUSER
 
-CONFIGURE_ARGS+=	--with-signature-life=${DSPAM_SIGNATURE_LIFE:Q}
-CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME:Q}		\
-			--with-dspam-home-owner=${DSPAM_USER:Q}		\
-			--with-dspam-home-group=${DSPAM_GROUP:Q}	\
-			--with-dspam-owner=${DSPAM_USER:Q}		\
-			--with-dspam-group=${DSPAM_GROUP:Q}		\
-			--with-dspam-mode=${DSPAM_BINMODE:Q}		\
-			--with-logdir=${DSPAM_LOGDIR:Q}			\
-			--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-signature-life=${DSPAM_SIGNATURE_LIFE}
+CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}			\
+			--with-dspam-home-owner=${DSPAM_USER}		\
+			--with-dspam-home-group=${DSPAM_GROUP}		\
+			--with-dspam-owner=${DSPAM_USER}		\
+			--with-dspam-group=${DSPAM_GROUP}		\
+			--with-dspam-mode=${DSPAM_BINMODE}		\
+			--with-logdir=${DSPAM_LOGDIR}			\
+			--sysconfdir=${PKG_SYSCONFDIR}
 
 .include "options.mk"
 .include "../../mk/pthread.buildlink3.mk"
@@ -104,9 +106,9 @@ OWN_DIRS_PERMS=		${DSPAM_HOME} ${DSPAM_USER} ${DSPAM_WWWGROUP} 0775
 OWN_DIRS_PERMS+=	${DSPAM_LOGDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0775
 OWN_DIRS_PERMS+=	${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0770
 
-FILES_SUBST+=		DSPAM_USER=${DSPAM_USER:Q}
-FILES_SUBST+=		DSPAM_GROUP=${DSPAM_GROUP:Q}
-FILES_SUBST+=		DSPAM_PIDDIR=${DSPAM_PIDDIR:Q}
+FILES_SUBST+=		DSPAM_USER=${DSPAM_USER}
+FILES_SUBST+=		DSPAM_GROUP=${DSPAM_GROUP}
+FILES_SUBST+=		DSPAM_PIDDIR=${DSPAM_PIDDIR}
 
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index 6bf7e40e70c3..e4b7a7d7c795 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.32 2009/03/16 18:13:34 adrianp Exp $
+$NetBSD: distinfo,v 1.33 2010/03/10 13:43:38 martti Exp $
 
 SHA1 (dspam-3.8.0.tar.gz) = d1de7ee2134522adaf52f49167accecf1589fa96
 RMD160 (dspam-3.8.0.tar.gz) = e7831e2415e30e819dd9cbc0ba3f269e113e2fb9
 Size (dspam-3.8.0.tar.gz) = 726160 bytes
-SHA1 (patch-aa) = 04e94e3da9de06c15863425d0a827858b5dd4a6c
-SHA1 (patch-ad) = cfa68c01cb3f5ce0556c7a3b008dc214bdfbbd95
+SHA1 (patch-aa) = ff48b3bb84a13f841ee38115377fcb97d03798c0
+SHA1 (patch-ad) = 581ac7b6e01e68474ecf944be8620212d69900b9
 SHA1 (patch-ae) = 21f450dd67dc2101b44f1a952632b933a3c8a913
 SHA1 (patch-af) = 31c86b3f0cb7d7856e46207bee656472fcd093e0
 SHA1 (patch-ag) = d4b1cf206f8113a1150687e2942bd69f0b9767ee
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
index 1b7789f97e40..af4628170f34 100644
--- a/mail/dspam/options.mk
+++ b/mail/dspam/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2009/08/17 19:09:13 sno Exp $
+# $NetBSD: options.mk,v 1.25 2010/03/10 13:43:38 martti Exp $
 
 .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
 DSPAM_DELIVERY_AGENT:=	${DSPAM_DELIVERY_AGENT_ARGS}
@@ -24,11 +24,11 @@ PKG_OPTIONS_LEGACY_OPTS+=	preferences-extension:dspam-preferences-extension
 DSPAM_DELIVERY_AGENT?=		procmail
 BUILD_DEFS+=		DSPAM_DELIVERY_AGENT
 .if !empty(DSPAM_DELIVERY_AGENT:Mprocmail)
-DSPAM_DELIVERY_AGENT_BIN?=	${LOCALBASE}/bin/procmail
+DSPAM_DELIVERY_AGENT_BIN?=	${PREFIX}/bin/procmail
 BUILD_DEPENDS+=		procmail-[0-9]*:../../mail/procmail
 CONFIGURE_ARGS+=	--with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
 .elif !empty(DSPAM_DELIVERY_AGENT:Mmaildrop)
-DSPAM_DELIVERY_AGENT_BIN?=	${LOCALBASE}/bin/maildrop
+DSPAM_DELIVERY_AGENT_BIN?=	${PREFIX}/bin/maildrop
 BUILD_DEPENDS+=		maildrop-[0-9]*:../../mail/maildrop
 CONFIGURE_ARGS+=	--with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
 .elif !empty(DSPAM_DELIVERY_AGENT)
diff --git a/mail/dspam/patches/patch-aa b/mail/dspam/patches/patch-aa
index bed1d6e5fb08..456ec435fee9 100644
--- a/mail/dspam/patches/patch-aa
+++ b/mail/dspam/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2005/10/20 08:33:13 adrianp Exp $
+$NetBSD: patch-aa,v 1.5 2010/03/10 13:43:38 martti Exp $
+
+Make this pkgsrc friendly.
 
 --- src/Makefile.in.orig	2005-10-17 14:07:30.000000000 +0100
 +++ src/Makefile.in
diff --git a/mail/dspam/patches/patch-ad b/mail/dspam/patches/patch-ad
index 892051bdaba1..518a57b94309 100644
--- a/mail/dspam/patches/patch-ad
+++ b/mail/dspam/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2006/05/06 08:36:10 xtraeme Exp $
+$NetBSD: patch-ad,v 1.3 2010/03/10 13:43:38 martti Exp $
+
+Make this pkgsrc friendly.
 
 --- src/dspam.conf.in.orig	2006-02-15 22:06:35.000000000 +0200
 +++ src/dspam.conf.in	2006-05-05 23:44:16.000000000 +0300
diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index 78be6c0c6cc0..9d8ef105b46d 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2010/02/12 18:19:40 sno Exp $
+# $NetBSD: Makefile,v 1.38 2010/03/10 09:24:52 sno Exp $
 #
 
-DISTNAME=		Math-Pari-2.01080603
-PKGNAME=		p5-${DISTNAME:S/01080603/010806.03/}
-PKGREVISION=		1
+DISTNAME=		Math-Pari-2.01080604
+PKGNAME=		p5-${DISTNAME:S/01080604/010806.04/}
+#PKGREVISION=		1
 SVR4_PKGNAME=		p5mpa
 CATEGORIES+=		perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Math/}
diff --git a/math/p5-Math-Pari/distinfo b/math/p5-Math-Pari/distinfo
index 9ad317ea3942..256aedfccea5 100644
--- a/math/p5-Math-Pari/distinfo
+++ b/math/p5-Math-Pari/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/02/06 10:52:37 sno Exp $
+$NetBSD: distinfo,v 1.17 2010/03/10 09:24:52 sno Exp $
 
-SHA1 (Math-Pari-2.01080603.tar.gz) = f8d8a85428886cd682c7672740421d6803dea0fa
-RMD160 (Math-Pari-2.01080603.tar.gz) = 93641a51a2dd1a2f0d9af691da28e7579511bb3b
-Size (Math-Pari-2.01080603.tar.gz) = 121370 bytes
-SHA1 (patch-aa) = c1b4540c29699d99f8f21fcda84a790c1b84bc95
+SHA1 (Math-Pari-2.01080604.tar.gz) = 547474a4ba2c2bb0ca89d34e85ad1e58f2b64873
+RMD160 (Math-Pari-2.01080604.tar.gz) = 05a9ea99adf21a1011c37d0fd4e5caa58b981150
+Size (Math-Pari-2.01080604.tar.gz) = 122339 bytes
+SHA1 (patch-aa) = 3a145ca9bd4bbcbae910a85dd38d985c69b89b17
 SHA1 (patch-ab) = b1e66e636eb823b45dd0c53ab0fa0bdf6472cfff
diff --git a/math/p5-Math-Pari/patches/patch-aa b/math/p5-Math-Pari/patches/patch-aa
index a09e32bfb01b..45fdf2a88f0f 100644
--- a/math/p5-Math-Pari/patches/patch-aa
+++ b/math/p5-Math-Pari/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2010/02/06 10:52:37 sno Exp $
+$NetBSD: patch-aa,v 1.5 2010/03/10 09:24:52 sno Exp $
 
---- Makefile.PL.orig	2009-12-11 01:28:42.000000000 +0000
+--- Makefile.PL.orig	2010-03-03 21:26:10.000000000 +0000
 +++ Makefile.PL
 @@ -2,9 +2,6 @@
  use ExtUtils::MakeMaker;
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/06 10:52:37 sno Exp $
  # Uncomment and change this line if I fail to find it
  # $paridir = "..";
  
-@@ -16,208 +13,54 @@ unless (-t STDOUT) {		# Better reports i
+@@ -16,137 +13,16 @@ unless (-t STDOUT) {		# Better reports i
      select $odef;
  }
  
@@ -81,6 +81,13 @@ $NetBSD: patch-aa,v 1.4 2010/02/06 10:52:37 sno Exp $
 -  ### words, updating to 2.3.* might allow your use of fast processor-specific
 -  ### assembler code.)
 -
+-  ### Switching to 2.3.* should be as simple as giving Makefile.PL an option
+-  ###           version23_ok=1
+-  ###   (if you or Makefile.PL already downloaded-and-extracted version-2.1.* 
+-  ###    distribution, give an extra option, force_download).
+-  ### Alternatively, give option
+-  ###           paridir=DIRECTORY-of-extracted-distribution
+-
 -  ### However, keep in mind: v.2.3.* supports only plotting to PostScript.
 -
 -EOP
@@ -88,15 +95,9 @@ $NetBSD: patch-aa,v 1.4 2010/02/06 10:52:37 sno Exp $
 -  $common::main_paridir = $paridir;
 -  *MY::postamble = \&xMY::postamble;
 -}
-+my $pariprefix;
-+my $addlibs;
-+my $libpari = "pari";
- 
+-
 -$os = $Config{osname};
-+grep {/^pariprefix=(.*)$/i	 and $pariprefix = $1}  @ARGV;
-+grep {/^addlibs=(.*)$/i		 and $addlibs = $1}  @ARGV;
-+grep {/^libpari=(.*)$/i		 and $libpari = $1}  @ARGV;
- 
+-
 -$define .= " -DPARI_VERSION_EXP=$pari_version -DDEBUG_PARI";
 -$define .= " -DUSE_SLOW_ARRAY_ACCESS -DUSE_SLOW_NARGS_ACCESS" if $] >= 5.009;
 -$libs = "-lm";
@@ -123,7 +124,14 @@ $NetBSD: patch-aa,v 1.4 2010/02/06 10:52:37 sno Exp $
 -} elsif ($os eq 'linux') {
 -  $noexp2 = 1;
 -}
--
++my $pariprefix;
++my $addlibs;
++my $libpari = "pari";
++ 
++grep {/^pariprefix=(.*)$/i	 and $pariprefix = $1}  @ARGV;
++grep {/^addlibs=(.*)$/i		 and $addlibs = $1}  @ARGV;
++grep {/^libpari=(.*)$/i		 and $libpari = $1}  @ARGV;
+ 
 -my %opts;
 -unless ($common::parilib) {
 -  build_tests $paridir;		# Convert the test suite
@@ -147,26 +155,16 @@ $NetBSD: patch-aa,v 1.4 2010/02/06 10:52:37 sno Exp $
 -  }
 -}
 +@ARGV = grep !/^((pariprefix|addlibs|libpari)=.*)$/i, @ARGV;
- 
--# We want to find the offset of the least significant byte
--# of SV.flags inside an SV.
--# It is enough to find the offset of the least significant byte inside a U32.
--# (Needed for recognizing Perl code supplied to lisseq and lisexpr.)
 +my $define = "-DPARI_VERSION_EXP=" . get_pari_formatted_version();
  
- $offset = index($Config{byteorder}, "1");
- $offset = 3 if $offset > 3;	# SvFLAGS is actually I32
- $define .= " -DLSB_in_U32=$offset";
+ # We want to find the offset of the least significant byte
+ # of SV.flags inside an SV.
+@@ -164,67 +40,40 @@ my $perl_int_size = $Config{'ivsize'} ||
+ $define .= ' -DLONG_SHORTER_THAN_IV' if $perl_int_size > $longsize;
  
--my $longsize = length(eval { pack 'l!', 1 } or pack 'l', 1);
--my $perl_int_size = $Config{'ivsize'} || $Config{'intsize'}
--	or die "Can't deduce Perl int size";
--
--$define .= ' -DLONG_SHORTER_THAN_IV' if $perl_int_size > $longsize;
--
--$define .= ' -Derr=pari_err'; # On linux it can get a wrong dynamic loading
+ $define .= ' -Derr=pari_err'; # On linux it can get a wrong dynamic loading
 -$define .= ' -DHAVE_LADD' if $opts{have_ladd};
--$define .= ' -DGCC_INLINE' if $Config{gccversion} and not $Config{optimize} =~ /-g\b/;
+ $define .= ' -DGCC_INLINE' if $Config{gccversion} and not $Config{optimize} =~ /-g\b/;
 -$define .= ' -DHAVE_PARIPRIV' if -f "$paridir/src/headers/paripriv.h";
 -#$define .= ' -DNO_GRAPHICS_PARI' unless -f "$paridir/src/graph/plotgnuplot.c";
 -
@@ -177,7 +175,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/06 10:52:37 sno Exp $
 -
 -# This is done in Makefile in GP/PARI, and in paricfg.h without do_configure
 -$define .= ' -DDL_DFLT_NAME=NULL' if $common::do_configure;
--
+ 
 -my $extra_inc = extra_includes($paridir);
 +$define .= " -DNO_HIGHLEVEL_PARI";
  
diff --git a/net/p5-Net-Interface/Makefile b/net/p5-Net-Interface/Makefile
index 56368fc3f44e..3b6892a053e5 100644
--- a/net/p5-Net-Interface/Makefile
+++ b/net/p5-Net-Interface/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/21 13:50:18 sno Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/10 08:55:29 sno Exp $
 
-DISTNAME=	Net-Interface-1.010
+DISTNAME=	Net-Interface-1.012
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
@@ -8,6 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/${DISTNAME}
 COMMENT=	Perl extension to access network interfaces
+LICENSE=	${PERL5_LICENSE}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -17,7 +18,7 @@ PERL5_PACKLIST=		auto/Net/Interface/.packlist
 REPLACE_PERL+=		inst/netsymbols.pl
 
 pre-configure:
-	@${FIND} ${WRKSRC} -name '*.orig' -print -type f | ${XARGS} ${RM} -f
+	${FIND} ${WRKSRC} -name '*.orig' -print -type f | ${XARGS} ${RM} -f
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net-Interface/distinfo b/net/p5-Net-Interface/distinfo
index ce64d065a3ab..b32b7be9e8ce 100644
--- a/net/p5-Net-Interface/distinfo
+++ b/net/p5-Net-Interface/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/03/21 13:50:18 sno Exp $
+$NetBSD: distinfo,v 1.2 2010/03/10 08:55:29 sno Exp $
 
-SHA1 (Net-Interface-1.010.tar.gz) = 6328db6d706c28f974c1a3a6a3a629e8c9818dc7
-RMD160 (Net-Interface-1.010.tar.gz) = f9b5059c8b8a0da4c16d0a8e346d81abb239439c
-Size (Net-Interface-1.010.tar.gz) = 173123 bytes
-SHA1 (patch-aa) = 94ffbe6a6a27f73c9524ab66cd66afde53a615ce
+SHA1 (Net-Interface-1.012.tar.gz) = 2567ccd68128b851e4fe7b186a5a4308f47646a5
+RMD160 (Net-Interface-1.012.tar.gz) = 39171b79699db38db2ad75f3740c0150022bc679
+Size (Net-Interface-1.012.tar.gz) = 173350 bytes
diff --git a/net/p5-Net-Interface/patches/patch-aa b/net/p5-Net-Interface/patches/patch-aa
deleted file mode 100644
index 22f122f6846c..000000000000
--- a/net/p5-Net-Interface/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/03/21 13:50:18 sno Exp $
-
---- inst/netsymbols.pl.orig	2009-03-21 13:27:00.000000000 +0000
-+++ inst/netsymbols.pl	2009-03-21 13:29:41.000000000 +0000
-@@ -281,8 +281,8 @@
- |;
- ### populate exports
- 
--print NFe q|#!/usr/bin/perl
--#
-+print NFe "#!$^X\n";
-+print NFe q|#
- # DO NOT ALTER THIS FILE
- # IT IS WRITTEN BY Makefile.PL and inst/netsymbols.pl
- # EDIT THOSE INSTEAD
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index e159452fab7d..a39d85c74691 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2009/05/19 08:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/03/10 12:54:27 obache Exp $
 
 DISTNAME=		nntpcache-3.0.2
 PKGREVISION=		1
@@ -10,6 +10,8 @@ HOMEPAGE=		http://iq.org/~proff/nntpcache.org/
 COMMENT=		NNTP multi-server caching daemon
 LICENSE=		nntpcache-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 NNTPCACHE_USER?=	news
diff --git a/news/nntpcache/distinfo b/news/nntpcache/distinfo
index a5655e54664a..6a6f828a9bed 100644
--- a/news/nntpcache/distinfo
+++ b/news/nntpcache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/10/17 20:28:01 schwarz Exp $
+$NetBSD: distinfo,v 1.7 2010/03/10 12:54:27 obache Exp $
 
 SHA1 (nntpcache-3.0.2.tar.gz) = f4c9916040422e7232971a0098d0b29fe947ac14
 RMD160 (nntpcache-3.0.2.tar.gz) = 03c191fbedd9325c12033493d57e01b5c5ecd5a9
@@ -9,3 +9,9 @@ SHA1 (patch-ac) = 74f4e3ec58342e9d689768baf31e251e568f2db6
 SHA1 (patch-ad) = 060112715712bcdbcd052cd9d7557a558518c305
 SHA1 (patch-ae) = 18e60bc8822be64f76348d9fbee7bd406eae5106
 SHA1 (patch-af) = 12e1d4d4344c71391784417e830b2037f69e1af8
+SHA1 (patch-ag) = cb57d850aea3656020e9644d03475b114deee52f
+SHA1 (patch-ah) = 6bce71dca150248e06531fa643d7d99c89be0162
+SHA1 (patch-ai) = 1f0932b40c5086c24e982210b016feece2445502
+SHA1 (patch-aj) = fe9cdde25e373ac15b0d34e072bea0dd5a66fab7
+SHA1 (patch-ak) = ce93c536ef92ee75243f825fa45e9f2647a569e1
+SHA1 (patch-al) = ab9046ad74ee1a834ddcc5ac601d03aa2eef1d84
diff --git a/news/nntpcache/patches/patch-ag b/news/nntpcache/patches/patch-ag
new file mode 100644
index 000000000000..5fce3eab3eb0
--- /dev/null
+++ b/news/nntpcache/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1 2010/03/10 12:54:27 obache Exp $
+
+pkgsrc take care permissons for directories and files.
+need to user-destdir installation.
+
+--- cf/Makefile.in.orig	2006-03-05 21:49:25.000000000 +0000
++++ cf/Makefile.in
+@@ -271,15 +271,11 @@ VERSION:
+ 	echo @VERSION@ >$@
+ 
+ install-data-hook:
+-	for f in $(distf); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
++	for f in $(distf); do { cd $(DESTDIR)$(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
+ 
+ nntpcache.config-dist : nnconf.cf
+ 	sed -e 's/^ *[a-zA-Z_][a-zA-Z_]* //;s/"//g' <nnconf.cf >$@
+ 
+-# this is ugly, but more flexible than merely redefining INSTALL_DATA
+-install-data-local:
+-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+-	cd $(localstatedir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(localstate_DATA) && chown @nntpcacheUID@ $(localstate_DATA) && chgrp @nntpcacheGID@ $(localstate_DATA)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/news/nntpcache/patches/patch-ah b/news/nntpcache/patches/patch-ah
new file mode 100644
index 000000000000..5e1c66533421
--- /dev/null
+++ b/news/nntpcache/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2010/03/10 12:54:27 obache Exp $
+
+destdir installation support
+
+--- src/Makefile.in.orig	2010-03-10 12:15:22.000000000 +0000
++++ src/Makefile.in
+@@ -454,7 +454,7 @@ uninstall-am: uninstall-info-am uninstal
+ 
+ 
+ install-exec-hook:
+-	cp nntpcached $(libexecdir)/nntpcached.debug && chmod a+x $(libexecdir)/nntpcached.debug
++	cp nntpcached $(DESTDIR)$(libexecdir)/nntpcached.debug && chmod a+x $(DESTDIR)$(libexecdir)/nntpcached.debug
+ 
+ nnconf.c nnconf.h : ../cf/nnconf.cf
+ 	$(top_srcdir)/confused/confused $<
diff --git a/news/nntpcache/patches/patch-ai b/news/nntpcache/patches/patch-ai
new file mode 100644
index 000000000000..5483b24ada9e
--- /dev/null
+++ b/news/nntpcache/patches/patch-ai
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1 2010/03/10 12:54:27 obache Exp $
+
+pkgsrc take care permissons for directories and files.
+need to user-destdir installation.
+
+--- http/Makefile.in.orig	2010-03-10 12:20:48.000000000 +0000
++++ http/Makefile.in
+@@ -216,10 +216,8 @@ uninstall-am: uninstall-info-am
+ 
+ 
+ install-data-local:
+-	-mkdir $(sysconfdir)/http
+-	cp $(httpdata) $(sysconfdir)/http
+-	cd $(sysconfdir)/http && chown @nntpcacheUID@ $(ch)
+-	cd $(sysconfdir)/http && chgrp @nntpcacheUID@ $(ch)
++	-mkdir $(DESTDIR)$(sysconfdir)/http
++	cp $(httpdata) $(DESTDIR)$(sysconfdir)/http
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/news/nntpcache/patches/patch-aj b/news/nntpcache/patches/patch-aj
new file mode 100644
index 000000000000..5fef5a3988d1
--- /dev/null
+++ b/news/nntpcache/patches/patch-aj
@@ -0,0 +1,19 @@
+$NetBSD: patch-aj,v 1.1 2010/03/10 12:54:27 obache Exp $
+
+pkgsrc take care permissons for directories and files.
+need to user-destdir installation.
+
+--- pgp/Makefile.in.orig	2010-03-10 12:26:40.000000000 +0000
++++ pgp/Makefile.in
+@@ -236,10 +236,9 @@ uninstall-am: uninstall-info-am uninstal
+ 
+ # the trailing slash is to force symlink transversal
+ install-data-local:
+-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+ 
+ install-data-hook:
+-	for f in $(sysconf_DATA); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
++	for f in $(sysconf_DATA); do { cd $(DESTDIR)$(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/news/nntpcache/patches/patch-ak b/news/nntpcache/patches/patch-ak
new file mode 100644
index 000000000000..60d6ca8eab1e
--- /dev/null
+++ b/news/nntpcache/patches/patch-ak
@@ -0,0 +1,19 @@
+$NetBSD: patch-ak,v 1.1 2010/03/10 12:54:27 obache Exp $
+
+pkgsrc take care permissons for directories and files.
+need to user-destdir installation.
+
+--- innreport/Makefile.in.orig	2010-03-10 12:26:40.000000000 +0000
++++ innreport/Makefile.in
+@@ -265,10 +265,7 @@ uninstall-am: uninstall-info-am uninstal
+ 
+ # the trailing slash is to force symlink transversal
+ install-data-local:
+-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+-	-mkdir $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
+-	chown @nntpcacheUID@ $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
+-	chgrp @nntpcacheGID@ $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
++	-mkdir $(DESTDIR)$(sysconfdir)/http $(DESTDIR)$(sysconfdir)/http/innreport $(DESTDIR)$(sysconfdir)/http/innreport/pics
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/news/nntpcache/patches/patch-al b/news/nntpcache/patches/patch-al
new file mode 100644
index 000000000000..e8994e741d80
--- /dev/null
+++ b/news/nntpcache/patches/patch-al
@@ -0,0 +1,17 @@
+$NetBSD: patch-al,v 1.1 2010/03/10 12:54:27 obache Exp $
+
+pkgsrc take care permissons for directories and files.
+need to user-destdir installation.
+
+--- unixauth/Makefile.in.orig	2010-03-10 12:26:40.000000000 +0000
++++ unixauth/Makefile.in
+@@ -327,9 +327,6 @@ uninstall-am: uninstall-info-am uninstal
+ 
+ 
+ install-exec-hook:
+-	chown root $(libexecdir)/unixauth
+-	chgrp @nntpcacheGID@ $(libexecdir)/unixauth
+-	chmod u+s,g+x,o-x $(libexecdir)/unixauth 
+ 
+ %.ext : %.c %.h $(top_srcdir)/config.h $(top_srcdir)/scripts/genextern.sh
+ 	CPP="$(CPP)";export CPP; sh $(top_srcdir)/scripts/genextern.sh $< > $@.tmp $(DEFS) $(INCLUDES) $(CPPFLAGS) && mv -f $@.tmp $@ || rm -f $@.tmp
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index c6425e695683..5307b35d940b 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.821 2009/11/20 12:02:33 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.822 2010/03/10 14:42:22 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -3146,6 +3146,15 @@ sub parse_mk_cond($$) {
 	}
 }
 
+sub parse_licenses($) {
+	my ($licenses) = @_;
+
+	# XXX: this is clearly cheating
+	$licenses =~ s,[()]|AND|OR,,g;
+	my @licenses = split(/\s+/, $licenses);
+	return \@licenses;
+}
+
 # This procedure fills in the extra fields of a line, depending on the
 # line type. These fields can later be queried without having to parse
 # them again and again.
@@ -5107,18 +5116,21 @@ sub checkline_mk_vartype_basic($$$$$$$$) {
 			shareware
 		));
 
-		my $license_file = "${cwd_pkgsrcdir}/licenses/${value}";
-		if (defined($pkgctx_vardef) && exists($pkgctx_vardef->{"LICENSE_FILE"})) {
-			my $license_file_line = $pkgctx_vardef->{"LICENSE_FILE"};
+		my $licenses = parse_licenses($value);
+		foreach my $license (@$licenses) {
+			my $license_file = "${cwd_pkgsrcdir}/licenses/${license}";
+			if (defined($pkgctx_vardef) && exists($pkgctx_vardef->{"LICENSE_FILE"})) {
+				my $license_file_line = $pkgctx_vardef->{"LICENSE_FILE"};
 
-			$license_file = "${current_dir}/" . resolve_relative_path($license_file_line->get("value"), false);
-		}
-		if (!-f $license_file) {
-			$line->log_warning("License file ".normalize_pathname($license_file)." does not exist.");
-		}
+				$license_file = "${current_dir}/" . resolve_relative_path($license_file_line->get("value"), false);
+			}
+			if (!-f $license_file) {
+				$line->log_warning("License file ".normalize_pathname($license_file)." does not exist.");
+			}
 
-		if (exists(deprecated_licenses->{$value})) {
-			$line->log_warning("License ${value} is deprecated.");
+			if (exists(deprecated_licenses->{$license})) {
+				$line->log_warning("License ${license} is deprecated.");
+			}
 		}
 
 	} elsif ($type eq "Mail_Address") {
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 8d7c994cf258..6ea0d88687ca 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/02/11 12:57:38 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/10 14:06:55 obache Exp $
 #
 
-DISTNAME=	Pygments-1.2.2
+DISTNAME=	Pygments-1.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
 MASTER_SITES=	http://pypi.python.org/packages/source/P/Pygments/
@@ -9,7 +9,7 @@ MASTER_SITES=	http://pypi.python.org/packages/source/P/Pygments/
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://pygments.org/
 COMMENT=	Python syntax highlighter
-LICENSE=	modified-bsd
+LICENSE=	2-clause-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/textproc/py-pygments/PLIST b/textproc/py-pygments/PLIST
index 697d8e02b6f8..979319243e63 100644
--- a/textproc/py-pygments/PLIST
+++ b/textproc/py-pygments/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2010/02/11 12:57:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/03/10 14:06:55 obache Exp $
 bin/pygmentize
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pygments/__init__.py
diff --git a/textproc/py-pygments/distinfo b/textproc/py-pygments/distinfo
index 9388222238f4..ec6ecdaa9d85 100644
--- a/textproc/py-pygments/distinfo
+++ b/textproc/py-pygments/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2010/02/11 12:57:38 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/03/10 14:06:55 obache Exp $
 
-SHA1 (Pygments-1.2.2.tar.gz) = de191db0227a7cae76593228749b78f9d19b2d7f
-RMD160 (Pygments-1.2.2.tar.gz) = 08b82db9736e9be2e4425ce4af228e7d1dc19bcd
-Size (Pygments-1.2.2.tar.gz) = 1019873 bytes
+SHA1 (Pygments-1.3.1.tar.gz) = 947f90c5f71e83ec68161b33204b860a4cfd0742
+RMD160 (Pygments-1.3.1.tar.gz) = f5c6ea125a5faa4eef9ead232cae698cdf080d5a
+Size (Pygments-1.3.1.tar.gz) = 1052676 bytes
diff --git a/time/p5-DateTime-TimeZone/Makefile b/time/p5-DateTime-TimeZone/Makefile
index bd136ead2231..bc44ed8cb81b 100644
--- a/time/p5-DateTime-TimeZone/Makefile
+++ b/time/p5-DateTime-TimeZone/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2010/03/08 16:43:34 sno Exp $
+# $NetBSD: Makefile,v 1.29 2010/03/10 09:27:55 sno Exp $
 
-DISTNAME=	DateTime-TimeZone-1.11
+DISTNAME=	DateTime-TimeZone-1.13
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	time perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DateTime/}
diff --git a/time/p5-DateTime-TimeZone/distinfo b/time/p5-DateTime-TimeZone/distinfo
index 7c62d578eff5..4847759f2e61 100644
--- a/time/p5-DateTime-TimeZone/distinfo
+++ b/time/p5-DateTime-TimeZone/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.24 2010/03/08 16:43:34 sno Exp $
+$NetBSD: distinfo,v 1.25 2010/03/10 09:27:55 sno Exp $
 
-SHA1 (DateTime-TimeZone-1.11.tar.gz) = ff6af774e3a5738d5019d7c1f9c0ce9b291bd29e
-RMD160 (DateTime-TimeZone-1.11.tar.gz) = 07f492aa4d501ec6b8c221f3254cb7f5bf5701c1
-Size (DateTime-TimeZone-1.11.tar.gz) = 534816 bytes
+SHA1 (DateTime-TimeZone-1.13.tar.gz) = 6cc267e623a279c4cbc160aed4971dc634df09aa
+RMD160 (DateTime-TimeZone-1.13.tar.gz) = 6e391beda4a8dd58323dacf404eb76e1c03fb3dc
+Size (DateTime-TimeZone-1.13.tar.gz) = 534431 bytes
diff --git a/time/p5-Time-Clock/Makefile b/time/p5-Time-Clock/Makefile
index 66a39b0d30ad..8b3f90d4b416 100644
--- a/time/p5-Time-Clock/Makefile
+++ b/time/p5-Time-Clock/Makefile
@@ -1,19 +1,23 @@
-# $NetBSD: Makefile,v 1.3 2008/10/19 19:19:01 he Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/10 09:48:06 sno Exp $
 
-DISTNAME=	Time-Clock-0.12
+DISTNAME=	Time-Clock-1.00
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	time perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Time/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Time-Clock/
 COMMENT=	Twenty-four hour clock object with nanosecond precision
+LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=		auto/Time/Clock/.packlist
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+post-extract:
+	${FIND} ${WRKSRC} -name "*.pm" -type f -exec ${CHMOD} -x {} \;
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-Time-Clock/distinfo b/time/p5-Time-Clock/distinfo
index d7449c2a4b7f..790b33ea634c 100644
--- a/time/p5-Time-Clock/distinfo
+++ b/time/p5-Time-Clock/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/05/28 21:06:34 abs Exp $
+$NetBSD: distinfo,v 1.3 2010/03/10 09:48:06 sno Exp $
 
-SHA1 (Time-Clock-0.12.tar.gz) = e76ef505693ee00aa69ae24086548500ade04ed3
-RMD160 (Time-Clock-0.12.tar.gz) = a0f9e87da69112a788b290164bb12cf5ca9c6af0
-Size (Time-Clock-0.12.tar.gz) = 7756 bytes
+SHA1 (Time-Clock-1.00.tar.gz) = a7fec392de62a290bed3277d5e3ec180ff9fece2
+RMD160 (Time-Clock-1.00.tar.gz) = d3ea95155f5b74b5ecbfedd74b942da0c4b1b4ca
+Size (Time-Clock-1.00.tar.gz) = 8329 bytes
diff --git a/wip/opensips/Makefile b/wip/opensips/Makefile
index 4c8ef9796738..44731e81fcea 100644
--- a/wip/opensips/Makefile
+++ b/wip/opensips/Makefile
@@ -20,6 +20,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CHECK_INTERPRETER_SKIP+=lib/opensips/opensipsctl/dbtextdb/dbtextdb.py
 REPLACE_PERL+=		scripts/osipsconsole
 
+PKG_SYSCONFSUBDIR=	opensips
+OWN_DIRS=		${EGDIR} ${PKG_SYSCONFDIR}
+EGDIR=			${PREFIX}/share/examples/opensips
+CONF_FILES+=		${EGDIR}/opensips.cfg ${PKG_SYSCONFDIR}/opensips.cf
+CONF_FILES+=		${EGDIR}/opensipsctlrc ${PKG_SYSCONFDIR}/opensipsctlrc
+CONF_FILES+=		${EGDIR}/osipsconsolerc ${PKG_SYSCONFDIR}/osipsconsolerc
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/wip/opensips/PLIST b/wip/opensips/PLIST
index 817218f50790..7938daaf25ea 100644
--- a/wip/opensips/PLIST
+++ b/wip/opensips/PLIST
@@ -1,7 +1,4 @@
 @comment $NetBSD$
-etc/opensips/opensips.cfg
-etc/opensips/opensipsctlrc
-etc/opensips/osipsconsolerc
 lib/opensips/modules/acc.so
 lib/opensips/modules/alias_db.so
 lib/opensips/modules/auth.so
@@ -157,6 +154,9 @@ share/doc/opensips/README.uri
 share/doc/opensips/README.userblacklist
 share/doc/opensips/README.usrloc
 share/doc/opensips/README.xlog
+share/examples/opensips/opensips.cfg
+share/examples/opensips/opensipsctlrc
+share/examples/opensips/osipsconsolerc
 share/opensips/dbtext/opensips/acc
 share/opensips/dbtext/opensips/active_watchers
 share/opensips/dbtext/opensips/address
diff --git a/wip/opensips/TODO b/wip/opensips/TODO
deleted file mode 100644
index b971be2e3827..000000000000
--- a/wip/opensips/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- CONF_FILES
diff --git a/wip/opensips/distinfo b/wip/opensips/distinfo
index c8a302f7e1d7..0cf09eaad2e2 100644
--- a/wip/opensips/distinfo
+++ b/wip/opensips/distinfo
@@ -5,4 +5,4 @@ RMD160 (opensips-1.6.1-tls_src.tar.gz) = 9be4141e076fe7b668e991fa2e7ff49683732d7
 Size (opensips-1.6.1-tls_src.tar.gz) = 4179651 bytes
 SHA1 (patch-aa) = 63db8337190813bb8c2e3f17669f6654735375f2
 SHA1 (patch-ab) = 92c03c4857925f0111021110164a3e69ac7ee70c
-SHA1 (patch-ac) = 9e1097cec4dfa6a89890e988a74f3c5360b02a0f
+SHA1 (patch-ac) = e2d48aa2d6d692532ab7086b56d1dd7479718e57
diff --git a/wip/opensips/patches/patch-ac b/wip/opensips/patches/patch-ac
index 03d3a5b8b506..e05200bb1176 100644
--- a/wip/opensips/patches/patch-ac
+++ b/wip/opensips/patches/patch-ac
@@ -2,8 +2,17 @@ $NetBSD$
 
 Added DESTDIR support.
 
---- Makefile.defs.orig	2010-01-31 14:59:25.000000000 +0200
-+++ Makefile.defs	2010-01-31 15:03:56.000000000 +0200
+--- Makefile.defs.orig	2009-12-21 20:19:38.000000000 +0200
++++ Makefile.defs	2010-03-10 14:34:46.000000000 +0200
+@@ -157,7 +157,7 @@
+ SYSBASE ?= /usr
+ 
+ # dirs 
+-cfg-dir = etc/$(MAIN_NAME)/
++cfg-dir = share/examples/$(MAIN_NAME)/
+ bin-dir = sbin/
+ 
+ ARCH_B = $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
 @@ -227,8 +227,6 @@
  endif
  
diff --git a/wip/py-pip/Makefile b/wip/py-pip/Makefile
index 766ed9f7ea77..a98dda12635f 100644
--- a/wip/py-pip/Makefile
+++ b/wip/py-pip/Makefile
@@ -4,7 +4,7 @@
 DISTNAME=	pip-0.6.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	http://pypi.python.org/packages/source/d/dexml/
+MASTER_SITES=	http://pypi.python.org/packages/source/p/pip/
 
 MAINTAINER=	wenheping@gmail.com
 HOMEPAGE=	http://pip.openplans.org/
diff --git a/www/p5-Catalyst-Action-REST/Makefile b/www/p5-Catalyst-Action-REST/Makefile
index f19d32b10901..df36f60494e7 100644
--- a/www/p5-Catalyst-Action-REST/Makefile
+++ b/www/p5-Catalyst-Action-REST/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2010/02/02 11:43:13 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/10 11:02:23 sno Exp $
 
-DISTNAME=	Catalyst-Action-REST-0.81
+DISTNAME=	Catalyst-Action-REST-0.83
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
diff --git a/www/p5-Catalyst-Action-REST/distinfo b/www/p5-Catalyst-Action-REST/distinfo
index 023b96a12a8a..984c25cf7162 100644
--- a/www/p5-Catalyst-Action-REST/distinfo
+++ b/www/p5-Catalyst-Action-REST/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2010/02/02 11:43:13 sno Exp $
+$NetBSD: distinfo,v 1.5 2010/03/10 11:02:23 sno Exp $
 
-SHA1 (Catalyst-Action-REST-0.81.tar.gz) = 405ff459c5cb655f7dd0b07038ba6783500b5394
-RMD160 (Catalyst-Action-REST-0.81.tar.gz) = 93ba34347c824559d04651955cfd4e97d7812208
-Size (Catalyst-Action-REST-0.81.tar.gz) = 51971 bytes
+SHA1 (Catalyst-Action-REST-0.83.tar.gz) = a34be0624e95d1c01862304ee132bbb578da86d9
+RMD160 (Catalyst-Action-REST-0.83.tar.gz) = 53dd7e934a931d0bd4c91f3d777f6fc5a7afdba4
+Size (Catalyst-Action-REST-0.83.tar.gz) = 57116 bytes
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
index 6df08f9edbe6..a40fa0e357d4 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/01/27 09:25:56 sno Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/10 11:13:09 sno Exp $
 
-DISTNAME=	Catalyst-Authentication-Credential-HTTP-1.011
+DISTNAME=	Catalyst-Authentication-Credential-HTTP-1.012
 PKGNAME=	p5-${DISTNAME}
 #PKGREVISION=	1
 CATEGORIES=	www perl5
@@ -22,7 +22,7 @@ BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 BUILD_DEPENDS+=	p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject
 
 PERL5_PACKLIST= 	auto/Catalyst/Authentication/Credential/HTTP/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo b/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo
index 3327b7963b20..c1c90ac0c9db 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/01/27 09:25:56 sno Exp $
+$NetBSD: distinfo,v 1.2 2010/03/10 11:13:09 sno Exp $
 
-SHA1 (Catalyst-Authentication-Credential-HTTP-1.011.tar.gz) = cf9499d7a900a007cb3c7f867b799815281b626b
-RMD160 (Catalyst-Authentication-Credential-HTTP-1.011.tar.gz) = 0d2ef13cdb938928bef6f366842cb069ee5c0bfc
-Size (Catalyst-Authentication-Credential-HTTP-1.011.tar.gz) = 32060 bytes
+SHA1 (Catalyst-Authentication-Credential-HTTP-1.012.tar.gz) = 1fcc9372fcd7e254d0c7450060dc0b3c68975985
+RMD160 (Catalyst-Authentication-Credential-HTTP-1.012.tar.gz) = cb48382549cca41789845601f2a8e15f425549e6
+Size (Catalyst-Authentication-Credential-HTTP-1.012.tar.gz) = 33192 bytes
diff --git a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
index d77801b7e8e5..5f8baaa6f82b 100644
--- a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 08:47:25 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/10 11:10:13 sno Exp $
 
-DISTNAME=	Catalyst-Authentication-Store-DBIx-Class-0.1082
+DISTNAME=	Catalyst-Authentication-Store-DBIx-Class-0.1083
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
diff --git a/www/p5-Catalyst-Authentication-Store-DBIx-Class/distinfo b/www/p5-Catalyst-Authentication-Store-DBIx-Class/distinfo
index 9dbc36116f1d..dbb538af11b8 100644
--- a/www/p5-Catalyst-Authentication-Store-DBIx-Class/distinfo
+++ b/www/p5-Catalyst-Authentication-Store-DBIx-Class/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/11/10 22:41:10 rhaen Exp $
+$NetBSD: distinfo,v 1.3 2010/03/10 11:10:13 sno Exp $
 
-SHA1 (Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz) = ea63d54c6c5a5a1224d2913a795c68b537ea3733
-RMD160 (Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz) = f30a43d67abf92aaeae78eb534ab9611e28ee010
-Size (Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz) = 38020 bytes
+SHA1 (Catalyst-Authentication-Store-DBIx-Class-0.1083.tar.gz) = 05257d9b1ea0d332563c9a373ea3c0c3468f1bca
+RMD160 (Catalyst-Authentication-Store-DBIx-Class-0.1083.tar.gz) = 84f13728abbbb15f9db4c2847290b20843b1e3f4
+Size (Catalyst-Authentication-Store-DBIx-Class-0.1083.tar.gz) = 38926 bytes
diff --git a/www/p5-Catalyst-Devel/Makefile b/www/p5-Catalyst-Devel/Makefile
index e9d9b4b0612c..22a7179bbb11 100644
--- a/www/p5-Catalyst-Devel/Makefile
+++ b/www/p5-Catalyst-Devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2010/01/16 18:17:37 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/03/10 10:58:57 sno Exp $
 
-DISTNAME=	Catalyst-Devel-1.26
+DISTNAME=	Catalyst-Devel-1.27
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
diff --git a/www/p5-Catalyst-Devel/distinfo b/www/p5-Catalyst-Devel/distinfo
index 536133632d0c..f4b1728b74c1 100644
--- a/www/p5-Catalyst-Devel/distinfo
+++ b/www/p5-Catalyst-Devel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2010/01/16 18:17:37 sno Exp $
+$NetBSD: distinfo,v 1.11 2010/03/10 10:58:57 sno Exp $
 
-SHA1 (Catalyst-Devel-1.26.tar.gz) = ca67e097d687c8d94fca5c2369b6d48efd363129
-RMD160 (Catalyst-Devel-1.26.tar.gz) = d865bf04235a90cce9960f4cc83aab36a45fc5b3
-Size (Catalyst-Devel-1.26.tar.gz) = 83686 bytes
+SHA1 (Catalyst-Devel-1.27.tar.gz) = 5dc7929edbf2f8cc717d1b62fffb7c2916be8b5f
+RMD160 (Catalyst-Devel-1.27.tar.gz) = 29e47257fc23e0f73bc6feab7f64dad95da137c2
+Size (Catalyst-Devel-1.27.tar.gz) = 85058 bytes
diff --git a/www/p5-Catalyst-Manual/Makefile b/www/p5-Catalyst-Manual/Makefile
index 35cf07f3b9bd..2adb47da2b00 100644
--- a/www/p5-Catalyst-Manual/Makefile
+++ b/www/p5-Catalyst-Manual/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2010/01/16 21:52:03 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/10 10:54:34 sno Exp $
 
-DISTNAME=	Catalyst-Manual-5.8003
+DISTNAME=	Catalyst-Manual-5.8004
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
diff --git a/www/p5-Catalyst-Manual/distinfo b/www/p5-Catalyst-Manual/distinfo
index c611e7f8dd14..1114e2b0a222 100644
--- a/www/p5-Catalyst-Manual/distinfo
+++ b/www/p5-Catalyst-Manual/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2010/01/16 21:52:03 sno Exp $
+$NetBSD: distinfo,v 1.11 2010/03/10 10:54:34 sno Exp $
 
-SHA1 (Catalyst-Manual-5.8003.tar.gz) = 4abfb193b8fabb5fb5ca4e91a50ca48875b475a8
-RMD160 (Catalyst-Manual-5.8003.tar.gz) = 99ffa82b9a0625782fd05e0c3fd8928e07fd8568
-Size (Catalyst-Manual-5.8003.tar.gz) = 174229 bytes
+SHA1 (Catalyst-Manual-5.8004.tar.gz) = cd452070c9f736bf546d9c36a89d2c053ca84dec
+RMD160 (Catalyst-Manual-5.8004.tar.gz) = 896351d0c0103b6b8703eb2943fbb2d8cbc832e4
+Size (Catalyst-Manual-5.8004.tar.gz) = 177517 bytes
diff --git a/www/p5-Catalyst-Model-Adaptor/Makefile b/www/p5-Catalyst-Model-Adaptor/Makefile
index 353735ec2905..33970ca42f02 100644
--- a/www/p5-Catalyst-Model-Adaptor/Makefile
+++ b/www/p5-Catalyst-Model-Adaptor/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/02/02 11:17:08 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/10 10:19:10 sno Exp $
 
-DISTNAME=	Catalyst-Model-Adaptor-0.06
+DISTNAME=	Catalyst-Model-Adaptor-0.08
 PKGNAME=	p5-${DISTNAME}
 #PKGREVISION=	1
 CATEGORIES=	www perl5
@@ -16,8 +16,9 @@ DEPENDS+=	p5-MRO-Compat-[0-9]*:../../devel/p5-MRO-Compat
 
 BUILD_DEPENDS+=	p5-Test-use-ok-[0-9]*:../../devel/p5-Test-use-ok
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/Catalyst/Model/Adaptor/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST= 	auto/Catalyst/Model/Adaptor/.packlist
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-Catalyst-Model-Adaptor/distinfo b/www/p5-Catalyst-Model-Adaptor/distinfo
index 617f4f157d80..1724ea248e81 100644
--- a/www/p5-Catalyst-Model-Adaptor/distinfo
+++ b/www/p5-Catalyst-Model-Adaptor/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/02/02 11:17:08 sno Exp $
+$NetBSD: distinfo,v 1.4 2010/03/10 10:19:10 sno Exp $
 
-SHA1 (Catalyst-Model-Adaptor-0.06.tar.gz) = 897ae4b93f27739d764115282efdaef1a4127078
-RMD160 (Catalyst-Model-Adaptor-0.06.tar.gz) = a79673aaf3bdb9cf3aa9d518619209451a5a67af
-Size (Catalyst-Model-Adaptor-0.06.tar.gz) = 22368 bytes
+SHA1 (Catalyst-Model-Adaptor-0.08.tar.gz) = a632f8d4a3005e215a3465dd15e8d7ee83c95461
+RMD160 (Catalyst-Model-Adaptor-0.08.tar.gz) = 175e9b4e6990ddb3f408cf7df1b93152ba9c6771
+Size (Catalyst-Model-Adaptor-0.08.tar.gz) = 21427 bytes
diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile
index b23dab0b932f..acaa0f6667bb 100644
--- a/www/p5-Catalyst-Runtime/Makefile
+++ b/www/p5-Catalyst-Runtime/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2010/02/02 11:11:30 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/10 10:16:10 sno Exp $
 
-DISTNAME=	Catalyst-Runtime-5.80019
+DISTNAME=	Catalyst-Runtime-5.80021
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
@@ -13,12 +13,12 @@ LICENSE=	${PERL5_LICENSE}
 CONFLICTS+=	p5-Catalyst-[0-9]*
 
 DEPENDS+=	p5-B-Hooks-EndOfScope>=0.08:../../devel/p5-B-Hooks-EndOfScope
-DEPENDS+=	p5-CGI-Simple>=0:../../www/p5-CGI-Simple
+DEPENDS+=	p5-CGI-Simple-[0-9]*:../../www/p5-CGI-Simple
 DEPENDS+=	p5-Class-C3-Adopt-NEXT>=0.07:../../devel/p5-Class-C3-Adopt-NEXT
 DEPENDS+=	p5-Class-MOP>=0.95:../../devel/p5-Class-MOP
-DEPENDS+=	p5-Data-Dump>=0:../../devel/p5-Data-Dump
-DEPENDS+=	p5-File-Modified>=0:../../devel/p5-File-Modified
-DEPENDS+=	p5-HTML-Parser>=0:../../www/p5-HTML-Parser
+DEPENDS+=	p5-Data-Dump-[0-9]*:../../devel/p5-Data-Dump
+DEPENDS+=	p5-File-Modified-[0-9]*:../../devel/p5-File-Modified
+DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTTP-Body>=1.04:../../www/p5-HTTP-Body
 DEPENDS+=	p5-HTTP-Request-AsCGI>=1.0:../../www/p5-HTTP-Request-AsCGI
 DEPENDS+=	p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils
@@ -32,14 +32,14 @@ DEPENDS+=	p5-MooseX-Role-WithOverloading>=0.05:../../devel/p5-MooseX-Role-WithOv
 DEPENDS+=	p5-MooseX-Types-[0-9]*:../../devel/p5-MooseX-Types
 DEPENDS+=	p5-MooseX-Types-Common-[0-9]*:../../devel/p5-MooseX-Types-Common
 DEPENDS+=	p5-Path-Class>=0.09:../../devel/p5-Path-Class
-DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-String-RewritePrefix>=0.004:../../textproc/p5-String-RewritePrefix
 DEPENDS+=	p5-Sub-Exporter-[0-9]*:../../devel/p5-Sub-Exporter
 DEPENDS+=	p5-Task-Weaken-[0-9]*:../../devel/p5-Task-Weaken
 DEPENDS+=	p5-Text-SimpleTable>=0.03:../../textproc/p5-Text-SimpleTable
-DEPENDS+=	{perl>=5.10,p5-Time-HiRes>=0}:../../time/p5-Time-HiRes
+DEPENDS+=	{perl>=5.10,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
 DEPENDS+=	p5-Tree-Simple>=1.15:../../devel/p5-Tree-Simple
-DEPENDS+=	p5-Tree-Simple-VisitorFactory>=0:../../devel/p5-Tree-Simple-VisitorFactory
+DEPENDS+=	p5-Tree-Simple-VisitorFactory-[0-9]*:../../devel/p5-Tree-Simple-VisitorFactory
 DEPENDS+=	p5-URI>=1.35:../../www/p5-URI
 DEPENDS+=	p5-libwww>=5.814:../../www/p5-libwww
 DEPENDS+=	p5-namespace-autoclean>=0.09:../../devel/p5-namespace-autoclean
diff --git a/www/p5-Catalyst-Runtime/distinfo b/www/p5-Catalyst-Runtime/distinfo
index 1571af854a84..d55cec3f02a8 100644
--- a/www/p5-Catalyst-Runtime/distinfo
+++ b/www/p5-Catalyst-Runtime/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2010/02/02 11:11:30 sno Exp $
+$NetBSD: distinfo,v 1.15 2010/03/10 10:16:10 sno Exp $
 
-SHA1 (Catalyst-Runtime-5.80019.tar.gz) = d32f33a34180fff0fc507ec3a6b11719f7783f9f
-RMD160 (Catalyst-Runtime-5.80019.tar.gz) = 8fb867b164bd90726d35d343eb032cc622c50481
-Size (Catalyst-Runtime-5.80019.tar.gz) = 246281 bytes
+SHA1 (Catalyst-Runtime-5.80021.tar.gz) = 19586678d08831501f2a823e777352f0ccc5bb13
+RMD160 (Catalyst-Runtime-5.80021.tar.gz) = a4e30f428819e7a61100a6f982ed86c44a61751a
+Size (Catalyst-Runtime-5.80021.tar.gz) = 239648 bytes
diff --git a/www/p5-Catalyst-View-JSON/Makefile b/www/p5-Catalyst-View-JSON/Makefile
index c9ade926d1dc..d3166865799a 100644
--- a/www/p5-Catalyst-View-JSON/Makefile
+++ b/www/p5-Catalyst-View-JSON/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/09/24 06:50:21 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/10 10:51:36 sno Exp $
 
-DISTNAME=	Catalyst-View-JSON-0.26
+DISTNAME=	Catalyst-View-JSON-0.28
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -11,11 +11,13 @@ HOMEPAGE=	http://search.cpan.org/perldoc?Catalyst::View::JSON
 COMMENT=	JSON view for your data in Catalyst
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	p5-Catalyst-Runtime>=5.60:../../www/p5-Catalyst-Runtime
-DEPENDS+=	p5-JSON>=0:../../converters/p5-JSON
+DEPENDS+=	p5-Catalyst-Runtime>=5.60000:../../www/p5-Catalyst-Runtime
 DEPENDS+=	p5-JSON-Any>=1.15:../../converters/p5-JSON-Any
+DEPENDS+=	p5-JSON-XS-[0-9]*:../../converters/p5-JSON-XS
 DEPENDS+=	p5-MRO-Compat-[0-9]*:../../devel/p5-MRO-Compat
 
+BUILD_DEPENDS+=	p5-YAML-[0-9]*:../../textproc/p5-YAML
+
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/Catalyst/View/JSON/.packlist
 
diff --git a/www/p5-Catalyst-View-JSON/distinfo b/www/p5-Catalyst-View-JSON/distinfo
index 55ed67e7633c..bf3fc4b1b172 100644
--- a/www/p5-Catalyst-View-JSON/distinfo
+++ b/www/p5-Catalyst-View-JSON/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/09/13 19:58:14 sno Exp $
+$NetBSD: distinfo,v 1.4 2010/03/10 10:51:36 sno Exp $
 
-SHA1 (Catalyst-View-JSON-0.26.tar.gz) = 398ef74da82d8d65280d3cbb6810dea7656cd68e
-RMD160 (Catalyst-View-JSON-0.26.tar.gz) = 332fddede975c200763a5c939feed952dfdd26e8
-Size (Catalyst-View-JSON-0.26.tar.gz) = 26845 bytes
+SHA1 (Catalyst-View-JSON-0.28.tar.gz) = 6eb80390fcde66ec55cb7bb379e5f9d5b93b6cbd
+RMD160 (Catalyst-View-JSON-0.28.tar.gz) = 2c1961519b1c92a9dcdc5dd9b484102bb01c8139
+Size (Catalyst-View-JSON-0.28.tar.gz) = 23449 bytes
diff --git a/www/p5-Catalyst-View-TT/Makefile b/www/p5-Catalyst-View-TT/Makefile
index e722f266b1df..edc5b5f0c28b 100644
--- a/www/p5-Catalyst-View-TT/Makefile
+++ b/www/p5-Catalyst-View-TT/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2009/11/19 20:50:42 seb Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/10 10:42:34 sno Exp $
 
-DISTNAME=	Catalyst-View-TT-0.31
+DISTNAME=	Catalyst-View-TT-0.32
 PKGNAME=	p5-${DISTNAME}
 #PKGREVISION=	1
 CATEGORIES=	www perl5
@@ -12,17 +12,18 @@ COMMENT=	Template Toolkit view class for Catalyst
 LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Catalyst-Runtime>=5.7000:../../www/p5-Catalyst-Runtime
-DEPENDS+=	p5-Class-Accessor>=0:../../devel/p5-Class-Accessor
+DEPENDS+=	p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
 DEPENDS+=	p5-MRO-Compat-[0-9]*:../../devel/p5-MRO-Compat
-DEPENDS+=	p5-Path-Class>=0:../../devel/p5-Path-Class
-DEPENDS+=	p5-Template-Toolkit>=0:../../www/p5-Template-Toolkit
-DEPENDS+=	p5-Template-Timer>=0:../../www/p5-Template-Timer
-DEPENDS+=	p5-Template-Provider-Encoding-[0-9]*:../../www/p5-Template-Provider-Encoding
+DEPENDS+=	p5-Path-Class-[0-9]*:../../devel/p5-Path-Class
+DEPENDS+=	p5-Template-Toolkit-[0-9]*:../../www/p5-Template-Toolkit
+DEPENDS+=	p5-Template-Timer-[0-9]*:../../www/p5-Template-Timer
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/Catalyst/View/TT/.packlist
-#PERL5_MODULE_TYPE=	Module::Install::Bundled
-MAKE_PARAMS+=	--skipdeps
+# for test target
+BUILD_DEPENDS+=	p5-Template-Provider-Encoding-[0-9]*:../../www/p5-Template-Provider-Encoding
+
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST= 	auto/Catalyst/View/TT/.packlist
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-Catalyst-View-TT/distinfo b/www/p5-Catalyst-View-TT/distinfo
index 7eb7ebfe664c..8a4f35974790 100644
--- a/www/p5-Catalyst-View-TT/distinfo
+++ b/www/p5-Catalyst-View-TT/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/11/19 20:50:43 seb Exp $
+$NetBSD: distinfo,v 1.5 2010/03/10 10:42:34 sno Exp $
 
-SHA1 (Catalyst-View-TT-0.31.tar.gz) = 19c989f9c8e6f39966b42415245b08819e99c6d1
-RMD160 (Catalyst-View-TT-0.31.tar.gz) = f3e1571ca967830153a770d72e24dcca35b7434b
-Size (Catalyst-View-TT-0.31.tar.gz) = 36724 bytes
+SHA1 (Catalyst-View-TT-0.32.tar.gz) = a06365d6dea45b3ccac9c39a76001051d9fd315a
+RMD160 (Catalyst-View-TT-0.32.tar.gz) = 542a59ff33919ce2be1a64676b6b5c3e93893502
+Size (Catalyst-View-TT-0.32.tar.gz) = 38323 bytes
diff --git a/www/p5-Test-WWW-Mechanize-Catalyst/Makefile b/www/p5-Test-WWW-Mechanize-Catalyst/Makefile
index 9dbd5a5e9f62..4f5369e5aa83 100644
--- a/www/p5-Test-WWW-Mechanize-Catalyst/Makefile
+++ b/www/p5-Test-WWW-Mechanize-Catalyst/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.4 2009/09/24 06:50:22 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/10 11:34:42 sno Exp $
 
-DISTNAME=	Test-WWW-Mechanize-Catalyst-0.51
+DISTNAME=	Test-WWW-Mechanize-Catalyst-0.52
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Test-WWW-Mechanize-Catalyst/
 COMMENT=	Test::WWW::Mechanize for Catalyst
-LICENSE=	gnu-gpl-v2 # OR artistic
+LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	p5-Catalyst-Runtime>=5.00:../../www/p5-Catalyst-Runtime
+DEPENDS+=	p5-Catalyst-Runtime>=5.00000:../../www/p5-Catalyst-Runtime
 DEPENDS+=	p5-Moose>=0.67:../../devel/p5-Moose
 DEPENDS+=	p5-Test-WWW-Mechanize>=1.20:../../www/p5-Test-WWW-Mechanize
 DEPENDS+=	p5-Test-Exception>=0:../../devel/p5-Test-Exception
 DEPENDS+=	p5-Test-WWW-Mechanize>=1.14:../../www/p5-Test-WWW-Mechanize
-DEPENDS+=	p5-WWW-Mechanize>=1.50:../../www/p5-WWW-Mechanize
+DEPENDS+=	p5-WWW-Mechanize>=1.54:../../www/p5-WWW-Mechanize
 DEPENDS+=	p5-libwww>=5.816:../../www/p5-libwww
 DEPENDS+=	p5-namespace-clean>=0.09:../../devel/p5-namespace-clean
 
diff --git a/www/p5-Test-WWW-Mechanize-Catalyst/distinfo b/www/p5-Test-WWW-Mechanize-Catalyst/distinfo
index 1d26781b5ee7..d83eb980d7b5 100644
--- a/www/p5-Test-WWW-Mechanize-Catalyst/distinfo
+++ b/www/p5-Test-WWW-Mechanize-Catalyst/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/05/01 13:12:11 sno Exp $
+$NetBSD: distinfo,v 1.3 2010/03/10 11:34:42 sno Exp $
 
-SHA1 (Test-WWW-Mechanize-Catalyst-0.51.tar.gz) = 251b2ac69663b835412a8f33c2939d7ef7849115
-RMD160 (Test-WWW-Mechanize-Catalyst-0.51.tar.gz) = d9da1583ca1ca39222ab21cbb554aae1d4bb86a5
-Size (Test-WWW-Mechanize-Catalyst-0.51.tar.gz) = 24623 bytes
+SHA1 (Test-WWW-Mechanize-Catalyst-0.52.tar.gz) = 48f2deb1a6c8620cbbd8bdce13450077a71924c6
+RMD160 (Test-WWW-Mechanize-Catalyst-0.52.tar.gz) = 8afad927ef67d801d62e8148a494d9e510937cfb
+Size (Test-WWW-Mechanize-Catalyst-0.52.tar.gz) = 26224 bytes