diff options
Diffstat (limited to 'www/mod_perl2/Makefile')
| -rw-r--r-- | www/mod_perl2/Makefile | 64 |
1 files changed, 16 insertions, 48 deletions
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile index 1ddc61387ca2..302f68345365 100644 --- a/www/mod_perl2/Makefile +++ b/www/mod_perl2/Makefile @@ -2,25 +2,25 @@ # $FreeBSD$ PORTNAME= mod_perl -PORTVERSION= 2.0.8 -PORTREVISION= 4 +DISTVERSION= 2.0.9-rc2 PORTEPOCH= 3 CATEGORIES= www perl5 -MASTER_SITES= APACHE/perl +#MASTER_SITES= APACHE/perl +MASTER_SITES= LOCAL/ohauer http://people.apache.org/~stevehay/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} PKGNAMESUFFIX= 2 -PATCH_SITES= LOCAL/ohauer - MAINTAINER= apache@FreeBSD.org -COMMENT= Embeds a Perl interpreter in the Apache2 server +COMMENT= Embeds a Perl interpreter in the Apache server LICENSE= APACHE20 BUILD_DEPENDS= p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource RUN_DEPENDS:= ${BUILD_DEPENDS} +TEST_DEPENDS= p5-CGI>=4.15:${PORTSDIR}/www/p5-CGI \ + p5-libwww>=6.13:${PORTSDIR}/www/p5-libwww -SUB_FILES= pkg-message +SUB_FILES= pkg-message ${APMOD_FILE} SUB_LIST= APACHEMODDIR=${APACHEMODDIR} USE_APACHE= 22+ USES= cpe gmake perl5 @@ -28,21 +28,10 @@ USE_PERL5= configure USE_CSTD= gnu89 CPE_VENDOR= apache -.include <bsd.port.pre.mk> +APMOD_FILE= 260_${PORTNAME}.conf.sample +PLIST_SUB+= APMOD_FILE=${APMOD_FILE} -# In case apache22 is in use and you want to test -# the new mod_perl, change '> 22' to '>= 22' -.if ${APACHE_VERSION} > 22 -# patch shaped against upstream mod_perl -# Last Changed Rev: 1602105 -PATCHREV= 1638352 -PATCHFILES+= ${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.gz -PLIST_SUB+= AP24="" -PMSED= 's/%AP24%//' -.else -PLIST_SUB+= AP24="@comment " -PMSED= '/%AP24%/d' -.endif +.include <bsd.port.pre.mk> # Provider is build iff apache24 is in use .if ${APACHE_VERSION:M22} @@ -51,29 +40,8 @@ PLIST_SUB+= AP22="@comment " PLIST_SUB+= AP22="" .endif -# Using apxs in this way is problematic if apache2 is installed under a -# different PREFIX than mod_perl2, because the mod_perl2 installation will -# use paths returned by apxs to install some components. Fixes welcome. -CONFIGURE_ARGS= PREFIX=${PREFIX} MP_APXS=${APXS} MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config - -.if exists(${LOCALBASE}/include/apr-1/apr.h) -APR_H= ${LOCALBASE}/include/apr-1/apr.h -APR_MAJ_V!= ${ECHO_CMD} `${LOCALBASE}/bin/apr-1-config --version | ${SED} -e 's,\..*,,'` -.endif - -.if defined(APR_H) -APR_HAS_THREADS!= ${ECHO_CMD} `${GREP} -c 'APR_HAS_THREADS *1' ${APR_H}` -.else -APR_HAS_THREADS= 0 -.endif - -.if ${APR_HAS_THREADS} == 1 -PLIST_SUB+= THREADMUTEX="" -PLIST_SUB+= THREADRWLOCK="" -.else -PLIST_SUB+= THREADMUTEX="@comment " -PLIST_SUB+= THREADRWLOCK="@comment " -.endif +CONFIGURE_ARGS= PREFIX=${PREFIX} MP_APXS=${APXS} \ + MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config post-patch: ${REINPLACE_CMD} -e 's/APR_INLINE//g' \ @@ -90,16 +58,16 @@ post-configure: ${PATCH_WRKSRC}/xs/APR/APR/Makefile post-install: -# adjust pkg-message - ${REINPLACE_CMD} -e ${PMSED} ${WRKDIR}/pkg-message - ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl + @${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} + @${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 \ ${CHMOD} u+w $${f}; \ |