- update to rc3

- move ITHREAD check to pre-configure (dependencies are already installed) [1]
- use @sample macro for apache module file [2]

[1] If this is not working as expected, detection will be replaced with an OPTION

PR:	200799 [2]

5 files changed, 22 insertions, 58 deletions

diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index a5fe1d8e3a83..e7289873c722 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_perl
-DISTVERSION=	2.0.9-rc2
-PORTREVISION=	1
+DISTVERSION=	2.0.9-rc3
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 #MASTER_SITES=	APACHE/perl
@@ -46,25 +45,6 @@ PLIST_SUB+=	AP22="@comment "
 PLIST_SUB+=	AP22=""
 .endif
 
-# PR 200697
-# Test whether the system uses a multithreaded perl
-.if exists(${PERL})
-HAS_ITHREADS!=	${PERL} -e 'use Config; print $$Config{useithreads} ? 1 : 0'
-.else
-# ASsume true when building packages5.
-HAS_ITHREADS=	1
-.endif
-.if ${HAS_ITHREADS:M1}
-PLIST_SUB+=	ITHREADS=""
-.else
-#. if !${APACHE_VERSION:M22}
-#XXX build is correct, but this test fails in poudriere.
-#    Let it fail in configure until we find a working condition
-#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
 
@@ -78,9 +58,27 @@ post-patch:
 pre-configure:
 	${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete
 
+# PR 200697: Test whether the system uses a multithreaded perl
+.if exists(${PERL})
+HAS_ITHREADS!=	${PERL} -e 'use Config; print $$Config{useithreads} ? 1 : 0'
+.else
+# Assume true when building packages.
+HAS_ITHREADS=	1
+.endif
+
+.if ${HAS_ITHREADS:M1}
+PLIST_SUB+=	ITHREADS=""
+.else
+PLIST_SUB+=	ITHREADS="@comment "
+. if !${APACHE_VERSION:M22}
+IGNORE=		requires PERL with "THREADS=on", please rebuild PERL and all depending ports
+. endif
+.endif
+
 post-configure:
 	${REINPLACE_CMD} -e 's/-pthread -Wl,-E//g' \
 		${PATCH_WRKSRC}/xs/APR/APR/Makefile
+	@${ECHO_CMD} == PERL: \"${PERL_VER}\", ITHREADS: \"${HAS_ITHREADS}\", Apache: \"${APACHE_VERSION}\"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index ef76dd34ebe6..0c40f70b4058 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mod_perl-2.0.9-rc2.tar.gz) = 63a43a2f9e7f05eb1885891c03ba4c9d1ee1241e2e4fdb257fe51eb63e52e891
-SIZE (mod_perl-2.0.9-rc2.tar.gz) = 3846396
+SHA256 (mod_perl-2.0.9-rc3.tar.gz) = 4386a6e549874e83298354180fde06d3e066284f428217981732f1d03ccf8197
+SIZE (mod_perl-2.0.9-rc3.tar.gz) = 3846145
diff --git a/www/mod_perl2/files/patch-README b/www/mod_perl2/files/patch-README
deleted file mode 100644
index ed8c088f34e9..000000000000
--- a/www/mod_perl2/files/patch-README
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index dbe6fc0c8218..000000000000
--- a/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 def0e3f40826..9c68acc81271 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -1,5 +1,5 @@
 bin/mp2bug
-%%APACHEETCDIR%%/modules.d/%%APMOD_FILE%%
+@sample %%APACHEETCDIR%%/modules.d/%%APMOD_FILE%%
 %%APACHEINCLUDEDIR%%/modperl_apr_perlio.h
 %%APACHEINCLUDEDIR%%/modperl_xs_sv_convert.h
 %%APACHEINCLUDEDIR%%/modperl_xs_typedefs.h