Re: UPDATE: databases/py-sqlite2

[Edd Barrett]

On Wed, Aug 31, 2016 at 02:21:59PM +0100, Stuart Henderson wrote:
> No that is OK in PLISTs as well, we use it to allow py-foo and py3-foo to
> be installed together (in this case if there was a py3 flavour it would
> need to install docs to share/doc/${MODPY_PY_PREFIX}-sqlite2).

Right, so we may as well allow MODPY_PY_PREFIX.

So any OK for the *first* diff I sent.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: UPDATE: databases/py-sqlite2

[Stuart Henderson]

On 2016/08/31 13:37, Edd Barrett wrote:
> On Wed, Aug 31, 2016 at 01:33:24PM +0100, Edd Barrett wrote:
> > Hi,
> > 
> > This updates py-sqlite2 so as to fix three failing tests in the upcoming
> > py-sqlalchemy update.
> > 
> > (I *think* the MODPY_PY_PREFIX replacement is right)
> 
> Actually I changed my mind on that. Looks like MODPY_PY_PREFIX is for
> use in package names, not in PLISTs.

No that is OK in PLISTs as well, we use it to allow py-foo and py3-foo to
be installed together (in this case if there was a py3 flavour it would
need to install docs to share/doc/${MODPY_PY_PREFIX}-sqlite2).

Re: UPDATE: databases/py-sqlite2

[Edd Barrett]

On Wed, Aug 31, 2016 at 01:33:24PM +0100, Edd Barrett wrote:
> Hi,
> 
> This updates py-sqlite2 so as to fix three failing tests in the upcoming
> py-sqlalchemy update.
> 
> (I *think* the MODPY_PY_PREFIX replacement is right)

Actually I changed my mind on that. Looks like MODPY_PY_PREFIX is for
use in package names, not in PLISTs.

Try this instead.

Index: Makefile
===
RCS file: /home/edd/cvsync/ports/databases/py-sqlite2/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile22 Nov 2015 19:51:28 -  1.27
+++ Makefile31 Aug 2016 08:58:48 -
@@ -2,7 +2,7 @@
 
 COMMENT =  SQLite3 adapter for Python
 
-MODPY_EGG_VERSION =2.8.1
+MODPY_EGG_VERSION =2.8.3
 
 DISTNAME = pysqlite-${MODPY_EGG_VERSION}
 PKGNAME =  py-sqlite2-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /home/edd/cvsync/ports/databases/py-sqlite2/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo22 Nov 2015 19:51:28 -  1.13
+++ distinfo31 Aug 2016 08:59:02 -
@@ -1,2 +1,2 @@
-SHA256 (pysqlite-2.8.1.tar.gz) = dcrhj5ZG8qYTfh+1MC26Z0tpgu6rOigpN36YsTz+oGY=
-SIZE (pysqlite-2.8.1.tar.gz) = 79539
+SHA256 (pysqlite-2.8.3.tar.gz) = F9MzWGPoz4OS7qca3TPas/ltBgZm/mirc4JGnTB/RJA=
+SIZE (pysqlite-2.8.3.tar.gz) = 80567

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

UPDATE: databases/py-sqlite2

[Edd Barrett]

Hi,

This updates py-sqlite2 so as to fix three failing tests in the upcoming
py-sqlalchemy update.

(I *think* the MODPY_PY_PREFIX replacement is right)

OK?

Index: Makefile
===
RCS file: /home/edd/cvsync/ports/databases/py-sqlite2/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile22 Nov 2015 19:51:28 -  1.27
+++ Makefile31 Aug 2016 08:58:48 -
@@ -2,7 +2,7 @@
 
 COMMENT =  SQLite3 adapter for Python
 
-MODPY_EGG_VERSION =2.8.1
+MODPY_EGG_VERSION =2.8.3
 
 DISTNAME = pysqlite-${MODPY_EGG_VERSION}
 PKGNAME =  py-sqlite2-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /home/edd/cvsync/ports/databases/py-sqlite2/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo22 Nov 2015 19:51:28 -  1.13
+++ distinfo31 Aug 2016 08:59:02 -
@@ -1,2 +1,2 @@
-SHA256 (pysqlite-2.8.1.tar.gz) = dcrhj5ZG8qYTfh+1MC26Z0tpgu6rOigpN36YsTz+oGY=
-SIZE (pysqlite-2.8.1.tar.gz) = 79539
+SHA256 (pysqlite-2.8.3.tar.gz) = F9MzWGPoz4OS7qca3TPas/ltBgZm/mirc4JGnTB/RJA=
+SIZE (pysqlite-2.8.3.tar.gz) = 80567
Index: pkg/PLIST
===
RCS file: /home/edd/cvsync/ports/databases/py-sqlite2/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST   22 Nov 2015 19:51:28 -  1.9
+++ pkg/PLIST   30 Aug 2016 16:25:17 -
@@ -27,5 +27,5 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/types.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/userfunctions.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/userfunctions.pyc
-share/doc/py-sqlite2/
-share/doc/py-sqlite2/sqlite3.txt
+share/doc/${MODPY_PY_PREFIX}sqlite2/
+share/doc/${MODPY_PY_PREFIX}sqlite2/sqlite3.txt


-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

[UPDATE] databases/py-sqlite2

[Remi Pointel]

Hi,

this is the diff to update py-sqlite2 to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/databases/py-sqlite2/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile18 Jul 2015 21:11:18 -  1.26
+++ Makefile15 Nov 2015 15:43:37 -
@@ -2,18 +2,17 @@
 
 COMMENT =  SQLite3 adapter for Python
 
-MODPY_EGG_VERSION =2.6.0
+MODPY_EGG_VERSION =2.8.1
 
 DISTNAME = pysqlite-${MODPY_EGG_VERSION}
 PKGNAME =  py-sqlite2-${MODPY_EGG_VERSION}
-REVISION = 5
 CATEGORIES =   databases devel
 
 MAINTAINER =   Eric Faurot 
 
-HOMEPAGE = https://code.google.com/p/pysqlite/
+HOMEPAGE = https://github.com/ghaering/pysqlite/
 
-MASTER_SITES = https://pysqlite.googlecode.com/files/
+MODPY_PI = Yes
 
 # BSD-like
 PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/databases/py-sqlite2/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo18 Jan 2015 03:13:05 -  1.12
+++ distinfo15 Nov 2015 15:43:37 -
@@ -1,2 +1,2 @@
-SHA256 (pysqlite-2.6.0.tar.gz) = VVg01972in/d88iet9ZpgLig1dyTJ3BfXHUueLTjWHk=
-SIZE (pysqlite-2.6.0.tar.gz) = 74453
+SHA256 (pysqlite-2.8.1.tar.gz) = dcrhj5ZG8qYTfh+1MC26Z0tpgu6rOigpN36YsTz+oGY=
+SIZE (pysqlite-2.8.1.tar.gz) = 79539
Index: patches/patch-setup_cfg
===
RCS file: patches/patch-setup_cfg
diff -N patches/patch-setup_cfg
--- patches/patch-setup_cfg 9 Apr 2009 01:05:25 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_cfg,v 1.2 2009/04/09 01:05:25 martynas Exp $
 setup.cfg.orig Wed Mar 11 18:31:40 2009
-+++ setup.cfg  Sun Mar 22 14:12:42 2009
-@@ -1,6 +1,6 @@
- [build_ext]
- #define=
--#include_dirs=/usr/local/include
--#library_dirs=/usr/local/lib
-+include_dirs=_LOCALBASE_/include
-+library_dirs=_LOCALBASE_/lib
- libraries=sqlite3
- define=SQLITE_OMIT_LOAD_EXTENSION
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-sqlite2/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST   7 Sep 2010 16:57:03 -   1.8
+++ pkg/PLIST   15 Nov 2015 15:43:37 -
@@ -19,11 +19,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.pyc
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/py25tests.py
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/py25tests.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/transactions.py

UPDATE: databases/py-sqlite2

[Eric Faurot]

This is an update to 2.6.0.
Tested with python2.6

Ok?

Index: Makefile
===
RCS file: /cvs/ports/databases/py-sqlite2/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile30 Aug 2010 20:53:57 -  1.15
+++ Makefile3 Sep 2010 18:01:58 -
@@ -2,11 +2,10 @@
 
 COMMENT =  SQLite3 adapter for Python
 
-MODPY_EGG_VERSION =2.5.6
+MODPY_EGG_VERSION =2.6.0
 
 DISTNAME = pysqlite-${MODPY_EGG_VERSION}
 PKGNAME =  py-sqlite2-${MODPY_EGG_VERSION}
-REVISION = 0
 CATEGORIES =   databases devel
 
 MAINTAINER =   Eric Faurot e...@openbsd.org
Index: distinfo
===
RCS file: /cvs/ports/databases/py-sqlite2/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo28 Dec 2009 09:24:34 -  1.10
+++ distinfo3 Sep 2010 18:01:58 -
@@ -1,5 +1,5 @@
-MD5 (pysqlite-2.5.6.tar.gz) = Gy8zjI1tuXHjTtt5mpLi7g==
-RMD160 (pysqlite-2.5.6.tar.gz) = gXTs++4vlSb3oRALGvp483hpFt0=
-SHA1 (pysqlite-2.5.6.tar.gz) = ebXEBnwMojckDrMub95+2EY20T0=
-SHA256 (pysqlite-2.5.6.tar.gz) = EI/r/jehciuBL5TQOY6AbscK7dB78T0MmFNLhQtcrCQ=
-SIZE (pysqlite-2.5.6.tar.gz) = 72559
+MD5 (pysqlite-2.6.0.tar.gz) = /JJhizs50C5v8Q3EZ8NmQA==
+RMD160 (pysqlite-2.6.0.tar.gz) = ZUrFuRTf5vmQJ3tdleHsWS5cLuA=
+SHA1 (pysqlite-2.6.0.tar.gz) = u6KnAPmPl5/feyJNs02V/5TCpdc=
+SHA256 (pysqlite-2.6.0.tar.gz) = VVg01972in/d88iet9ZpgLig1dyTJ3BfXHUueLTjWHk=
+SIZE (pysqlite-2.6.0.tar.gz) = 74453
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/databases/py-sqlite2/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -r1.5 patch-setup_py
--- patches/patch-setup_py  28 Dec 2009 09:24:34 -  1.5
+++ patches/patch-setup_py  3 Sep 2010 18:01:58 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-setup_py,v 1.5 2009/12/28 09:24:34 eric Exp $
 setup.py.orig  Thu Nov 12 00:53:58 2009
-+++ setup.py   Fri Dec 18 10:59:59 2009
-@@ -149,13 +149,6 @@ def get_setup_args():
+--- setup.py.orig  Thu Mar  4 08:19:34 2010
 setup.py   Sat Jun 26 19:54:09 2010
+@@ -150,13 +150,6 @@ def get_setup_args():
  print Fatal error: PYSQLITE_VERSION could not be detected!
  sys.exit(1)
  
@@ -15,9 +15,9 @@
  py_modules = [sqlite]
  setup_args = dict(
  name = pysqlite,
-@@ -173,7 +166,7 @@ def get_setup_args():
- package_dir = {pysqlite2: lib},
- packages = [pysqlite2, pysqlite2.test],
+@@ -175,7 +168,7 @@ def get_setup_args():
+ packages = [pysqlite2, pysqlite2.test] +
+([pysqlite2.test.py25], [])[sys.version_info  (2, 
5)],
  scripts=[],
 -data_files = data_files,
 +data_files = [],
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-sqlite2/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST   9 Apr 2009 01:05:25 -   1.7
+++ pkg/PLIST   3 Sep 2010 18:01:58 -
@@ -19,8 +19,11 @@
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.pyc
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25tests.py
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25tests.pyc
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/__init__.py
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/py25tests.py
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/py25tests.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/transactions.py

UPDATE: databases/py-sqlite2 (resent)

[Eric Faurot]

No objections?

---
This patch updates py-sqlite2 to 2.6.0.

comments, ok?

Eric.

Index: Makefile
===
RCS file: /cvs/ports/databases/py-sqlite2/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile28 Dec 2009 09:24:34 -  1.14
+++ Makefile26 Jun 2010 18:41:56 -
@@ -2,7 +2,7 @@
 
 COMMENT =  SQLite3 adapter for Python
 
-MODPY_EGG_VERSION =2.5.6
+MODPY_EGG_VERSION =2.6.0
 
 DISTNAME = pysqlite-${MODPY_EGG_VERSION}
 PKGNAME =  py-sqlite2-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/py-sqlite2/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo28 Dec 2009 09:24:34 -  1.10
+++ distinfo26 Jun 2010 18:41:56 -
@@ -1,5 +1,5 @@
-MD5 (pysqlite-2.5.6.tar.gz) = Gy8zjI1tuXHjTtt5mpLi7g==
-RMD160 (pysqlite-2.5.6.tar.gz) = gXTs++4vlSb3oRALGvp483hpFt0=
-SHA1 (pysqlite-2.5.6.tar.gz) = ebXEBnwMojckDrMub95+2EY20T0=
-SHA256 (pysqlite-2.5.6.tar.gz) = EI/r/jehciuBL5TQOY6AbscK7dB78T0MmFNLhQtcrCQ=
-SIZE (pysqlite-2.5.6.tar.gz) = 72559
+MD5 (pysqlite-2.6.0.tar.gz) = /JJhizs50C5v8Q3EZ8NmQA==
+RMD160 (pysqlite-2.6.0.tar.gz) = ZUrFuRTf5vmQJ3tdleHsWS5cLuA=
+SHA1 (pysqlite-2.6.0.tar.gz) = u6KnAPmPl5/feyJNs02V/5TCpdc=
+SHA256 (pysqlite-2.6.0.tar.gz) = VVg01972in/d88iet9ZpgLig1dyTJ3BfXHUueLTjWHk=
+SIZE (pysqlite-2.6.0.tar.gz) = 74453
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/databases/py-sqlite2/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -r1.5 patch-setup_py
--- patches/patch-setup_py  28 Dec 2009 09:24:34 -  1.5
+++ patches/patch-setup_py  26 Jun 2010 18:41:56 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-setup_py,v 1.5 2009/12/28 09:24:34 eric Exp $
 setup.py.orig  Thu Nov 12 00:53:58 2009
-+++ setup.py   Fri Dec 18 10:59:59 2009
-@@ -149,13 +149,6 @@ def get_setup_args():
+--- setup.py.orig  Thu Mar  4 08:19:34 2010
 setup.py   Sat Jun 26 19:54:09 2010
+@@ -150,13 +150,6 @@ def get_setup_args():
  print Fatal error: PYSQLITE_VERSION could not be detected!
  sys.exit(1)
  
@@ -15,9 +15,9 @@
  py_modules = [sqlite]
  setup_args = dict(
  name = pysqlite,
-@@ -173,7 +166,7 @@ def get_setup_args():
- package_dir = {pysqlite2: lib},
- packages = [pysqlite2, pysqlite2.test],
+@@ -175,7 +168,7 @@ def get_setup_args():
+ packages = [pysqlite2, pysqlite2.test] +
+([pysqlite2.test.py25], [])[sys.version_info  (2, 
5)],
  scripts=[],
 -data_files = data_files,
 +data_files = [],
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-sqlite2/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST   9 Apr 2009 01:05:25 -   1.7
+++ pkg/PLIST   26 Jun 2010 18:41:56 -
@@ -19,8 +19,11 @@
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.pyc
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25tests.py
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25tests.pyc
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/__init__.py
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/py25tests.py
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/py25tests.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/transactions.py

UPDATE: databases/py-sqlite2

[Eric Faurot]

This patch updates py-sqlite2 to 2.6.0.

comments, ok?

Eric.

Index: Makefile
===
RCS file: /cvs/ports/databases/py-sqlite2/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile28 Dec 2009 09:24:34 -  1.14
+++ Makefile26 Jun 2010 18:41:56 -
@@ -2,7 +2,7 @@
 
 COMMENT =  SQLite3 adapter for Python
 
-MODPY_EGG_VERSION =2.5.6
+MODPY_EGG_VERSION =2.6.0
 
 DISTNAME = pysqlite-${MODPY_EGG_VERSION}
 PKGNAME =  py-sqlite2-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/py-sqlite2/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo28 Dec 2009 09:24:34 -  1.10
+++ distinfo26 Jun 2010 18:41:56 -
@@ -1,5 +1,5 @@
-MD5 (pysqlite-2.5.6.tar.gz) = Gy8zjI1tuXHjTtt5mpLi7g==
-RMD160 (pysqlite-2.5.6.tar.gz) = gXTs++4vlSb3oRALGvp483hpFt0=
-SHA1 (pysqlite-2.5.6.tar.gz) = ebXEBnwMojckDrMub95+2EY20T0=
-SHA256 (pysqlite-2.5.6.tar.gz) = EI/r/jehciuBL5TQOY6AbscK7dB78T0MmFNLhQtcrCQ=
-SIZE (pysqlite-2.5.6.tar.gz) = 72559
+MD5 (pysqlite-2.6.0.tar.gz) = /JJhizs50C5v8Q3EZ8NmQA==
+RMD160 (pysqlite-2.6.0.tar.gz) = ZUrFuRTf5vmQJ3tdleHsWS5cLuA=
+SHA1 (pysqlite-2.6.0.tar.gz) = u6KnAPmPl5/feyJNs02V/5TCpdc=
+SHA256 (pysqlite-2.6.0.tar.gz) = VVg01972in/d88iet9ZpgLig1dyTJ3BfXHUueLTjWHk=
+SIZE (pysqlite-2.6.0.tar.gz) = 74453
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/databases/py-sqlite2/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -r1.5 patch-setup_py
--- patches/patch-setup_py  28 Dec 2009 09:24:34 -  1.5
+++ patches/patch-setup_py  26 Jun 2010 18:41:56 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-setup_py,v 1.5 2009/12/28 09:24:34 eric Exp $
 setup.py.orig  Thu Nov 12 00:53:58 2009
-+++ setup.py   Fri Dec 18 10:59:59 2009
-@@ -149,13 +149,6 @@ def get_setup_args():
+--- setup.py.orig  Thu Mar  4 08:19:34 2010
 setup.py   Sat Jun 26 19:54:09 2010
+@@ -150,13 +150,6 @@ def get_setup_args():
  print Fatal error: PYSQLITE_VERSION could not be detected!
  sys.exit(1)
  
@@ -15,9 +15,9 @@
  py_modules = [sqlite]
  setup_args = dict(
  name = pysqlite,
-@@ -173,7 +166,7 @@ def get_setup_args():
- package_dir = {pysqlite2: lib},
- packages = [pysqlite2, pysqlite2.test],
+@@ -175,7 +168,7 @@ def get_setup_args():
+ packages = [pysqlite2, pysqlite2.test] +
+([pysqlite2.test.py25], [])[sys.version_info  (2, 
5)],
  scripts=[],
 -data_files = data_files,
 +data_files = [],
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-sqlite2/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST   9 Apr 2009 01:05:25 -   1.7
+++ pkg/PLIST   26 Jun 2010 18:41:56 -
@@ -19,8 +19,11 @@
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.pyc
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25tests.py
-lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25tests.pyc
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/__init__.py
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/py25tests.py
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/py25/py25tests.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/transactions.py

UPDATE: databases/py-sqlite2

[Eric Faurot]

Change HOMEPAGE/MASTER_SITES and update to 2.5.6.

ok?

Eric.

Index: Makefile
===
RCS file: /cvs/ports/databases/py-sqlite2/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile9 Apr 2009 01:05:25 -   1.13
+++ Makefile18 Dec 2009 10:26:01 -
@@ -2,7 +2,7 @@
 
 COMMENT =  SQLite3 adapter for Python
 
-MODPY_EGG_VERSION =2.5.5
+MODPY_EGG_VERSION =2.5.6
 
 DISTNAME = pysqlite-${MODPY_EGG_VERSION}
 PKGNAME =  py-sqlite2-${MODPY_EGG_VERSION}
@@ -10,9 +10,9 @@
 
 MAINTAINER =   Eric Faurot e...@openbsd.org
 
-HOMEPAGE = http://pysqlite.org/
+HOMEPAGE = http://code.google.com/p/pysqlite/
 
-MASTER_SITES = 
http://oss.itsystementwicklung.de/download/pysqlite/${MODPY_EGG_VERSION:R}/${MODPY_EGG_VERSION}/
+MASTER_SITES = http://pysqlite.googlecode.com/files/
 
 # BSD-like
 PERMIT_PACKAGE_FTP =   Yes
@@ -39,9 +39,7 @@
${PREFIX}/share/doc/py-sqlite2/
 
 do-regress: fake
-   @cd ${WRKSRC}/pysqlite2/test  \
-   ${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
-   ${MODPY_BIN} ./regression.py  \
+   @cd ${WRKDIR}  \
${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
${MODPY_BIN} -c 'from pysqlite2 import test; test.test()'
 
Index: distinfo
===
RCS file: /cvs/ports/databases/py-sqlite2/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo9 Apr 2009 01:05:25 -   1.9
+++ distinfo18 Dec 2009 10:26:01 -
@@ -1,5 +1,5 @@
-MD5 (pysqlite-2.5.5.tar.gz) = T5/NEqSGAWCx8zIGbGTuWA==
-RMD160 (pysqlite-2.5.5.tar.gz) = xCAWnPSJO3moY4MT8zJ/N7yJhqo=
-SHA1 (pysqlite-2.5.5.tar.gz) = KOonrahs1+xhBfgmF+ps8aCURNM=
-SHA256 (pysqlite-2.5.5.tar.gz) = 73yn9EiTeQ4acISxDqCDdw4TholAb93HB20S1r/01E8=
-SIZE (pysqlite-2.5.5.tar.gz) = 73068
+MD5 (pysqlite-2.5.6.tar.gz) = Gy8zjI1tuXHjTtt5mpLi7g==
+RMD160 (pysqlite-2.5.6.tar.gz) = gXTs++4vlSb3oRALGvp483hpFt0=
+SHA1 (pysqlite-2.5.6.tar.gz) = ebXEBnwMojckDrMub95+2EY20T0=
+SHA256 (pysqlite-2.5.6.tar.gz) = EI/r/jehciuBL5TQOY6AbscK7dB78T0MmFNLhQtcrCQ=
+SIZE (pysqlite-2.5.6.tar.gz) = 72559
Index: patches/patch-doc_sphinx_conf_py
===
RCS file: patches/patch-doc_sphinx_conf_py
diff -N patches/patch-doc_sphinx_conf_py
--- patches/patch-doc_sphinx_conf_py9 Apr 2009 01:05:25 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_sphinx_conf_py,v 1.1 2009/04/09 01:05:25 martynas Exp $
 doc/sphinx/conf.py.origWed Nov 12 10:56:11 2008
-+++ doc/sphinx/conf.py Sun Mar 22 14:14:11 2009
-@@ -34,7 +34,7 @@ master_doc = 'index'
- 
- # General substitutions.
- project = 'pysqlite'
--copyright = '2008, Gerhard Häring'
-+copyright = u'2008, Gerhard Häring'
- 
- # The default replacements for |version| and |release|, also used in various
- # other places throughout the built documents.
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/databases/py-sqlite2/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -r1.4 patch-setup_py
--- patches/patch-setup_py  9 Apr 2009 01:05:25 -   1.4
+++ patches/patch-setup_py  18 Dec 2009 10:26:01 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-setup_py,v 1.4 2009/04/09 01:05:25 martynas Exp $
 setup.py.orig  Mon Mar  9 14:16:40 2009
-+++ setup.py   Sun Mar 22 14:18:45 2009
+--- setup.py.orig  Thu Nov 12 00:53:58 2009
 setup.py   Fri Dec 18 10:59:59 2009
 @@ -149,13 +149,6 @@ def get_setup_args():
  print Fatal error: PYSQLITE_VERSION could not be detected!
  sys.exit(1)
@@ -15,8 +15,8 @@
  py_modules = [sqlite]
  setup_args = dict(
  name = pysqlite,
-@@ -175,7 +168,7 @@ def get_setup_args():
- package_dir = {pysqlite2: pysqlite2},
+@@ -173,7 +166,7 @@ def get_setup_args():
+ package_dir = {pysqlite2: lib},
  packages = [pysqlite2, pysqlite2.test],
  scripts=[],
 -data_files = data_files,

UPDATE: databases/py-sqlite2

[Eric Faurot]

- maintenance update to 2.3.5: usual set of improvements and bug fixes. 
  Full changelogs:
http://initd.org/tracker/pysqlite/wiki/2.3.4_Changelog
http://initd.org/tracker/pysqlite/wiki/2.3.5_Changelog
- update my mail address (got fed up with gmail)
- polish Makefile

tested on macppc

comments and ok?

Eric.


py-sqlite2.diff
Description: Binary data

Re: UPDATE: databases/py-sqlite2

[Eric Faurot]

second try.



py-sqlite2.diff
Description: Binary data

UPDATE: databases/py-sqlite2

[Eric Faurot]

update py-sqlite2 to 2.3.3.

It contains quite a lot of improvements and fixes over the
(discontinued) 2.2.x serie.  Html docs are not built as they require
two external dependencies, one not being ported (yet?).

tested on amd64.


py-sqlite2.diff
Description: Binary data

UPDATE: databases/py-sqlite2

[Eric Faurot]

Hi,

The current version of py-sqlite2 is known to be unusable with sqlite
3.3.x. This patch is an update to py-sqlite-2.2.2.

Eric.


py-sqlite2.diff
Description: Binary data