Index: head/www/mod_python33/Makefile =================================================================== --- head/www/mod_python33/Makefile (revision 422337) +++ head/www/mod_python33/Makefile (revision 422338) @@ -1,39 +1,39 @@ # Created by: Hye-Shik Chang # $FreeBSD$ PORTNAME= mod_python PORTVERSION= 3.3.1 PORTREVISION= 7 CATEGORIES= www python MASTER_SITES= APACHE_HTTPD/modpython PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} PKGNAMESUFFIX= 33 DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Apache module that embeds the Python interpreter within the server LICENSE= APACHE20 CONFLICTS_INSTALL= ap2[24]-mod_python3[^3]* USE_APACHE= 22 -USES= cpe python tar:tgz +USES= cpe python:2.7 tar:tgz CPE_VENDOR= apache GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs="${APXS}" \ --with-python="${PYTHON_CMD}" \ --without-flex 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 -@${MAKE} check -C ${WRKSRC} .include Index: head/www/mod_python33/files/patch-configure =================================================================== --- head/www/mod_python33/files/patch-configure (revision 422337) +++ head/www/mod_python33/files/patch-configure (revision 422338) @@ -1,12 +1,11 @@ ---- ./configure.orig 2006-03-11 03:46:52.000000000 +0000 -+++ ./configure 2014-08-02 22:49:33.000000000 +0000 -@@ -3013,7 +3013,7 @@ +--- configure.orig 2006-03-11 03:46:52 UTC ++++ configure +@@ -3013,7 +3013,7 @@ echo "$as_me:$LINENO: checking linker fl echo $ECHO_N "checking linker flags used to link Python... $ECHO_C" >&6 PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` -PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` +PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | sed 's,^LDFLAGS=,,' | tr '\011\012\015' ' '` LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}" LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}" echo "$as_me:$LINENO: result: $PY_LDFLAGS" >&5 - Index: head/www/mod_python33/files/patch-src__connobject.c =================================================================== --- head/www/mod_python33/files/patch-src__connobject.c (revision 422337) +++ head/www/mod_python33/files/patch-src__connobject.c (revision 422338) @@ -1,11 +1,11 @@ ---- src/connobject.c.orig 2008-08-28 12:30:24.000000000 +0000 -+++ src/connobject.c 2008-08-28 12:30:35.000000000 +0000 -@@ -139,7 +139,7 @@ +--- src/connobject.c.orig 2006-12-03 04:36:37 UTC ++++ src/connobject.c +@@ -139,7 +139,7 @@ static PyObject * _conn_read(conn_rec *c bytes_read = 0; while ((bytes_read < len || len == 0) && - !(b == APR_BRIGADE_SENTINEL(b) || + !(b == APR_BRIGADE_SENTINEL(bb) || APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) { const char *data; Index: head/www/mod_python35/Makefile =================================================================== --- head/www/mod_python35/Makefile (revision 422337) +++ head/www/mod_python35/Makefile (revision 422338) @@ -1,46 +1,46 @@ # Created by: Hye-Shik Chang # $FreeBSD$ PORTNAME= mod_python PORTVERSION= 3.5.0 PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= http://dist.modpython.org/dist/ \ LOCAL/ohauer PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} PKGNAMESUFFIX= 35 DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Apache module that embeds the Python interpreter within the server LICENSE= APACHE20 CONFLICTS_INSTALL= ap2[24]-mod_python3[^5]* USE_APACHE= 22+ -USES= cpe python tar:tgz +USES= cpe python:2.7 tar:tgz CPE_VENDOR= apache SUB_FILES= pkg-message 270_mod_python.conf.sample GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs="${APXS}" \ --with-python="${PYTHON_CMD}" \ --without-flex LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS+= APXS=${APXS} MAKE_ENV= EXPR_COMPAT=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} \ PYTHON_VER=${PYTHON_VER} post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${INSTALL_DATA} ${WRKDIR}/270_mod_python.conf.sample ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d # You need to install apache & mod_python before you run this regression-test: build ${REINPLACE_CMD} -e 's|%%APACHEMODDIR%%|${APACHEMODDIR}|' ${WRKSRC}/test/test.py -@${MAKE} test -C ${WRKSRC} .include