update to py-sqlite2-2.5.5. feedback, "go ahead" fgs@ & eric@

fgs@ also sent patch-doc_sphinx_conf_py upstream.
This commit is contained in:
martynas 2009-04-09 01:05:25 +00:00
parent 96574ee7a4
commit f6600fb63c
6 changed files with 71 additions and 43 deletions

View File

@ -1,34 +1,43 @@
# $OpenBSD: Makefile,v 1.12 2009/03/11 21:45:31 bernd Exp $
# $OpenBSD: Makefile,v 1.13 2009/04/09 01:05:25 martynas Exp $
COMMENT= SQLite3 adapter for Python
COMMENT = SQLite3 adapter for Python
VERSION= 2.4.1
DISTNAME= pysqlite-${VERSION}
PKGNAME= py-sqlite2-${VERSION}p1
CATEGORIES= databases devel
MODPY_EGG_VERSION = 2.5.5
MAINTAINER= Eric Faurot <eric@openbsd.org>
DISTNAME = pysqlite-${MODPY_EGG_VERSION}
PKGNAME = py-sqlite2-${MODPY_EGG_VERSION}
CATEGORIES = databases devel
HOMEPAGE= http://pysqlite.org/
MAINTAINER = Eric Faurot <eric@openbsd.org>
MASTER_SITES= http://initd.org/pub/software/pysqlite/releases/${VERSION:R}/${VERSION}/ \
http://mirrors.protection.cx/~martynas/
HOMEPAGE = http://pysqlite.org/
MASTER_SITES = http://oss.itsystementwicklung.de/download/pysqlite/${MODPY_EGG_VERSION:R}/${MODPY_EGG_VERSION}/
# BSD-like
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
LIB_DEPENDS= sqlite3.>=8.6::databases/sqlite3
LIB_DEPENDS = sqlite3.>=8.6::databases/sqlite3
BUILD_DEPENDS = ::textproc/py-sphinx
SUBST_VARS= VERSION
MODULES= lang/python
MODULES = lang/python
pre-configure:
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g' ${WRKSRC}/setup.cfg
post-build:
cd ${WRKSRC} && \
${LOCALBASE}/bin/sphinx-build -N -b text doc/sphinx \
build/doc
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-sqlite2
${INSTALL_DATA} ${WRKSRC}/build/doc/sqlite3.txt \
${PREFIX}/share/doc/py-sqlite2/
do-regress: fake
@cd ${WRKSRC}/pysqlite2/test && \
${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \

View File

@ -1,5 +1,5 @@
MD5 (pysqlite-2.4.1.tar.gz) = fZpIdacQe5TrSqLchholNw==
RMD160 (pysqlite-2.4.1.tar.gz) = aT9NeJOI7wRWRJ0BsNNCqvGZCDI=
SHA1 (pysqlite-2.4.1.tar.gz) = A9LFLGXgF+ZX2FLAWDqjm7ZWOnM=
SHA256 (pysqlite-2.4.1.tar.gz) = gkDxrAV+LjiYLMCooSmb2Ix7hO8URIfzx8bgGjTyyAc=
SIZE (pysqlite-2.4.1.tar.gz) = 84996
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

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-doc_sphinx_conf_py,v 1.1 2009/04/09 01:05:25 martynas Exp $
--- doc/sphinx/conf.py.orig Wed 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.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-setup_cfg,v 1.1 2008/01/30 17:33:13 eric Exp $
--- setup.cfg.orig Mon Jan 28 21:11:24 2008
+++ setup.cfg Tue Jan 29 10:26:08 2008
@@ -1,5 +1,5 @@
$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
@ -9,3 +9,4 @@ $OpenBSD: patch-setup_cfg,v 1.1 2008/01/30 17:33:13 eric Exp $
+include_dirs=_LOCALBASE_/include
+library_dirs=_LOCALBASE_/lib
libraries=sqlite3
define=SQLITE_OMIT_LOAD_EXTENSION

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.3 2008/01/12 23:05:13 eric Exp $
--- setup.py.orig Wed Jul 18 01:03:48 2007
+++ setup.py Tue Nov 27 21:53:01 2007
@@ -105,12 +105,10 @@ def get_setup_args():
$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
@@ -149,13 +149,6 @@ def get_setup_args():
print "Fatal error: PYSQLITE_VERSION could not be detected!"
sys.exit(1)
@ -11,10 +11,16 @@ $OpenBSD: patch-setup_py,v 1.3 2008/01/12 23:05:13 eric Exp $
- + glob.glob("doc/*.css")),
- ("pysqlite2-doc/code",
- glob.glob("doc/code/*.py"))]
+ data_files = [("share/doc/py-sqlite2",
+ glob.glob("doc/usage-guide.html") \
+ + glob.glob("doc/usage-guide.txt") \
+ + glob.glob("doc/*.css")), ]
-
py_modules = ["sqlite"]
setup_args = dict(
name = "pysqlite",
@@ -175,7 +168,7 @@ def get_setup_args():
package_dir = {"pysqlite2": "pysqlite2"},
packages = ["pysqlite2", "pysqlite2.test"],
scripts=[],
- data_files = data_files,
+ data_files = [],
ext_modules = [Extension( name="pysqlite2._sqlite",
sources=sources,

View File

@ -1,16 +1,20 @@
@comment $OpenBSD: PLIST,v 1.6 2008/01/12 23:05:13 eric Exp $
lib/python${MODPY_VERSION}/site-packages/pysqlite-${VERSION}-py${MODPY_VERSION}.egg-info
@comment $OpenBSD: PLIST,v 1.7 2009/04/09 01:05:25 martynas Exp $
lib/python${MODPY_VERSION}/site-packages/pysqlite-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/pysqlite2/
lib/python${MODPY_VERSION}/site-packages/pysqlite2/__init__.py
lib/python${MODPY_VERSION}/site-packages/pysqlite2/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/pysqlite2/_sqlite.so
lib/python${MODPY_VERSION}/site-packages/pysqlite2/dbapi2.py
lib/python${MODPY_VERSION}/site-packages/pysqlite2/dbapi2.pyc
lib/python${MODPY_VERSION}/site-packages/pysqlite2/dump.py
lib/python${MODPY_VERSION}/site-packages/pysqlite2/dump.pyc
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/__init__.py
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dbapi.py
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dbapi.pyc
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dump.py
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dump.pyc
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.py
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.pyc
lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.py
@ -26,8 +30,4 @@ 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/default.css
share/doc/py-sqlite2/docutils.css
share/doc/py-sqlite2/silvercity.css
share/doc/py-sqlite2/usage-guide.html
share/doc/py-sqlite2/usage-guide.txt
share/doc/py-sqlite2/sqlite3.txt