From nobody@FreeBSD.org  Wed Aug 24 13:32:30 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28BE7106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 13:32:30 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id F043E8FC19
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 13:32:29 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7ODWTuu012499
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 13:32:29 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7ODWTgX012498;
	Wed, 24 Aug 2011 13:32:29 GMT
	(envelope-from nobody)
Message-Id: <201108241332.p7ODWTgX012498@red.freebsd.org>
Date: Wed, 24 Aug 2011 13:32:29 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] deskutils/conduit: eliminate py-pysqlite2x dependency
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         160063
>Category:       ports
>Synopsis:       [PATCH] deskutils/conduit: eliminate py-pysqlite2x dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 24 13:40:10 UTC 2011
>Closed-Date:    Mon Sep 12 18:24:42 UTC 2011
>Last-Modified:  Mon Sep 12 18:30:13 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Aug 24 13:40:25 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160063 
Responsible-Changed-From-To: gnome->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Wed Aug 31 22:49:30 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160063 
Responsible-Changed-From-To: eadler->gnome 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Thu Sep 1 13:11:33 UTC 2011 
Responsible-Changed-Why:  
woops, gnome owns this one 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160063 
State-Changed-From-To: open->closed 
State-Changed-By: kwm 
State-Changed-When: Mon Sep 12 18:24:26 UTC 2011 
State-Changed-Why:  
Committed thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160063 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160063: commit references a PR
Date: Mon, 12 Sep 2011 18:24:25 +0000 (UTC)

 kwm         2011-09-12 18:24:12 UTC
 
   FreeBSD ports repository
 
   Modified files:
     deskutils/conduit    Makefile 
   Log:
   Switch to using py-sqlite3.
   replace a py-* with ${PYTHON_PKGNAMEPREFIX}
   
   PR:             ports/160063
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru>
   
   Revision  Changes    Path
   1.28      +5 -5      ports/deskutils/conduit/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
