From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 20 21:00:20 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C297E106564A for ; Tue, 20 Sep 2011 21:00:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 955828FC13 for ; Tue, 20 Sep 2011 21:00:20 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p8KL0KtY085076 for ; Tue, 20 Sep 2011 21:00:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p8KL0KOx085075; Tue, 20 Sep 2011 21:00:20 GMT (envelope-from gnats) Resent-Date: Tue, 20 Sep 2011 21:00:20 GMT Resent-Message-Id: <201109202100.p8KL0KOx085075@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ruslan Mahmatkhanov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEDBB1065674 for ; Tue, 20 Sep 2011 20:54:05 +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 BF1658FC0C for ; Tue, 20 Sep 2011 20:54:05 +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 p8KKs5XS070753 for ; Tue, 20 Sep 2011 20:54:05 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p8KKs5Mw070737; Tue, 20 Sep 2011 20:54:05 GMT (envelope-from nobody) Message-Id: <201109202054.p8KKs5Mw070737@red.freebsd.org> Date: Tue, 20 Sep 2011 20:54:05 GMT From: Ruslan Mahmatkhanov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/160858: [PATCH] www/py-pyramid: depend on simplejson conditionally X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2011 21:00:21 -0000 >Number: 160858 >Category: ports >Synopsis: [PATCH] www/py-pyramid: depend on simplejson conditionally >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: Tue Sep 20 21:00:20 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 9.0-BETA2 >Organization: >Environment: 9.0-BETA2 i386 >Description: This port is only needed simplejson if it run with python less than 2.6. From setup.py: """ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') """ so patch attached makes it depend on simplejson only if python version is < 2.6. - bump portrevision because of dependency change tag: simplejson26 >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/Makefile b/Makefile index e8c9fdc..6e9b166 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ PORTNAME= pyramid PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +21,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Chameleon>=1.2.3:${PORTSDIR}/textproc/py-C ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.3:${PORTSDIR}/www/py-pastescript \ ${PYTHON_PKGNAMEPREFIX}mako>=0.3.6:${PORTSDIR}/textproc/py-mako \ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:${PORTSDIR}/devel/py-repoze.lru \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.8:${PORTSDIR}/devel/py-simplejson \ ${PYTHON_PKGNAMEPREFIX}translationstring>=0:${PORTSDIR}/textproc/py-translationstring \ ${PYTHON_PKGNAMEPREFIX}venusian>=0.5:${PORTSDIR}/devel/py-venusian \ ${PYTHON_PKGNAMEPREFIX}webob>=1.0:${PORTSDIR}/www/py-webob \ @@ -37,4 +37,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PYTHON= 2.5+ USE_PYDISTUTILS= easy_install -.include +.include + +.if ${PYTHON_REL} < 260 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.8:${PORTSDIR}/devel/py-simplejson +.endif + +.include >Release-Note: >Audit-Trail: >Unformatted: