From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 1 15:40:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EF7E106566C for ; Tue, 1 Jul 2008 15:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0BF878FC15 for ; Tue, 1 Jul 2008 15:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m61Fe1Dv098240 for ; Tue, 1 Jul 2008 15:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m61Fe1f1098239; Tue, 1 Jul 2008 15:40:01 GMT (envelope-from gnats) Resent-Date: Tue, 1 Jul 2008 15:40:01 GMT Resent-Message-Id: <200807011540.m61Fe1f1098239@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A33E1065672 for ; Tue, 1 Jul 2008 15:38:18 +0000 (UTC) (envelope-from pgollucci@riderwayinc.com) Received: from riderwayinc.com (riderwayinc.com [74.93.213.161]) by mx1.freebsd.org (Postfix) with ESMTP id 2384F8FC1C for ; Tue, 1 Jul 2008 15:38:17 +0000 (UTC) (envelope-from pgollucci@riderwayinc.com) Received: from riderwayinc.com (localhost [127.0.0.1]) by riderwayinc.com (8.14.2/8.14.2) with ESMTP id m61FcDEE019935 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Tue, 1 Jul 2008 15:38:13 GMT (envelope-from pgollucci@riderwayinc.com) Received: (from pgollucci@localhost) by riderwayinc.com (8.14.2/8.14.2/Submit) id m61Fc8GB019934; Tue, 1 Jul 2008 15:38:08 GMT (envelope-from pgollucci) Message-Id: <200807011538.m61Fc8GB019934@riderwayinc.com> Date: Tue, 1 Jul 2008 15:38:08 GMT From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/125151: [MAINTAINER] www/mod_perl2: fix pkg-plist for apr-1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2008 15:40:02 -0000 >Number: 125151 >Category: ports >Synopsis: [MAINTAINER] www/mod_perl2: fix pkg-plist for apr-1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 01 15:40:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 7.0-RELEASE amd64 >Organization: Riderway Inc. >Environment: System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008 >Description: - With apr 1.x and THREADS, ThreadRWLock is also now XS Wrapped and installed conditionally. - No PORTREVISION bump neccessary, this doesn't affect the default package. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- mod_perl2-2.0.4,3.patch begins here --- 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 -.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 --- mod_perl2-2.0.4,3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: