Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Aug 2011 19:13:13 GMT
From:      Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/160220: [PATCH] www/roundup: eliminate py-pysqlite2x dependency
Message-ID:  <201108261913.p7QJDDGF022977@red.freebsd.org>
Resent-Message-ID: <201108261920.p7QJK6Xq081948@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         160220
>Category:       ports
>Synopsis:       [PATCH] www/roundup: 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:   Fri Aug 26 19:20:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
- bump USE_PYTHON to 2.5+ (the point is to reduce the number of ports that depend on python24, since it not supported upstream anymore and the default python version in the ports tree is the 2.7)
- since it now requires 2.5+ remove conditional, that will install databases/py-pysqlite2x dependency in <2.5 case.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa roundup.orig/Makefile roundup/Makefile
--- roundup.orig/Makefile	2011-07-22 17:05:56.000000000 +0400
+++ roundup/Makefile	2011-08-26 23:08:20.000000000 +0400
@@ -17,7 +17,7 @@
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USE_GETTEXT=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
 
 OPTIONS=	SQLITE	"Support Sqlite as backend" on
@@ -28,11 +28,7 @@
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_SQLITE)
-.if ${PYTHON_REL} >= 250
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
-.else
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23
-.endif
 .endif
 
 .if defined(WITH_PGSQL)


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108261913.p7QJDDGF022977>