10 files changed, 12 insertions, 8 deletions

diff --git a/MOVED b/MOVED
index f48b5ddb1edb..87301cde095c 100644
--- a/MOVED
+++ b/MOVED
@@ -3641,3 +3641,5 @@ sysutils/cfengine3|sysutils/cfengine33|2012-08-14|Standardize port naming
 lang/erlang-lite|lang/erlang|2012-08-15|Redundant port removed
 devel/apr0|devel/apr1|2012-08-18|Has expired
 www/apache20|www/apache22|2012-08-18|Has expired
+www/django-mezzanine-filebrowser|www/py-django-mezzanine-filebrowser|2012-08-19|Rename to consistency with other Python ports
+www/django-mezzanine-grappelli|www/py-django-mezzanine-grappelli|2012-08-19|Rename to consistency with other Python ports
diff --git a/www/Makefile b/www/Makefile
index 35e9623989ab..534f584f71fe 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -125,8 +125,6 @@
     SUBDIR += dillo
     SUBDIR += dillo-i18n
     SUBDIR += dillo2
-    SUBDIR += django-mezzanine-filebrowser
-    SUBDIR += django-mezzanine-grappelli
     SUBDIR += docebo
     SUBDIR += dojo
     SUBDIR += dojo-shrinksafe
@@ -324,8 +322,8 @@
     SUBDIR += hs-yesod-form
     SUBDIR += hs-yesod-json
     SUBDIR += hs-yesod-persistent
-    SUBDIR += hs-yesod-routes
     SUBDIR += hs-yesod-platform
+    SUBDIR += hs-yesod-routes
     SUBDIR += hs-yesod-static
     SUBDIR += hs-yesod-test
     SUBDIR += htdump
@@ -1469,6 +1467,8 @@
     SUBDIR += py-django-json-rpc
     SUBDIR += py-django-keyedcache
     SUBDIR += py-django-livesettings
+    SUBDIR += py-django-mezzanine-filebrowser
+    SUBDIR += py-django-mezzanine-grappelli
     SUBDIR += py-django-mptt
     SUBDIR += py-django-openid-auth
     SUBDIR += py-django-photologue
@@ -1657,8 +1657,8 @@
     SUBDIR += reviewboard
     SUBDIR += rnews
     SUBDIR += roundup
-    SUBDIR += rssowl
     SUBDIR += rsskit
+    SUBDIR += rssowl
     SUBDIR += rsstail
     SUBDIR += rsstool
     SUBDIR += rt38
diff --git a/www/django-mezzanine-filebrowser/Makefile b/www/py-django-mezzanine-filebrowser/Makefile
index 42d58d900c39..f737be0d8f40 100644
--- a/www/django-mezzanine-filebrowser/Makefile
+++ b/www/py-django-mezzanine-filebrowser/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	django-mezzanine-filebrowser
+# New ports collection makefile for:	py-django-mezzanine-filebrowser
 # Date created:		2012-05-28
 # Whom:			koobs <koobs.freebsd@gmail.com>
 #
@@ -7,7 +7,8 @@
 
 PORTNAME=	django-mezzanine-filebrowser
 PORTVERSION=	0.2.6
-CATEGORIES=	www
+PORTREVISION=	1
+CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	filebrowser_safe-${PORTVERSION}
diff --git a/www/django-mezzanine-filebrowser/distinfo b/www/py-django-mezzanine-filebrowser/distinfo
index 6819aa266bcc..6819aa266bcc 100644
--- a/www/django-mezzanine-filebrowser/distinfo
+++ b/www/py-django-mezzanine-filebrowser/distinfo
diff --git a/www/django-mezzanine-filebrowser/pkg-descr b/www/py-django-mezzanine-filebrowser/pkg-descr
index 698e0ceb939a..698e0ceb939a 100644
--- a/www/django-mezzanine-filebrowser/pkg-descr
+++ b/www/py-django-mezzanine-filebrowser/pkg-descr
diff --git a/www/django-mezzanine-filebrowser/pkg-plist b/www/py-django-mezzanine-filebrowser/pkg-plist
index 53e90d2e1972..53e90d2e1972 100644
--- a/www/django-mezzanine-filebrowser/pkg-plist
+++ b/www/py-django-mezzanine-filebrowser/pkg-plist
diff --git a/www/django-mezzanine-grappelli/Makefile b/www/py-django-mezzanine-grappelli/Makefile
index d07353b91de8..81de7a0f59bf 100644
--- a/www/django-mezzanine-grappelli/Makefile
+++ b/www/py-django-mezzanine-grappelli/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	django-mezzanine-grappelli
+# New ports collection makefile for:	py-django-mezzanine-grappelli
 # Date created:		2012-05-28
 # Whom:			koobs <koobs.freebsd@gmail.com>
 #
@@ -7,7 +7,8 @@
 
 PORTNAME=	django-mezzanine-grappelli
 PORTVERSION=	0.2.6
-CATEGORIES=	www
+PORTREVISION=	1
+CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	grappelli_safe-${PORTVERSION}
diff --git a/www/django-mezzanine-grappelli/distinfo b/www/py-django-mezzanine-grappelli/distinfo
index 8674fd2615c1..8674fd2615c1 100644
--- a/www/django-mezzanine-grappelli/distinfo
+++ b/www/py-django-mezzanine-grappelli/distinfo
diff --git a/www/django-mezzanine-grappelli/pkg-descr b/www/py-django-mezzanine-grappelli/pkg-descr
index c7157f28e58f..c7157f28e58f 100644
--- a/www/django-mezzanine-grappelli/pkg-descr
+++ b/www/py-django-mezzanine-grappelli/pkg-descr
diff --git a/www/django-mezzanine-grappelli/pkg-plist b/www/py-django-mezzanine-grappelli/pkg-plist
index 44c61c8e9b73..44c61c8e9b73 100644
--- a/www/django-mezzanine-grappelli/pkg-plist
+++ b/www/py-django-mezzanine-grappelli/pkg-plist