summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorOlli Hauer <ohauer@FreeBSD.org>2015-06-08 21:44:38 +0000
committerOlli Hauer <ohauer@FreeBSD.org>2015-06-08 21:44:38 +0000
commit1c11f670feb0490ec5cfd11cba58a60b86a9a97b (patch)
tree6e946ca14892f9bd2c941006a4e8ba070cd1bb72 /www
parentb4471ad9f304bb6ed8c812b270047ded37ce0e0e (diff)
downloadfreebsd-ports-1c11f670feb0490ec5cfd11cba58a60b86a9a97b.zip
- 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
Diffstat (limited to 'www')
-rw-r--r--www/mod_perl2/Makefile18
-rw-r--r--www/mod_perl2/files/patch-README14
-rw-r--r--www/mod_perl2/files/patch-src__modules__perl__modperl_error.h20
-rw-r--r--www/mod_perl2/pkg-plist16
4 files changed, 60 insertions, 8 deletions
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 302f68345365..b76798b92a4b 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -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
diff --git a/www/mod_perl2/files/patch-README b/www/mod_perl2/files/patch-README
new file mode 100644
index 000000000000..ed8c088f34e9
--- /dev/null
+++ b/www/mod_perl2/files/patch-README
@@ -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).
diff --git a/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h b/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h
new file mode 100644
index 000000000000..dbe6fc0c8218
--- /dev/null
+++ b/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h
@@ -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 \
+ { \
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index f8f00bfd8360..def0e3f40826 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -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