Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F147577388
D2913.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
5 KB
Referenced Files
None
Subscribers
None
D2913.diff
View Options
Index: head/devel/Makefile
===================================================================
--- head/devel/Makefile
+++ head/devel/Makefile
@@ -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
Index: head/devel/py-django-tastypie-mongoengine/Makefile
===================================================================
--- head/devel/py-django-tastypie-mongoengine/Makefile
+++ head/devel/py-django-tastypie-mongoengine/Makefile
@@ -13,23 +13,14 @@
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>
Index: head/devel/py-django16-tastypie-mongoengine/Makefile
===================================================================
--- head/devel/py-django16-tastypie-mongoengine/Makefile
+++ head/devel/py-django16-tastypie-mongoengine/Makefile
@@ -0,0 +1,21 @@
+# Created by: Dan Langille <dvl@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= django-tastypie-mongoengine
+PKGNAMESUFFIX= 16
+
+MAINTAINER= dvl@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"
Index: head/security/py-crits/Makefile
===================================================================
--- head/security/py-crits/Makefile
+++ head/security/py-crits/Makefile
@@ -4,6 +4,7 @@
PORTNAME= crits
PORTVERSION= 3.1.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= security
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -45,8 +46,8 @@
${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 \
Index: head/www/Makefile
===================================================================
--- head/www/Makefile
+++ head/www/Makefile
@@ -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
Index: head/www/py-django-tastypie/Makefile
===================================================================
--- head/www/py-django-tastypie/Makefile
+++ head/www/py-django-tastypie/Makefile
@@ -12,12 +12,17 @@
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>
Index: head/www/py-django16-tastypie/Makefile
===================================================================
--- head/www/py-django16-tastypie/Makefile
+++ head/www/py-django16-tastypie/Makefile
@@ -0,0 +1,19 @@
+# Created by: Dan Langille <dvl@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= django-tastypie
+PKGNAMESUFFIX= 16
+
+MAINTAINER= dvl@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"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Mar 13, 1:19 AM (6 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29603709
Default Alt Text
D2913.diff (5 KB)
Attached To
Mode
D2913: Make security/py-crits use www/py-django16
Attached
Detach File
Event Timeline
Log In to Comment