Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -3848,6 +3848,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: devel/py-django-tastypie-mongoengine/Makefile
===================================================================
--- devel/py-django-tastypie-mongoengine/Makefile
+++ 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: devel/py-django16-tastypie-mongoengine/Makefile
===================================================================
--- /dev/null
+++ 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-tastypie>=0.9.12:${PORTSDIR}/www/py-django16-tastypie \
+		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django16
+
+MASTERDIR=		${.CURDIR}/../py-django-tastypie-mongoengine
+
+CONFLICTS_INSTALL=	devel/py-django-tastypie-mongoengine
+
+.include "${MASTERDIR}/Makefile"
Index: security/py-crits/Makefile
===================================================================
--- security/py-crits/Makefile
+++ 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: www/Makefile
===================================================================
--- www/Makefile
+++ www/Makefile
@@ -1536,6 +1536,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: www/py-django-tastypie/Makefile
===================================================================
--- www/py-django-tastypie/Makefile
+++ www/py-django-tastypie/Makefile
@@ -14,10 +14,13 @@
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:${PORTSDIR}/devel/py-mimeparse \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil
-RUN_DEPENDS:=	${BUILD_DEPENDS} \
+
+RUN_DEPENDS?=	${BUILD_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: www/py-django16-tastypie/Makefile
===================================================================
--- /dev/null
+++ 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=	${BUILD_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16
+
+MASTERDIR=	${.CURDIR}/../py-django-tastypie
+
+CONFLICTS_INSTALL=	 ${PKGNAMEPREFIX}${PORTNAME}
+
+.include "${MASTERDIR}/Makefile"