From 5fb063414cca941df8877e466185dbccf6bc331d Mon Sep 17 00:00:00 2001
From: Wen Heping <wen@NetBSD.org>
Date: Tue, 12 Jun 2012 15:10:40 +0000
Subject: [PATCH] - Update to 1.3.1 - Remove unsupported option Firebird

---
 py-SQLObject/Makefile   |  9 ++++-----
 py-SQLObject/PLIST      | 14 +++++++++++++-
 py-SQLObject/distinfo   |  8 ++++----
 py-SQLObject/options.mk |  4 ++--
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/py-SQLObject/Makefile b/py-SQLObject/Makefile
index f8b415a234..173a1f9541 100644
--- a/py-SQLObject/Makefile
+++ b/py-SQLObject/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2012/05/11 12:48:40 noud4 Exp $
+# $NetBSD: Makefile,v 1.10 2012/06/12 15:10:40 uccwen Exp $
 #
 
-DISTNAME=	SQLObject-0.12.2.tar
+DISTNAME=	SQLObject-1.3.1.tar
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/.tar//}
 EGG_NAME=	${DISTNAME:S|.tar||:Q}
-PKGREVISION=	3
 CATEGORIES=	databases python
 MASTER_SITES=	http://pypi.python.org/packages/source/S/SQLObject/
 EXTRACT_SUFX=	.gz
@@ -16,12 +15,12 @@ LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/SQLObject-0.12.2
+WRKSRC=		${WRKDIR}/${DISTNAME:S|.tar||:Q}
 USE_LANGUAGES=	# none
 
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
-PLIST_SUBST+=	EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
+PLIST_SUBST+=		EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 
 .include "options.mk"
 
diff --git a/py-SQLObject/PLIST b/py-SQLObject/PLIST
index 9cb2269c00..3394ea615d 100644
--- a/py-SQLObject/PLIST
+++ b/py-SQLObject/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/05/11 12:48:40 noud4 Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/06/12 15:10:40 uccwen Exp $
 bin/sqlobject-admin
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -9,6 +9,9 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/sqlobject/__init__.py
 ${PYSITELIB}/sqlobject/__init__.pyc
 ${PYSITELIB}/sqlobject/__init__.pyo
+${PYSITELIB}/sqlobject/__version__.py
+${PYSITELIB}/sqlobject/__version__.pyc
+${PYSITELIB}/sqlobject/__version__.pyo
 ${PYSITELIB}/sqlobject/boundattributes.py
 ${PYSITELIB}/sqlobject/boundattributes.pyc
 ${PYSITELIB}/sqlobject/boundattributes.pyo
@@ -51,6 +54,9 @@ ${PYSITELIB}/sqlobject/firebird/firebirdconnection.pyo
 ${PYSITELIB}/sqlobject/include/__init__.py
 ${PYSITELIB}/sqlobject/include/__init__.pyc
 ${PYSITELIB}/sqlobject/include/__init__.pyo
+${PYSITELIB}/sqlobject/include/hashcol.py
+${PYSITELIB}/sqlobject/include/hashcol.pyc
+${PYSITELIB}/sqlobject/include/hashcol.pyo
 ${PYSITELIB}/sqlobject/include/pydispatch/__init__.py
 ${PYSITELIB}/sqlobject/include/pydispatch/__init__.pyc
 ${PYSITELIB}/sqlobject/include/pydispatch/__init__.pyo
@@ -114,6 +120,12 @@ ${PYSITELIB}/sqlobject/postgres/__init__.pyo
 ${PYSITELIB}/sqlobject/postgres/pgconnection.py
 ${PYSITELIB}/sqlobject/postgres/pgconnection.pyc
 ${PYSITELIB}/sqlobject/postgres/pgconnection.pyo
+${PYSITELIB}/sqlobject/rdbhost/__init__.py
+${PYSITELIB}/sqlobject/rdbhost/__init__.pyc
+${PYSITELIB}/sqlobject/rdbhost/__init__.pyo
+${PYSITELIB}/sqlobject/rdbhost/rdbhostconnection.py
+${PYSITELIB}/sqlobject/rdbhost/rdbhostconnection.pyc
+${PYSITELIB}/sqlobject/rdbhost/rdbhostconnection.pyo
 ${PYSITELIB}/sqlobject/sqlbuilder.py
 ${PYSITELIB}/sqlobject/sqlbuilder.pyc
 ${PYSITELIB}/sqlobject/sqlbuilder.pyo
diff --git a/py-SQLObject/distinfo b/py-SQLObject/distinfo
index 6b06da0704..68c26fa065 100644
--- a/py-SQLObject/distinfo
+++ b/py-SQLObject/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2010/03/17 06:02:11 uccwen Exp $
+$NetBSD: distinfo,v 1.5 2012/06/12 15:10:40 uccwen Exp $
 
-SHA1 (SQLObject-0.12.2.tar.gz) = 1eaaf1430ebde2a37cb550c2fe7fe0908d7feadf
-RMD160 (SQLObject-0.12.2.tar.gz) = 715f4817fcfa12a9a6c9bf888914b8d3d701bc24
-Size (SQLObject-0.12.2.tar.gz) = 252157 bytes
+SHA1 (SQLObject-1.3.1.tar.gz) = 06729821288508e83689e265b3c6b804b46e1acb
+RMD160 (SQLObject-1.3.1.tar.gz) = 8ce958dc1623cfba552731e9989424b3e603493b
+Size (SQLObject-1.3.1.tar.gz) = 261767 bytes
diff --git a/py-SQLObject/options.mk b/py-SQLObject/options.mk
index eb2c9ef063..a16a0d7d95 100644
--- a/py-SQLObject/options.mk
+++ b/py-SQLObject/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2010/03/17 06:02:11 uccwen Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:10:40 uccwen Exp $
 
 PKG_OPTIONS_VAR =	PKG_OPTIONS.SQLObject
-PKG_SUPPORTED_OPTIONS=	firebird mysql psycopg2 sqlite sybase
+PKG_SUPPORTED_OPTIONS=	mysql psycopg2 sqlite sybase
 PKG_SUGGESTED_OPTIONS=	psycopg2
 
 .include "../../mk/bsd.options.mk"