svn commit: r389628 - in head/www/mod_perl2: . files

[Olli Hauer]

Author: ohauer
Date: Sun Jun 14 12:49:26 2015
New Revision: 389628
URL: https://svnweb.freebsd.org/changeset/ports/389628

Log:
  - 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]

Deleted:
  head/www/mod_perl2/files/patch-README
  head/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h
Modified:
  head/www/mod_perl2/Makefile
  head/www/mod_perl2/distinfo
  head/www/mod_perl2/pkg-plist

Modified: head/www/mod_perl2/Makefile
==============================================================================
--- head/www/mod_perl2/Makefile	Sun Jun 14 12:39:04 2015	(r389627)
+++ head/www/mod_perl2/Makefile	Sun Jun 14 12:49:26 2015	(r389628)
@@ -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

Modified: head/www/mod_perl2/distinfo
==============================================================================
--- head/www/mod_perl2/distinfo	Sun Jun 14 12:39:04 2015	(r389627)
+++ head/www/mod_perl2/distinfo	Sun Jun 14 12:49:26 2015	(r389628)
@@ -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

Modified: head/www/mod_perl2/pkg-plist
==============================================================================
--- head/www/mod_perl2/pkg-plist	Sun Jun 14 12:39:04 2015	(r389627)
+++ head/www/mod_perl2/pkg-plist	Sun Jun 14 12:49:26 2015	(r389628)
@@ -1,5 +1,5 @@
 bin/mp2bug
-%%APACHEETCDIR%%/modules.d/%%APMOD_FILE%%
+ at sample %%APACHEETCDIR%%/modules.d/%%APMOD_FILE%%
 %%APACHEINCLUDEDIR%%/modperl_apr_perlio.h
 %%APACHEINCLUDEDIR%%/modperl_xs_sv_convert.h
 %%APACHEINCLUDEDIR%%/modperl_xs_typedefs.h