diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2004-03-11 13:20:01 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2004-03-11 13:20:01 +0000 |
| commit | 03b2c83164d3c55c76e86511965bed8377559b4f (patch) | |
| tree | 57ae76dbf9ab4fd883ab6f70d85d08ddc1abb4c6 | |
| parent | 73c7ba827ac0671b93d18023d450376d5323fd03 (diff) | |
| download | ports-03b2c83164d3c55c76e86511965bed8377559b4f.tar.gz ports-03b2c83164d3c55c76e86511965bed8377559b4f.zip | |
- Update to 2.7.10 and unmark BROKEN. [1]
- Respect LOCALBASE for APXS location. [2]
- Assign maintainership to submitter. [2]
PR: 63960 [2]
Submitted by: Simon Barner <barner@in.tum.de> [1],
Josh Elsasser <jre@vineyard.net> [2]
Requested by: Hideki Machida <hido@neojapangz.com> [1]
Notes
Notes:
svn path=/head/; revision=103649
| -rw-r--r-- | www/mod_python/Makefile | 9 | ||||
| -rw-r--r-- | www/mod_python/distinfo | 4 | ||||
| -rw-r--r-- | www/mod_python/files/patch-Makefile.in | 2 | ||||
| -rw-r--r-- | www/mod_python/pkg-req.threads | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/www/mod_python/Makefile b/www/mod_python/Makefile index 0dd733014305..9540f5b5cf3c 100644 --- a/www/mod_python/Makefile +++ b/www/mod_python/Makefile @@ -6,18 +6,16 @@ # PORTNAME= mod_python -PORTVERSION= 2.7.8 +PORTVERSION= 2.7.10 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} MASTER_SITE_SUBDIR= modpython EXTRACT_SUFX= .tgz DIST_SUBDIR= python -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jre@vineyard.net COMMENT= Apache module for integrating Python -FORBIDDEN= denial of service vulnerability - USE_APACHE= yes NO_PACKAGE= "Requires Python without threads support" USE_PYTHON= yes @@ -27,10 +25,9 @@ USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${APXS} CONFIGURE_ENV= PYTHON_BIN=${PYTHON_CMD} +MAKE_ENV= PORTS_APXS=${APXS} PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g} -STRIP_CMD?= strip - pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "You may use the following build option:" diff --git a/www/mod_python/distinfo b/www/mod_python/distinfo index 62f7fdea5d27..c121855c5ddf 100644 --- a/www/mod_python/distinfo +++ b/www/mod_python/distinfo @@ -1,2 +1,2 @@ -MD5 (python/mod_python-2.7.8.tgz) = 4d5bee8317bfb45a3bb09f02b435e917 -SIZE (python/mod_python-2.7.8.tgz) = 176639 +MD5 (python/mod_python-2.7.10.tgz) = 12c98bdefa06735679efc878b81e9bb2 +SIZE (python/mod_python-2.7.10.tgz) = 175631 diff --git a/www/mod_python/files/patch-Makefile.in b/www/mod_python/files/patch-Makefile.in index de15a6bb574c..14643c434bc8 100644 --- a/www/mod_python/files/patch-Makefile.in +++ b/www/mod_python/files/patch-Makefile.in @@ -5,7 +5,7 @@ @echo "Performing DSO installation." @echo - $(INSTALL) src/mod_python.so $(LIBEXECDIR) -+ /usr/local/sbin/apxs -i -a src/mod_python.so ++ $(PORTS_APXS) -i -a src/mod_python.so @$(MAKE) install_py_lib @echo - @echo "Now don't forget to edit your main config and add" diff --git a/www/mod_python/pkg-req.threads b/www/mod_python/pkg-req.threads index 918d09944ed4..6244f88a580d 100644 --- a/www/mod_python/pkg-req.threads +++ b/www/mod_python/pkg-req.threads @@ -2,7 +2,7 @@ # anders@fix.no, 2001-08-07 pydir=`dirname $1 | sed "s/\/bin//"` -if [ "`ldd $1|grep libc_r`" ]; then +if [ "`ldd $1|egrep 'libc_r|libkse|libthr|libpthread'`" ]; then echo "Error: Python installation in $pydir uses threads. mod_python requires" echo "it to be built without threads. Please deinstall & rebuild/reinstall Python with" echo "WITHOUT_THREADS set." |