From owner-svn-ports-all@freebsd.org Sat Oct 31 11:58:49 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64DF4A22E83; Sat, 31 Oct 2015 11:58:49 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 095891FA4; Sat, 31 Oct 2015 11:58:48 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9VBwmQj022354; Sat, 31 Oct 2015 11:58:48 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9VBwm2J022353; Sat, 31 Oct 2015 11:58:48 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510311158.t9VBwm2J022353@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sat, 31 Oct 2015 11:58:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400569 - head/www/py-django-contrib-comments X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Oct 2015 11:58:49 -0000 Author: koobs Date: Sat Oct 31 11:58:47 2015 New Revision: 400569 URL: https://svnweb.freebsd.org/changeset/ports/400569 Log: www/py-django-contrib-comments: Use Django 1.6 for RUN_DEPENDS Default to using Django 1.6 (www/py-django16) because the current version of www/py-django-mezzanine does not support anything later than 1.6, and installation currently causes a conflict as installation of both django16 and django18 are attempted: py-django-mezzanine -> www/django16, www/py-django-contrib-comments py-django-contrib-comments -> www/django (1.8) This fixes a new (py-django-mezzanine) failure in 2015Q4 reported by pkg-fallout. This is the least of all current evils, without having to update Mezzanine to it's latest versions (*and* have to MFH that update). It has zero impact on other ports as mezzanine is the only port that currently consumes/depends on it. While I'm here, switch back to file-based dependency declaration because django* matches all django packages, and we can't anchor using $, resulting in `pkg info "$1" potentially returning multiple matches. Scripts/do-depends.sh should probably check for multiple results and error out if there is. Reviewed by: antoine MFH: 2015Q4 (pre-approved: antoine) Differential Revision: https://reviews.freebsd.org/D4047 Modified: head/www/py-django-contrib-comments/Makefile Modified: head/www/py-django-contrib-comments/Makefile ============================================================================== --- head/www/py-django-contrib-comments/Makefile Sat Oct 31 11:27:45 2015 (r400568) +++ head/www/py-django-contrib-comments/Makefile Sat Oct 31 11:58:47 2015 (r400569) @@ -3,6 +3,7 @@ PORTNAME= django-contrib-comments PORTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +14,7 @@ COMMENT= Code formerly known as django.c LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django*>=1.5:${PORTSDIR}/www/py-django +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django16 USES= python USE_PYTHON= autoplist distutils