Date: Wed, 24 Aug 2011 13:32:29 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160063: [PATCH] deskutils/conduit: eliminate py-pysqlite2x dependency Message-ID: <201108241332.p7ODWTgX012498@red.freebsd.org> Resent-Message-ID: <201108241340.p7ODeAJT026888@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160063
>Category: ports
>Synopsis: [PATCH] deskutils/conduit: eliminate py-pysqlite2x dependency
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 24 13:40:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
- since this port requires python2.5+ (with USE_PYTHON) switch to databases/py-sqlite3 instead of databases/py-pysqlite2x that is for python24
- while here use ${PYTHON_PKGNAMEPREFIX} instead of "py-*"
- bimp portrevision because of this deps changes
I checked the code and they use this pattern when dealing with sqlite:
"""
try:
from sqlite3 import dbapi2 as sqlite
except ImportError:
from pysqlite2 import dbapi2 as sqlite
"""
So nothing will be broken with sqlite3.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruNa conduit.orig/Makefile conduit/Makefile
--- conduit.orig/Makefile 2011-08-01 09:35:44.000000000 +0400
+++ conduit/Makefile 2011-08-24 17:29:57.000000000 +0400
@@ -7,7 +7,7 @@
PORTNAME= conduit
PORTVERSION= 0.3.17
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils
MASTER_SITES= GNOME
@@ -15,15 +15,15 @@
COMMENT= Synchronization application for GNOME
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
- ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \
+ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
xmlproc_parse:${PORTSDIR}/textproc/py-xml \
- py*-vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
- ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \
+ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
xmlproc_parse:${PORTSDIR}/textproc/py-xml \
- py*-vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
xdg-open:${PORTSDIR}/devel/xdg-utils
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108241332.p7ODWTgX012498>