From owner-svn-ports-head@freebsd.org Thu Jun 25 07:09:07 2015 Return-Path: Delivered-To: svn-ports-head@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 A0A6E98C79A; Thu, 25 Jun 2015 07:09:07 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 91EB419D4; Thu, 25 Jun 2015 07:09:07 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P797fn087106; Thu, 25 Jun 2015 07:09:07 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P797t4087105; Thu, 25 Jun 2015 07:09:07 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201506250709.t5P797t4087105@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Thu, 25 Jun 2015 07:09:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390535 - head/www/py-django-mptt X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 07:09:07 -0000 Author: koobs Date: Thu Jun 25 07:09:06 2015 New Revision: 390535 URL: https://svnweb.freebsd.org/changeset/ports/390535 Log: www/py-django-mptt: Fix Django dependency causing conflicts Tweak RUN_DEPENDS, switching to file-based django detection, instead of by package name. This ensures that if a port that depends on this one, also depends on a different django version, it will see and use the installed version, rather than attempting to install another one, which results in a conflict as all django ports conflict with each other. www/py-django-dpaste depends on py-django-mptt but is about to be limited to Django <= 1.6 (it does not currently support higher). Since py-django-mptt depends on www/py-django (currently 1.8.x), this results in the conflict described above. The same change will also be made in www/py-django-dpaste for any ports that may depend on *it* in the future. This change is a NOOP for other conditions. See r390184 [1] for another instance of this issue. [1] https://svnweb.freebsd.org/changeset/ports/390184 Approved by: portmgr (blanket: trivial, tested, build fixes) Modified: head/www/py-django-mptt/Makefile Modified: head/www/py-django-mptt/Makefile ============================================================================== --- head/www/py-django-mptt/Makefile Thu Jun 25 06:02:14 2015 (r390534) +++ head/www/py-django-mptt/Makefile Thu Jun 25 07:09:06 2015 (r390535) @@ -11,7 +11,7 @@ COMMENT= Utilities for implementing a pr LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.4.2:${PORTSDIR}/www/py-django +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django # >= 1.4.2 RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes