svn commit: r390966 - in head: devel devel/py-django-tastypie-mongoengine devel/py-django16-tastypie-mongoengine security/py-crits www www/py-django-tastypie www/py-django16-tastypie
Dan Langille
dvl at FreeBSD.org
Tue Jun 30 15:39:44 UTC 2015
Author: dvl
Date: Tue Jun 30 15:39:41 2015
New Revision: 390966
URL: https://svnweb.freebsd.org/changeset/ports/390966
Log:
security/py-crits must use django v1.6 and will not work with v1.8
Two dependencies bring in www/py-django so I have created two new slave ports which
use www/py-django16
* devel/py-django-tastypie-mongoengine allowed you to select django 1.6 or 1.8 in the options It now uses only 1.8
* add slave port devel/py-django16-tastypie-mongoengine which uses django 1.6
* www/py-django-tastypie now sets RUN_DEPENDS only if not already set
* add slave www/py-django16-tastypie which uses django 1.6
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D2913
Added:
head/devel/py-django16-tastypie-mongoengine/
head/devel/py-django16-tastypie-mongoengine/Makefile (contents, props changed)
head/www/py-django16-tastypie/
head/www/py-django16-tastypie/Makefile (contents, props changed)
Modified:
head/devel/Makefile
head/devel/py-django-tastypie-mongoengine/Makefile
head/security/py-crits/Makefile
head/www/Makefile
head/www/py-django-tastypie/Makefile
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Tue Jun 30 15:26:54 2015 (r390965)
+++ head/devel/Makefile Tue Jun 30 15:39:41 2015 (r390966)
@@ -3864,6 +3864,7 @@
SUBDIR += py-distorm
SUBDIR += py-distutils-extra
SUBDIR += py-django-tastypie-mongoengine
+ SUBDIR += py-django16-tastypie-mongoengine
SUBDIR += py-docopt
SUBDIR += py-dogpile.cache
SUBDIR += py-dogpile.core
Modified: head/devel/py-django-tastypie-mongoengine/Makefile
==============================================================================
--- head/devel/py-django-tastypie-mongoengine/Makefile Tue Jun 30 15:26:54 2015 (r390965)
+++ head/devel/py-django-tastypie-mongoengine/Makefile Tue Jun 30 15:39:41 2015 (r390966)
@@ -13,23 +13,14 @@ COMMENT= MongoEngine support for django
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
+RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:${PORTSDIR}/www/py-django-tastypie \
+ ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
+ ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
+
USE_GITHUB= yes
GH_ACCOUNT= wlanslovenija
USES= python
USE_PYTHON= autoplist distutils
-OPTIONS_SINGLE= DJANGO
-OPTIONS_SINGLE_DJANGO= DJANGO16 DJANGO17
-OPTIONS_DEFAULT= DJANGO17
-
-DJANGO16_DESC= Build with Django 1.6
-DJANGO17_DESC= Build with Django 1.7
-
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:${PORTSDIR}/www/py-django-tastypie \
- ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine
-
-DJANGO16_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16
-DJANGO17_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
-
.include <bsd.port.mk>
Added: head/devel/py-django16-tastypie-mongoengine/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/py-django16-tastypie-mongoengine/Makefile Tue Jun 30 15:39:41 2015 (r390966)
@@ -0,0 +1,21 @@
+# Created by: Dan Langille <dvl at FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= django-tastypie-mongoengine
+PKGNAMESUFFIX= 16
+
+MAINTAINER= dvl at FreeBSD.org
+COMMENT= MongoEngine support for django-tastypie using Django 1.6
+
+LICENSE= AGPLv3
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-tastypie16>=0.9.12:${PORTSDIR}/www/py-django16-tastypie \
+ ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
+ ${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16
+
+MASTERDIR= ${.CURDIR}/../py-django-tastypie-mongoengine
+
+CONFLICTS_INSTALL= devel/py-django-tastypie-mongoengine
+
+.include "${MASTERDIR}/Makefile"
Modified: head/security/py-crits/Makefile
==============================================================================
--- head/security/py-crits/Makefile Tue Jun 30 15:26:54 2015 (r390965)
+++ head/security/py-crits/Makefile Tue Jun 30 15:39:41 2015 (r390966)
@@ -4,6 +4,7 @@
PORTNAME= crits
PORTVERSION= 3.1.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= security
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -45,8 +46,8 @@ RUN_DEPENDS+= 7z:${PORTSDIR}/archivers/p
${PYTHON_PKGNAMEPREFIX}pymongo>=2.7.1:${PORTSDIR}/databases/pymongo \
${PYTHON_PKGNAMEPREFIX}defusedxml>=0.4.1:${PORTSDIR}/devel/py-defusedxml \
${PYTHON_PKGNAMEPREFIX}django16>=1.6.5:${PORTSDIR}/www/py-django16 \
- ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.11.0:${PORTSDIR}/www/py-django-tastypie \
- ${PYTHON_PKGNAMEPREFIX}django-tastypie-mongoengine>=0.4.5:${PORTSDIR}/devel/py-django-tastypie-mongoengine \
+ ${PYTHON_PKGNAMEPREFIX}django-tastypie16>0:${PORTSDIR}/www/py-django16-tastypie \
+ ${PYTHON_PKGNAMEPREFIX}django-tastypie-mongoengine16>=0.4.5:${PORTSDIR}/devel/py-django16-tastypie-mongoengine \
${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
${PYTHON_PKGNAMEPREFIX}pydeep>=0.2:${PORTSDIR}/security/py-pydeep \
${PYTHON_PKGNAMEPREFIX}pefile>=1.2.10.114:${PORTSDIR}/devel/py-pefile \
Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile Tue Jun 30 15:26:54 2015 (r390965)
+++ head/www/Makefile Tue Jun 30 15:39:41 2015 (r390966)
@@ -1537,6 +1537,7 @@
SUBDIR += py-django-tagging
SUBDIR += py-django-taggit
SUBDIR += py-django-tastypie
+ SUBDIR += py-django16-tastypie
SUBDIR += py-django-threaded-multihost
SUBDIR += py-django-tinymce
SUBDIR += py-django-voting
Modified: head/www/py-django-tastypie/Makefile
==============================================================================
--- head/www/py-django-tastypie/Makefile Tue Jun 30 15:26:54 2015 (r390965)
+++ head/www/py-django-tastypie/Makefile Tue Jun 30 15:39:41 2015 (r390966)
@@ -12,12 +12,17 @@ COMMENT= Create REST API for Django apps
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:${PORTSDIR}/devel/py-mimeparse \
+MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:${PORTSDIR}/devel/py-mimeparse \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil
-RUN_DEPENDS:= ${BUILD_DEPENDS} \
+
+BUILD_DEPENDS= ${MY_DEPENDS}
+
+RUN_DEPENDS?= ${MY_DEPENDS} \
${PYTHON_PKGNAMEPREFIX}django>=1.5:${PORTSDIR}/www/py-django
USES= python
USE_PYTHON= distutils autoplist
+CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME}16
+
.include <bsd.port.mk>
Added: head/www/py-django16-tastypie/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/py-django16-tastypie/Makefile Tue Jun 30 15:39:41 2015 (r390966)
@@ -0,0 +1,19 @@
+# Created by: Dan Langille <dvl at FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= django-tastypie
+PKGNAMESUFFIX= 16
+
+MAINTAINER= dvl at FreeBSD.org
+COMMENT= Create REST API for Django apps using Django 1.6
+
+LICENSE= BSD3CLAUSE
+
+RUN_DEPENDS= ${MY_DEPENDS} \
+ ${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16
+
+MASTERDIR= ${.CURDIR}/../py-django-tastypie
+
+CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME}
+
+.include "${MASTERDIR}/Makefile"
More information about the svn-ports-all
mailing list