5 files changed, 18 insertions, 17 deletions

diff --git a/www/mod_python33/Makefile b/www/mod_python33/Makefile
index e5c7101a35b3..3bdb2654e50c 100644
--- a/www/mod_python33/Makefile
+++ b/www/mod_python33/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_python
 PORTVERSION=	3.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=	modpython
@@ -16,11 +16,12 @@ COMMENT=	Apache module that embeds the Python interpreter within the server
 
 LICENSE=	APACHE20
 
+CONFLICTS_INSTALL=	ap2[24]-mod_python3[^3]*
+
 USE_APACHE=	22
 USE_PYTHON=	yes
 USES=		tar:tgz
 
-INSTALLS_EGGINFO=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-apxs="${APXS}"		\
 			--with-python="${PYTHON_CMD}"	\
@@ -29,6 +30,8 @@ CONFIGURE_ARGS+=	--with-apxs="${APXS}"		\
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS+=	APXS=${APXS}
 MAKE_ENV=	EXPR_COMPAT=yes
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		PYTHON_VER=${PYTHON_VER}
 
 # You need to install apache & mod_python before you run this
 regression-test: build
diff --git a/www/mod_python33/files/patch-Makefile.in b/www/mod_python33/files/patch-Makefile.in
deleted file mode 100644
index bde1f5bc7fff..000000000000
--- a/www/mod_python33/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Makefile.in.orig	2010-06-08 21:02:59.711010209 -0400
-+++ ./Makefile.in	2010-06-08 21:06:55.645681728 -0400
-@@ -61,6 +61,7 @@
- 	@echo
- 	$(INSTALL) -d $(DESTDIR)$(LIBEXECDIR)
- 	$(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
-+	${APXS} -e -a -n python $(DESTDIR)$(LIBEXECDIR)/mod_python.so
- 	@echo
- 	@echo "Now don't forget to edit your main config and add"
- 	@echo "    LoadModule python_module $(LIBEXECDIR)/mod_python.so"
diff --git a/www/mod_python33/pkg-plist b/www/mod_python33/pkg-plist
index 329677302b98..958ee2e1bdcd 100644
--- a/www/mod_python33/pkg-plist
+++ b/www/mod_python33/pkg-plist
@@ -1,3 +1,4 @@
+%%PYTHON_SITELIBDIR%%/mod_python-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.py
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyo
@@ -35,7 +36,8 @@
 %%PYTHON_SITELIBDIR%%/mod_python/util.py
 %%PYTHON_SITELIBDIR%%/mod_python/util.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/util.pyo
+@unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
-@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
+@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F
+@unexec echo "Don't forget to remove all mod_%%AP_NAME%%-related directives in your httpd.conf"
 @dirrm %%PYTHON_SITELIBDIR%%/mod_python
diff --git a/www/mod_python35/Makefile b/www/mod_python35/Makefile
index 123a854d87af..8cdb3cafe8c3 100644
--- a/www/mod_python35/Makefile
+++ b/www/mod_python35/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mod_python
 PORTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.modpython.org/dist/ \
 		LOCAL/ohauer
@@ -16,11 +17,12 @@ COMMENT=	Apache module that embeds the Python interpreter within the server
 
 LICENSE=	APACHE20
 
+CONFLICTS_INSTALL=	ap2[24]-mod_python3[^5]*
+
 USE_APACHE=	22+
 USE_PYTHON=	yes
 USES=		tar:tgz
 
-INSTALLS_EGGINFO=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-apxs="${APXS}"		\
 			--with-python="${PYTHON_CMD}"	\
@@ -29,6 +31,8 @@ CONFIGURE_ARGS+=	--with-apxs="${APXS}"		\
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS+=	APXS=${APXS}
 MAKE_ENV=	EXPR_COMPAT=yes
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		PYTHON_VER=${PYTHON_VER}
 
 # You need to install apache & mod_python before you run this
 regression-test: build
diff --git a/www/mod_python35/pkg-plist b/www/mod_python35/pkg-plist
index faf780c862fb..84d719d8582b 100644
--- a/www/mod_python35/pkg-plist
+++ b/www/mod_python35/pkg-plist
@@ -1,4 +1,5 @@
 bin/mod_python
+%%PYTHON_SITELIBDIR%%/mod_python-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.py
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyo
@@ -42,7 +43,8 @@ bin/mod_python
 %%PYTHON_SITELIBDIR%%/mod_python/wsgi.py
 %%PYTHON_SITELIBDIR%%/mod_python/wsgi.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/wsgi.pyo
+@unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
-@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
+@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F
+@unexec echo "Don't forget to remove all mod_%%AP_NAME%%-related directives in your httpd.conf"
 @dirrm %%PYTHON_SITELIBDIR%%/mod_python