From nobody@FreeBSD.org  Wed Aug 24 17:49:10 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 2054B106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 17:49:10 +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 0F4DA8FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 17:49:10 +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 p7OHn9Bd079180
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 17:49:09 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7OHn9VX079179;
	Wed, 24 Aug 2011 17:49:09 GMT
	(envelope-from nobody)
Message-Id: <201108241749.p7OHn9VX079179@red.freebsd.org>
Date: Wed, 24 Aug 2011 17:49:09 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] devel/bzr-git: eliminate py-pysqlite2x dependency
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: c-s@c-s.li

>Number:         160069
>Category:       ports
>Synopsis:       [PATCH] devel/bzr-git: eliminate py-pysqlite2x dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glarkin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 24 17:50:06 UTC 2011
>Closed-Date:    Thu Sep 01 11:10:15 EDT 2011
>Last-Modified:  Thu Sep  1 15:20:05 UTC 2011
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
- bump USE_PYTHON to 2.5+ (the point is to not depend on python24)
- since it now requires 2.5+ use databases/py-sqlite3 
  instead of databases/py-pysqlite2x
- while here, move LICENSE to proper block
- bump portrevision cause of deps change
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa bzr-git.orig/Makefile bzr-git/Makefile
--- bzr-git.orig/Makefile	2011-07-14 21:29:41.000000000 +0400
+++ bzr-git/Makefile	2011-08-24 21:45:30.000000000 +0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-git
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/73756120/ \
 		http://www.c-s.li/ports/
@@ -14,15 +15,15 @@
 MAINTAINER=	c-s@c-s.li
 COMMENT=	Plugin for bzr to work with git trees
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
 RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng \
 		${PYTHON_SITELIBDIR}/dulwich/__init__.py:${PORTSDIR}/devel/dulwich \
-		py*-pysqlite>=2.3:${PORTSDIR}/databases/py-pysqlite23
-
-LICENSE=	GPLv2
+		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON=	yes
+USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	bzr_git
 


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Aug 24 17:50:18 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: c-s@c-s.li
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/160069: [PATCH] devel/bzr-git: eliminate py-pysqlite2x dependency
Date: Wed, 24 Aug 2011 17:50:17 UT

 Maintainer of devel/bzr-git,
 
 Please note that PR ports/160069 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/160069
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160069
Date: Wed, 24 Aug 2011 21:49:54 +0400

 Forgot to add that "I checked the code. They use this pattern when using 
 sqlite binding:"
 
 """
   82     try:
   83         import sqlite3
   84         check_pysqlite_version(sqlite3)
   85     except (ImportError, bzrlib.errors.BzrError), e:
   86         from pysqlite2 import dbapi2 as sqlite3
   87         check_pysqlite_version(sqlite3)
   88 except:
   89     trace.warning('Needs at least Python2.5 or Python2.4 with the
          pysqlite2 '
 """
 
 So nothing will be broken with sqlite3.
 
 -- 
 Regards,
 Ruslan
 
 Tinderboxing kills... the drives.
Responsible-Changed-From-To: freebsd-ports-bugs->glarkin 
Responsible-Changed-By: glarkin 
Responsible-Changed-When: Thu Aug 25 17:52:09 EDT 2011 
Responsible-Changed-Why:  
I'll take it. 

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

From: Greg Larkin <glarkin@FreeBSD.org>
To: bug-followup@FreeBSD.org, cvs-src@yandex.ru
Cc: C-S <c-s@c-s.li>
Subject: Re: ports/160069: [PATCH] devel/bzr-git: eliminate py-pysqlite2x
 dependency
Date: Fri, 26 Aug 2011 16:09:46 -0400

 This is a multi-part message in MIME format.
 --------------060600080502040502030909
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 I modified the patch slightly since bzr-git was recently upgraded to
 0.6.2.  I ran tinderbox builds with the updated patch, and they
 completed successfully.
 
 I'll commit it once it's approved.
 
 Regards,
 Greg
 - -- 
 
 Greg Larkin
 
 http://www.FreeBSD.org/           - The Power To Serve
 http://www.sourcehosting.net/     - Ready. Set. Code.
 http://twitter.com/cpucycle/      - Follow you, follow me
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (Darwin)
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
 iEYEARECAAYFAk5X/YoACgkQ0sRouByUApDnlwCgzOdlY8xOl1oMTR+okN26P4a4
 PLMAn2uKZgbKAcVhchI5omCs5D/L6Ssj
 =vf1g
 -----END PGP SIGNATURE-----
 
 
 --------------060600080502040502030909
 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
  name="bzr-git.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="bzr-git.diff"
 
 diff -ruN /usr/ports/devel/bzr-git/Makefile ./Makefile
 --- /usr/ports/devel/bzr-git/Makefile	2011-08-24 13:24:33.000000000 -0400
 +++ ./Makefile	2011-08-26 15:31:05.000000000 -0400
 @@ -7,6 +7,7 @@
  
  PORTNAME=	bzr-git
  PORTVERSION=	0.6.2
 +PORTREVISION=	1
  CATEGORIES=	devel
  MASTER_SITES=	https://launchpadlibrarian.net/76814124/ \
  		http://www.c-s.li/ports/
 @@ -14,15 +15,15 @@
  MAINTAINER=	c-s@c-s.li
  COMMENT=	Plugin for bzr to work with git trees
  
 +LICENSE=	GPLv2
 +
  BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
  RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng \
  		py*-dulwich>=0.8.0:${PORTSDIR}/devel/dulwich \
 -		py*-pysqlite>=2.3:${PORTSDIR}/databases/py-pysqlite23
 -
 -LICENSE=	GPLv2
 +		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
  
  WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 -USE_PYTHON=	yes
 +USE_PYTHON=	2.5+
  USE_PYDISTUTILS=	yes
  PYDISTUTILS_PKGNAME=	bzr_git
  
 
 --------------060600080502040502030909--

From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: glarkin@FreeBSD.org
Cc: bug-followup@FreeBSD.org, C-S <c-s@c-s.li>
Subject: Re: ports/160069: [PATCH] devel/bzr-git: eliminate py-pysqlite2x
 dependency
Date: Sat, 27 Aug 2011 10:49:51 +0400

 Greg Larkin wrote on 27.08.2011 00:09:
 >
 > -----BEGIN PGP SIGNED MESSAGE-----
 > Hash: SHA1
 >
 > I modified the patch slightly since bzr-git was recently upgraded to
 > 0.6.2.  I ran tinderbox builds with the updated patch, and they
 > completed successfully.
 >
 > I'll commit it once it's approved.
 >
 > Regards,
 > Greg
 > - --
 >
 > Greg Larkin
 
 Ok, thank you Greg.
 
 -- 
 Regards,
 Ruslan
 
 Tinderboxing kills... the drives.
State-Changed-From-To: feedback->closed 
State-Changed-By: glarkin 
State-Changed-When: Thu Sep 1 11:09:50 EDT 2011 
State-Changed-Why:  
Committed after merging changes from 0.6.1->0.6.2 upgrade, thank you! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160069: commit references a PR
Date: Thu,  1 Sep 2011 15:09:07 +0000 (UTC)

 glarkin     2011-09-01 15:08:59 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/bzr-git        Makefile 
   Log:
   - Set minimum Python version to 2.5
   - Since it now requires 2.5+, use databases/py-sqlite3 instead of
     databases/py-pysqlite2x
   - Bump PORTREVISION
   
   PR:             ports/160069
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru>
   Approved by:    c-s@c-s.li (maintainer, via email)
   
   Revision  Changes    Path
   1.7       +5 -4      ports/devel/bzr-git/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:
