svn commit: r402472 - in head/www: py-django-pipeline py-django-pipeline12 py-django-pipeline14

Vanilla I. Shu vanilla at FreeBSD.org
Fri Nov 27 05:57:41 UTC 2015


Author: vanilla
Date: Fri Nov 27 05:57:39 2015
New Revision: 402472
URL: https://svnweb.freebsd.org/changeset/ports/402472

Log:
  1: add PKGNAMESUFFIX to py-django-pipeline14.
  2: add CONFLICT.

Modified:
  head/www/py-django-pipeline/Makefile
  head/www/py-django-pipeline12/Makefile
  head/www/py-django-pipeline14/Makefile

Modified: head/www/py-django-pipeline/Makefile
==============================================================================
--- head/www/py-django-pipeline/Makefile	Fri Nov 27 05:53:39 2015	(r402471)
+++ head/www/py-django-pipeline/Makefile	Fri Nov 27 05:57:39 2015	(r402472)
@@ -18,4 +18,7 @@ NO_ARCH=	yes
 USES=		python:2
 USE_PYTHON=	autoplist distutils
 
+CONFLICTS=	py[23][0-9]-django-pipeline12-[0-9]* \
+		py[23][0-9]-django-pipeline14-[0-9]*
+
 .include <bsd.port.mk>

Modified: head/www/py-django-pipeline12/Makefile
==============================================================================
--- head/www/py-django-pipeline12/Makefile	Fri Nov 27 05:53:39 2015	(r402471)
+++ head/www/py-django-pipeline12/Makefile	Fri Nov 27 05:57:39 2015	(r402472)
@@ -20,7 +20,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django14>0:${PORTSDIR}/www/py-django14
 
-CONFLICTS=	py[23][0-9]-django-pipeline-[0-9]*
+CONFLICTS=	py[23][0-9]-django-pipeline-[0-9]* \
+		py[23][0-9]-django-pipeline14-[0-9]*
 
 USES=		python:2
 USE_PYTHON=	distutils

Modified: head/www/py-django-pipeline14/Makefile
==============================================================================
--- head/www/py-django-pipeline14/Makefile	Fri Nov 27 05:53:39 2015	(r402471)
+++ head/www/py-django-pipeline14/Makefile	Fri Nov 27 05:57:39 2015	(r402472)
@@ -6,6 +6,7 @@ PORTVERSION=	1.4.7
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	14
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Asset (css/js) packaging library for Django
@@ -18,4 +19,7 @@ NO_ARCH=	yes
 USES=		python:2
 USE_PYTHON=	autoplist distutils
 
+CONFLICTS=	py[23][0-9]-django-pipeline-[0-9]* \
+		py[23][0-9]-django-pipeline12-[0-9]*
+
 .include <bsd.port.mk>


More information about the svn-ports-all mailing list