mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

- fix filesystem touch before install (mod_python33)

Browse Source 
- add CONFLICTS_INSTALL
- install egg-info to shut up the qa script (no cherry picking ;(
- rework module installation
- bump PORTREVISION

Noted by swills@
This commit is contained in:
Olli Hauer 2014-04-16 22:31:32 +00:00
parent b8856298ff
commit f9e7438289
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=351425
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/mod_python33/Makefile
View File

@ -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

10
www/mod_python33/files/patch-Makefile.in
View File

@ -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"

6
www/mod_python33/pkg-plist
View File

@ -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

6
www/mod_python35/Makefile
View File

@ -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

6
www/mod_python35/pkg-plist
View File

@ -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