Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Oct 2015 12:04:20 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r400571 - branches/2015Q4/www/py-django-contrib-comments
Message-ID:  <201510311204.t9VC4KT5025335@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Sat Oct 31 12:04:20 2015
New Revision: 400571
URL: https://svnweb.freebsd.org/changeset/ports/400571

Log:
  MFH: r400569
  
  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
  Differential Revision:	https://reviews.freebsd.org/D4047
  
  Approved by:	portmgr (antoine)

Modified:
  branches/2015Q4/www/py-django-contrib-comments/Makefile
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/www/py-django-contrib-comments/Makefile
==============================================================================
--- branches/2015Q4/www/py-django-contrib-comments/Makefile	Sat Oct 31 12:00:54 2015	(r400570)
+++ branches/2015Q4/www/py-django-contrib-comments/Makefile	Sat Oct 31 12:04:20 2015	(r400571)
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-contrib-comments
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +14,7 @@ COMMENT=	Code formerly known as django.c
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django # >= 1.5
-TEST_DEPENDS:=	${RUN_DEPENDS}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django16
 
 USES=		python
 USE_PYTHON=	autoplist distutils



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