diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile index 63a632fe1c46..664c72ddfe58 100644 --- a/www/mod_perl2/Makefile +++ b/www/mod_perl2/Makefile @@ -1,88 +1,88 @@ # Created by: Lars Eggert PORTNAME= mod_perl -PORTVERSION= 2.0.11 +PORTVERSION= 2.0.12 PORTEPOCH= 3 CATEGORIES= www perl5 MASTER_SITES= APACHE/perl PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} PKGNAMESUFFIX= 2 MAINTAINER= apache@FreeBSD.org COMMENT= Embeds a Perl interpreter in the Apache server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= p5-BSD-Resource>=0:devel/p5-BSD-Resource RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-CGI>=4.15:www/p5-CGI \ p5-libwww>=6.13:www/p5-libwww SUB_FILES= pkg-message ${APMOD_FILE} SUB_LIST= APACHEMODDIR=${APACHEMODDIR} USES= apache:2.2+ cpe gmake perl5 USE_PERL5= configure USE_CSTD= gnu89 CPE_VENDOR= apache APMOD_FILE= 260_${PORTNAME}.conf.sample PLIST_SUB+= APMOD_FILE=${APMOD_FILE} .include CONFIGURE_ARGS= PREFIX=${PREFIX} MP_APXS=${APXS} \ MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config post-patch: ${REINPLACE_CMD} -e 's/APR_INLINE//g' \ ${PATCH_WRKSRC}/src/modules/perl/modperl_common_util.h ${REINPLACE_CMD} -e "s|/usr/local/apache/bin/apxs|${APXS}|" \ -e "s|'bin', 'apxs'|'sbin', 'apxs'|" \ ${WRKSRC}/lib/Apache2/Build.pm 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 ${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \ ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl ${INSTALL_DATA} ${WRKSRC}/xs/*.h ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR} ${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_perl.so @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d -for f in `${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto -name \*.so` ; do \ ${STRIP_CMD} $${f}; \ done; test: build -@(${MAKE} test -C ${WRKSRC}) .include diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo index 26880e5bf77e..a8d1117aef27 100644 --- a/www/mod_perl2/distinfo +++ b/www/mod_perl2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1571899413 -SHA256 (mod_perl-2.0.11.tar.gz) = ca2a9e18cdf90f9c6023e786369d5ba75e8dac292ebfea9900c29bf42dc16f74 -SIZE (mod_perl-2.0.11.tar.gz) = 3848147 +TIMESTAMP = 1645531727 +SHA256 (mod_perl-2.0.12.tar.gz) = f5b821b59b0fdc9670e46ed0fcf32d8911f25126189a8b68c1652f9221eee269 +SIZE (mod_perl-2.0.12.tar.gz) = 3848030 diff --git a/www/mod_perl2/files/patch-src_modules_perl_modperl__perl.c b/www/mod_perl2/files/patch-src_modules_perl_modperl__perl.c deleted file mode 100644 index 2eb8ac9a7c10..000000000000 --- a/www/mod_perl2/files/patch-src_modules_perl_modperl__perl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/perl/modperl_perl.c.orig 2019-10-05 11:04:42 UTC -+++ src/modules/perl/modperl_perl.c -@@ -268,7 +268,7 @@ void modperl_hash_seed_set(pTHX) - #ifdef MP_NEED_HASH_SEED_FIXUP - if (MP_init_hash_seed_set) { - #if MP_PERL_VERSION_AT_LEAST(5, 17, 6) -- memcpy(&PL_hash_seed, &MP_init_hash_seed, -+ memcpy(PL_hash_seed, &MP_init_hash_seed, - sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ? - sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed)); - PL_hash_seed_set = MP_init_hash_seed_set;