Attachment 88358 Details for Bug 125151 – mod_perl2-2.0.4,3.patch

[patch] mod_perl2-2.0.4,3.patch

mod_perl2-2.0.4,3.patch (text/plain), 2.59 KB, created by Philip M. Gollucci on 2008-07-01 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2008-07-01 16:40:01 UTC

Size: 2.59 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/mod_perl2/Makefile,v
>retrieving revision 1.63
>diff -u -u -r1.63 Makefile
>--- Makefile	23 Jun 2008 18:16:05 -0000	1.63
>+++ Makefile	1 Jul 2008 15:35:16 -0000
>@@ -62,11 +62,13 @@
> 		APR::ThreadRWLock.3
> 
> .include <bsd.port.pre.mk>
>-.if exists(${LOCALBASE}/include/apr-1/apr.h)
> 
>+.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,\..*,,'`
> .elif exists(${LOCALBASE}/include/apr/apr.h)
> APR_H=		${LOCALBASE}/include/apr/apr.h
>+APR_MAJ_V!=	${ECHO_CMD} `${LOCALBASE}/bin/apr-config --version | ${SED} -e 's,\..*,,'`
> .endif
> 
> .if defined(APR_H)
>@@ -77,8 +79,14 @@
> 
> .if ${APR_HAS_THREADS} == 1
> PLIST_SUB+=	THREADMUTEX=""
>+.if ${APR_MAJ_V} > 0
>+PLIST_SUB+=	THREADRWLOCK=""
>+.else
>+PLIST_SUB+=	THREADRWLOCK="@comment "
>+.endif
> .else
> PLIST_SUB+=	THREADMUTEX="@comment "
>+PLIST_SUB+=	THREADRWLOCK="@comment "
> .endif
> 
> pre-fetch:
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/www/mod_perl2/pkg-plist,v
>retrieving revision 1.34
>diff -u -u -r1.34 pkg-plist
>--- pkg-plist	7 Jun 2008 15:31:21 -0000	1.34
>+++ pkg-plist	1 Jul 2008 15:35:16 -0000
>@@ -71,6 +71,7 @@
> %%SITE_PERL%%/%%PERL_ARCH%%/APR/String.pm
> %%SITE_PERL%%/%%PERL_ARCH%%/APR/Table.pm
> %%THREADMUTEX%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/ThreadMutex.pm
>+%%THREADRWLOCK%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/ThreadRWLock.pm
> %%SITE_PERL%%/%%PERL_ARCH%%/APR/URI.pm
> %%SITE_PERL%%/%%PERL_ARCH%%/APR/UUID.pm
> %%SITE_PERL%%/%%PERL_ARCH%%/APR/Util.pm
>@@ -211,6 +212,8 @@
> %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table/Table.so
> %%THREADMUTEX%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex/ThreadMutex.so
> %%THREADMUTEX%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex/ThreadMutex.bs
>+%%THREADRWLOCK%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadRWLock/ThreadRWLock.so
>+%%THREADRWLOCK%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadRWLock/ThreadRWLock.bs
> %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI/URI.bs
> %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI/URI.so
> %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/UUID/UUID.bs
>@@ -311,6 +314,7 @@
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/UUID
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI
> %%THREADMUTEX%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex
>+%%THREADRWLOCK%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadRWLock
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status

Actions: View | Diff

Attachments on bug 125151: 88358