From e6860520ca0f632895f13300c321e9c2791bb19f Mon Sep 17 00:00:00 2001
From: pea <pea@openbsd.org>
Date: Thu, 17 Sep 2009 13:43:47 +0000
Subject: [PATCH] Update to 2.1.10

looks fine ajacoutot@
---
 databases/skytools/Makefile                   |  7 +++----
 databases/skytools/distinfo                   | 10 ++++-----
 .../patches/patch-python_pgq_status_py        | 21 -------------------
 3 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 databases/skytools/patches/patch-python_pgq_status_py

diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile
index 3ec135c1647..1341a70bfda 100644
--- a/databases/skytools/Makefile
+++ b/databases/skytools/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2009/08/11 23:51:50 martynas Exp $
+# $OpenBSD: Makefile,v 1.8 2009/09/17 13:43:47 pea Exp $
 
 COMMENT=	PostgreSQL tools from Skype
 
-MODPY_EGG_VERSION=	2.1.9
+MODPY_EGG_VERSION=	2.1.10
 DISTNAME=		skytools-${MODPY_EGG_VERSION}
-PKGNAME=		${DISTNAME}p0
 
 CATEGORIES=	databases
 
@@ -20,7 +19,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 
 WANTLIB= 	c
 
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/2129/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/2370/
 
 MODULES=	lang/python
 
diff --git a/databases/skytools/distinfo b/databases/skytools/distinfo
index 92c6ccaf63f..49cb6df0e77 100644
--- a/databases/skytools/distinfo
+++ b/databases/skytools/distinfo
@@ -1,5 +1,5 @@
-MD5 (skytools-2.1.9.tar.gz) = vBovBbJ9Rdk4FLiSOHNh3A==
-RMD160 (skytools-2.1.9.tar.gz) = jGdRytM8hrMVsIWUuEw2HK3/1bo=
-SHA1 (skytools-2.1.9.tar.gz) = Ih9X83XvZ2v/UNVq/B223xhC0JM=
-SHA256 (skytools-2.1.9.tar.gz) = 2F5glPrey7wWLtgC3KVnN127qHpGG/m5r6HJ0LJdwTo=
-SIZE (skytools-2.1.9.tar.gz) = 256397
+MD5 (skytools-2.1.10.tar.gz) = H+c19VmfR5ugpSsiLzEAsg==
+RMD160 (skytools-2.1.10.tar.gz) = WaEnmYOP5MiKiYlshB2VF6N4XKE=
+SHA1 (skytools-2.1.10.tar.gz) = rA44QCcuCyWBdCAGc+OxQhnpqVw=
+SHA256 (skytools-2.1.10.tar.gz) = HmGZPKa2LdHTa7xrt63Z0IlR72NkqHFMCYXH3pH4EeA=
+SIZE (skytools-2.1.10.tar.gz) = 257629
diff --git a/databases/skytools/patches/patch-python_pgq_status_py b/databases/skytools/patches/patch-python_pgq_status_py
deleted file mode 100644
index e0f7d4bd5f3..00000000000
--- a/databases/skytools/patches/patch-python_pgq_status_py
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-python_pgq_status_py,v 1.1 2009/08/11 23:51:50 martynas Exp $
---- python/pgq/status.py.orig	Wed Aug 12 02:18:28 2009
-+++ python/pgq/status.py	Wed Aug 12 02:22:16 2009
-@@ -4,13 +4,13 @@
- 
- import sys, os, skytools
- 
--def ival(data, as = None):
-+def ival(data, as_str = None):
-     "Format interval for output"
--    if not as:
--        as = data.split('.')[-1]
-+    if not as_str:
-+        as_str = data.split('.')[-1]
-     numfmt = 'FM9999999'
-     expr = "coalesce(to_char(extract(epoch from %s), '%s') || 's', 'NULL') as %s"
--    return expr % (data, numfmt, as)
-+    return expr % (data, numfmt, as_str)
- 
- class PGQStatus(skytools.DBScript):
-     def __init__(self, args, check = 0):