From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 12 23:10:18 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A114216A41F for ; Mon, 12 Dec 2005 23:10:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 218AB43D6D for ; Mon, 12 Dec 2005 23:10:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id jBCNA3Ix019545 for ; Mon, 12 Dec 2005 23:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBCNA3Kj019540; Mon, 12 Dec 2005 23:10:03 GMT (envelope-from gnats) Resent-Date: Mon, 12 Dec 2005 23:10:03 GMT Resent-Message-Id: <200512122310.jBCNA3Kj019540@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, Simun Mikecin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E8FE16A41F for ; Mon, 12 Dec 2005 23:05:05 +0000 (GMT) (envelope-from sime@data.home.hr) Received: from data.home.hr (dh77-149.xnet.hr [83.139.77.149]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89CDC43D58 for ; Mon, 12 Dec 2005 23:04:53 +0000 (GMT) (envelope-from sime@data.home.hr) Received: by data.home.hr (Postfix, from userid 34062) id 3BDE45F4C3; Tue, 13 Dec 2005 00:04:50 +0100 (CET) Message-Id: <20051212230450.3BDE45F4C3@data.home.hr> Date: Tue, 13 Dec 2005 00:04:50 +0100 (CET) From: Simun Mikecin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/90312: [patch] www/mod_perl2: added support for www/apache22 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Simun Mikecin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2005 23:10:18 -0000 >Number: 90312 >Category: ports >Synopsis: [patch] www/mod_perl2: added support for www/apache22 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 12 23:10:03 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Simun Mikecin >Release: FreeBSD 6.0-STABLE amd64 >Organization: >Environment: System: FreeBSD data.home.hr 6.0-STABLE FreeBSD 6.0-STABLE #0: Tue Dec 6 22:53:01 CET 2005 root@data.home.hr:/var/obj/usr/src.6/sys/DATA amd64 >Description: Makefile of this port has hardcoded directories for integration with www/apache20. With this patch it is able to dynamically detect installed version of apache and configure accordingly. This adds support for www/apache21 (not tested) and www/apache22 (tested). >How-To-Repeat: Try to use www/apache22 port with www/mod_perl2 shared module. >Fix: diff -urN mod_perl2.old/Makefile mod_perl2/Makefile --- mod_perl2.old/Makefile Fri Oct 21 20:04:57 2005 +++ mod_perl2/Makefile Mon Dec 12 23:39:45 2005 @@ -16,8 +16,7 @@ MAINTAINER= lars.eggert@gmx.net COMMENT= Embeds a Perl interpreter in the Apache2 server -USE_APACHE= yes -WITH_APACHE2= yes +USE_APACHE= 2.0+ PERL_CONFIGURE= yes GMAKE= yes @@ -74,14 +73,14 @@ .endif post-install: - ${MKDIR} ${PREFIX}/include/apache2/modules/perl + ${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl ${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \ - ${PREFIX}/include/apache2/modules/perl - ${INSTALL_DATA} ${WRKSRC}/xs/*.h ${PREFIX}/include/apache2 - ${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${PREFIX}/include/apache2 - ${MKDIR} ${PREFIX}/libexec/apache2 + ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl + ${INSTALL_DATA} ${WRKSRC}/xs/*.h ${PREFIX}/${APACHEINCLUDEDIR} + ${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${PREFIX}/${APACHEINCLUDEDIR} + ${MKDIR} ${PREFIX}/${APACHEMODDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \ - ${PREFIX}/libexec/apache2/mod_perl.so + ${PREFIX}/${APACHEMODDIR}/mod_perl.so @${CAT} ${PKGMESSAGE} .include diff -urN mod_perl2.old/pkg-plist mod_perl2/pkg-plist --- mod_perl2.old/pkg-plist Fri Oct 21 20:04:57 2005 +++ mod_perl2/pkg-plist Mon Dec 12 23:54:56 2005 @@ -1,56 +1,56 @@ bin/mp2bug -include/apache2/modperl_apr_perlio.h -include/apache2/modperl_xs_sv_convert.h -include/apache2/modperl_xs_typedefs.h -include/apache2/modperl_xs_util.h -include/apache2/modules/perl/mod_perl.h -include/apache2/modules/perl/modperl_apache_compat.h -include/apache2/modules/perl/modperl_apache_includes.h -include/apache2/modules/perl/modperl_apr_compat.h -include/apache2/modules/perl/modperl_apr_includes.h -include/apache2/modules/perl/modperl_bucket.h -include/apache2/modules/perl/modperl_callback.h -include/apache2/modules/perl/modperl_cgi.h -include/apache2/modules/perl/modperl_cmd.h -include/apache2/modules/perl/modperl_common_debug.h -include/apache2/modules/perl/modperl_common_includes.h -include/apache2/modules/perl/modperl_common_log.h -include/apache2/modules/perl/modperl_common_types.h -include/apache2/modules/perl/modperl_common_util.h -include/apache2/modules/perl/modperl_config.h -include/apache2/modules/perl/modperl_const.h -include/apache2/modules/perl/modperl_constants.h -include/apache2/modules/perl/modperl_debug.h -include/apache2/modules/perl/modperl_directives.h -include/apache2/modules/perl/modperl_env.h -include/apache2/modules/perl/modperl_error.h -include/apache2/modules/perl/modperl_filter.h -include/apache2/modules/perl/modperl_flags.h -include/apache2/modules/perl/modperl_global.h -include/apache2/modules/perl/modperl_gtop.h -include/apache2/modules/perl/modperl_handler.h -include/apache2/modules/perl/modperl_hooks.h -include/apache2/modules/perl/modperl_interp.h -include/apache2/modules/perl/modperl_io.h -include/apache2/modules/perl/modperl_io_apache.h -include/apache2/modules/perl/modperl_largefiles.h -include/apache2/modules/perl/modperl_log.h -include/apache2/modules/perl/modperl_mgv.h -include/apache2/modules/perl/modperl_module.h -include/apache2/modules/perl/modperl_options.h -include/apache2/modules/perl/modperl_pcw.h -include/apache2/modules/perl/modperl_perl.h -include/apache2/modules/perl/modperl_perl_global.h -include/apache2/modules/perl/modperl_perl_includes.h -include/apache2/modules/perl/modperl_perl_pp.h -include/apache2/modules/perl/modperl_perl_unembed.h -include/apache2/modules/perl/modperl_svptr_table.h -include/apache2/modules/perl/modperl_sys.h -include/apache2/modules/perl/modperl_time.h -include/apache2/modules/perl/modperl_tipool.h -include/apache2/modules/perl/modperl_trace.h -include/apache2/modules/perl/modperl_types.h -include/apache2/modules/perl/modperl_util.h +%%APACHEINCLUDEDIR%%/modperl_apr_perlio.h +%%APACHEINCLUDEDIR%%/modperl_xs_sv_convert.h +%%APACHEINCLUDEDIR%%/modperl_xs_typedefs.h +%%APACHEINCLUDEDIR%%/modperl_xs_util.h +%%APACHEINCLUDEDIR%%/modules/perl/mod_perl.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_apache_compat.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_apache_includes.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_apr_compat.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_apr_includes.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_bucket.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_callback.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_cgi.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_cmd.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_debug.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_includes.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_log.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_types.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_util.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_config.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_const.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_constants.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_debug.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_directives.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_env.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_error.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_filter.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_flags.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_global.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_gtop.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_handler.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_hooks.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_interp.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_io.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_io_apache.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_largefiles.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_log.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_mgv.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_module.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_options.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_pcw.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl_global.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl_includes.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl_pp.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl_unembed.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_svptr_table.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_sys.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_time.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_tipool.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_trace.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_types.h +%%APACHEINCLUDEDIR%%/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/APR.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/Base64.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/Brigade.pm @@ -70,6 +70,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/APR/Status.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/String.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/Table.pm +%%SITE_PERL%%/%%PERL_ARCH%%/APR/ThreadMutex.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/URI.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/UUID.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/Util.pm @@ -208,6 +209,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String/String.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table/Table.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table/Table.so +%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex/ThreadMutex.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex/ThreadMutex.so %%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 @@ -270,7 +273,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util/Util.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/mod_perl2.pm -libexec/apache2/mod_perl.so +%%APACHEMODDIR%%/mod_perl.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global @@ -304,6 +307,7 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Util @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/UUID @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status @@ -329,6 +333,6 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR -@dirrm include/apache2/modules/perl -@unexec rmdir %D/include/apache2/modules 2>/dev/null || true -@unexec rmdir %D/include/apache2 2>/dev/null || true +@dirrm %%APACHEINCLUDEDIR%%/modules/perl +@unexec rmdir %D/%%APACHEINCLUDEDIR%%/modules 2>/dev/null || true +@unexec rmdir %D/%%APACHEINCLUDEDIR%% 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: