diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/Makefile mod_wsgi/Makefile
--- /usr/ports/www/mod_wsgi/Makefile	2013-09-20 16:36:50.000000000 -0700
+++ mod_wsgi/Makefile	2013-11-17 16:55:26.000000000 -0800
@@ -1,23 +1,20 @@
-# Created by: Douglas Thrift
+# Created by: Douglas Thrift <douglas@douglasthrift.net>
 # $FreeBSD: www/mod_wsgi/Makefile 327776 2013-09-20 23:36:50Z bapt $
 
-PORTNAME=	mod_wsgi
+PORTNAME=	mod_wsgi2
 PORTVERSION=	2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		http://apt.douglasthrift.net/files/${PORTNAME}/ \
-		http://code.douglasthrift.net/files/${PORTNAME}/
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
+DISTNAME=	mod_wsgi-${PORTVERSION}
 
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Python WSGI adapter module for Apache
 
 LICENSE=	AL2
 
-
-LATEST_LINK=	mod_wsgi2
-CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-3.* mod_wsgi-3.*
+CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi3.* ${PKGNAMEPREFIX}mod_wsgi-3.* mod_wsgi-3.*
 
 PROJECTHOST=	modwsgi
 
@@ -26,12 +23,12 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
+MODULENAME=	mod_wsgi
 
 SUB_FILES=	pkg-message
 
 PORTSCOUT=	limit:^2\.
 
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO_MSG} "======================= ATTENTION! ======================"
 	@${ECHO_MSG}
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/Makefile mod_wsgi3/Makefile
--- /usr/ports/www/mod_wsgi3/Makefile	2013-09-20 16:36:50.000000000 -0700
+++ mod_wsgi3/Makefile	2013-11-17 16:51:03.000000000 -0800
@@ -1,19 +1,20 @@
+# Created by: Douglas Thrift <douglas@douglasthrift.net>
 # $FreeBSD: www/mod_wsgi3/Makefile 327776 2013-09-20 23:36:50Z bapt $
 
-PORTNAME=	mod_wsgi
+PORTNAME=	mod_wsgi3
 PORTVERSION=	3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
+DISTNAME=	mod_wsgi-${PORTVERSION}
 
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Python WSGI adapter module for Apache
 
 LICENSE=	AL2
 
-#LATEST_LINK=	mod_wsgi
-CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
+CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi2.* ${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
 
 PROJECTHOST=	modwsgi
 
@@ -22,6 +23,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
+MODULENAME=	mod_wsgi
 
 SUB_FILES=	pkg-message