Date: Mon, 8 Jun 2015 21:44:39 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388885 - in head/www/mod_perl2: . files Message-ID: <201506082144.t58LidbA075606@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Mon Jun 8 21:44:38 2015 New Revision: 388885 URL: https://svnweb.freebsd.org/changeset/ports/388885 Log: - add patch from upstream trunk - mark broken with perl5.22.x - fix pkg-plist if build against apache22 and perl with THREADS=off PR: 15750 Submitted by: nick(_at_)foobar.org Added: head/www/mod_perl2/files/patch-README (contents, props changed) head/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h (contents, props changed) Modified: head/www/mod_perl2/Makefile head/www/mod_perl2/pkg-plist Modified: head/www/mod_perl2/Makefile ============================================================================== --- head/www/mod_perl2/Makefile Mon Jun 8 21:25:24 2015 (r388884) +++ head/www/mod_perl2/Makefile Mon Jun 8 21:44:38 2015 (r388885) @@ -3,6 +3,7 @@ PORTNAME= mod_perl DISTVERSION= 2.0.9-rc2 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= www perl5 #MASTER_SITES= APACHE/perl @@ -33,6 +34,11 @@ PLIST_SUB+= APMOD_FILE=${APMOD_FILE} .include <bsd.port.pre.mk> +.if ${PERL_VER} == 5.22 +BROKEN= PERL ${PERL_VER} is not supported by upstream,\ + see http://svn.apache.org/viewvc/perl/modperl/trunk/README?view=markup +.endif + # Provider is build iff apache24 is in use .if ${APACHE_VERSION:M22} PLIST_SUB+= AP22="@comment " @@ -40,6 +46,18 @@ PLIST_SUB+= AP22="@comment " PLIST_SUB+= AP22="" .endif +# PR 15750 +# Test whether the system uses a multithreaded perl +HAS_ITHREADS!= ${PERL} -e 'use Config; print $$Config{useithreads} ? 1 : 0' +.if ${HAS_ITHREADS:M1} +PLIST_SUB+= ITHREADS="" +.else +. if !${APACHE_VERSION:M22} +IGNORE= requires PERL with "THREADS=on", please rebuild PERL and all depending ports +. endif +PLIST_SUB+= ITHREADS="@comment " +.endif + CONFIGURE_ARGS= PREFIX=${PREFIX} MP_APXS=${APXS} \ MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config Added: head/www/mod_perl2/files/patch-README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_perl2/files/patch-README Mon Jun 8 21:44:38 2015 (r388885) @@ -0,0 +1,14 @@ +--- README.orig 2015-05-30 17:49:11 UTC ++++ README +@@ -12,7 +12,10 @@ Apache: + + Perl: + Any stable version of Perl currently in support by the Perl community, +- as described in recent Perl distributions' "perlpolicy.pod" document. ++ as described in recent Perl distributions' "perlpolicy.pod" document, ++ EXCEPT THAT Perl 5.22.x is currently not supported due to the problem ++ reported in https://rt.cpan.org/Ticket/Display.html?id=101962 ++ We hope to address that in the next release (2.0.10). + + Newer Perl versions may work with this version of mod_perl. If not, + the svn version likely will (see above). Added: head/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h Mon Jun 8 21:44:38 2015 (r388885) @@ -0,0 +1,20 @@ +--- src/modules/perl/modperl_error.h.orig 2015-05-30 17:49:12 UTC ++++ src/modules/perl/modperl_error.h +@@ -37,6 +37,7 @@ char *modperl_error_strerror(pTHX_ apr_s + + void modperl_croak(pTHX_ apr_status_t rc, const char* func); + ++#ifdef USE_ITHREADS + #define MP_PUTBACK_IF_USED() STMT_START \ + { \ + modperl_interp_t *interp = modperl_thx_interp_get(aTHX); \ +@@ -44,6 +45,9 @@ void modperl_croak(pTHX_ apr_status_t rc + modperl_interp_unselect(interp); \ + } \ + } STMT_END ++#else ++#define MP_PUTBACK_IF_USED() NOOP ++#endif + + #define MP_CROAK_PUTBACK(rc, func) STMT_START \ + { \ Modified: head/www/mod_perl2/pkg-plist ============================================================================== --- head/www/mod_perl2/pkg-plist Mon Jun 8 21:25:24 2015 (r388884) +++ head/www/mod_perl2/pkg-plist Mon Jun 8 21:44:38 2015 (r388885) @@ -160,8 +160,8 @@ bin/mp2bug %%SITE_ARCH%%/ModPerl/Const.pm %%SITE_ARCH%%/ModPerl/FunctionMap.pm %%SITE_ARCH%%/ModPerl/Global.pm -%%SITE_ARCH%%/ModPerl/InterpPool.pm -%%SITE_ARCH%%/ModPerl/Interpreter.pm +%%ITHREADS%%%%SITE_ARCH%%/ModPerl/InterpPool.pm +%%ITHREADS%%%%SITE_ARCH%%/ModPerl/Interpreter.pm %%SITE_ARCH%%/ModPerl/MM.pm %%SITE_ARCH%%/ModPerl/Manifest.pm %%SITE_ARCH%%/ModPerl/MapUtil.pm @@ -177,8 +177,8 @@ bin/mp2bug %%SITE_ARCH%%/ModPerl/StructureMap.pm %%SITE_ARCH%%/ModPerl/TestReport.pm %%SITE_ARCH%%/ModPerl/TestRun.pm -%%SITE_ARCH%%/ModPerl/TiPool.pm -%%SITE_ARCH%%/ModPerl/TiPoolConfig.pm +%%ITHREADS%%%%SITE_ARCH%%/ModPerl/TiPool.pm +%%ITHREADS%%%%SITE_ARCH%%/ModPerl/TiPoolConfig.pm %%SITE_ARCH%%/ModPerl/TypeMap.pm %%SITE_ARCH%%/ModPerl/Util.pm %%SITE_ARCH%%/ModPerl/WrapXS.pm @@ -235,10 +235,10 @@ bin/mp2bug %%SITE_ARCH%%/auto/Apache2/typemap %%SITE_ARCH%%/auto/ModPerl/Const/Const.so %%SITE_ARCH%%/auto/ModPerl/Global/Global.so -%%SITE_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so -%%SITE_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so -%%SITE_ARCH%%/auto/ModPerl/TiPool/TiPool.so -%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so +%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so +%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so +%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/TiPool/TiPool.so +%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so %%SITE_ARCH%%/auto/ModPerl/Util/Util.so %%SITE_ARCH%%/mod_perl2.pm %%PERL5_MAN3%%/APR.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506082144.t58LidbA075606>