From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 29 11:20:21 2006 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 288A416A401 for ; Sat, 29 Apr 2006 11:20:21 +0000 (UTC) (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 B249043D45 for ; Sat, 29 Apr 2006 11:20:20 +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 k3TBKKmi034211 for ; Sat, 29 Apr 2006 11:20:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3TBKKno034210; Sat, 29 Apr 2006 11:20:20 GMT (envelope-from gnats) Resent-Date: Sat, 29 Apr 2006 11:20:20 GMT Resent-Message-Id: <200604291120.k3TBKKno034210@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 E76F116A4D2 for ; Sat, 29 Apr 2006 11:14:19 +0000 (UTC) (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 3106843D48 for ; Sat, 29 Apr 2006 11:14:19 +0000 (GMT) (envelope-from sime@data.home.hr) Received: by data.home.hr (Postfix, from userid 34062) id 6AF0F5F4D2; Sat, 29 Apr 2006 13:14:16 +0200 (CEST) Message-Id: <20060429111416.6AF0F5F4D2@data.home.hr> Date: Sat, 29 Apr 2006 13:14:16 +0200 (CEST) From: Simun Mikecin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96508: [fix] www/mod_jk: support for apache >2.0 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: Sat, 29 Apr 2006 11:20:21 -0000 >Number: 96508 >Category: ports >Synopsis: [fix] www/mod_jk: support for apache >2.0 >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: Sat Apr 29 11:20:19 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Simun Mikecin >Release: FreeBSD 6.1-RC amd64 >Organization: >Environment: System: FreeBSD data.home.hr 6.1-RC FreeBSD 6.1-RC #0: Sat Apr 29 10:57:45 CEST 2006 root@data.home.hr:/var/obj/usr/src.6/sys/DATA amd64 >Description: Installing mod_jk port on apache 2.1 or 2.2 installs mod_jk.so module in the right directory, but in the package database it gets recorded wrongly: /usr/local/libexec/apache2/mod_jk.so instead of: /usr/local/libexec/apache21/mod_jk.so or: /usr/local/libexec/apache22/mod_jk.so Also port installs *conf.sample files in /usr/local/etc/apache2/ instead of /usr/local/etc/apache21/ or /usr/local/etc/apache22/. With this patch www/mod_jk-apache2 helper port can be removed, since this port now autodetects the version of apache installed on the system. >How-To-Repeat: Try installing this port on system with apache 2.1 or apache 2.2 installed. >Fix: diff -u mod_jk.old/Makefile mod_jk/Makefile --- mod_jk.old/Makefile Thu Dec 22 23:05:38 2005 +++ mod_jk/Makefile Sat Apr 29 13:01:08 2006 @@ -7,7 +7,7 @@ PORTNAME= mod_jk PORTVERSION= 1.2.15 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH?= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} @@ -17,19 +17,19 @@ MAINTAINER?= girgen@FreeBSD.org COMMENT?= Apache JK module for connecting to Tomcat using AJP1X -USE_APACHE= YES +USE_APACHE= 1.3+ .include -.if exists(${LOCALBASE}/include/apache2/apr.h) -WITH_APACHE2= YES -.endif - -.if defined(WITH_APACHE2) -APACHE_VER= 2.0 +.if ${APACHE_VERSION} >= 20 +.if ${APACHE_VERSION} >= 21 +APACHE2= ${APACHE_VERSION} +PLIST_SUB= APACHE2=${APACHE_VERSION} +.else APACHE2= 2 PLIST_SUB= APACHE2=2 -PKGNAMESUFFIX= -apache2 +.endif +APACHE_VER= 2.0 .else APACHE_VER= 1.3 APACHE2= @@ -52,6 +52,6 @@ ${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF} post-install: - ${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g" + ${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g" | ${SED} "s|etc/apache|etc/apache${APACHE2}|g" .include Common subdirectories: mod_jk.old/files and mod_jk/files diff -u mod_jk.old/pkg-plist mod_jk/pkg-plist --- mod_jk.old/pkg-plist Tue Jul 26 23:46:33 2005 +++ mod_jk/pkg-plist Sat Apr 29 12:35:57 2006 @@ -1,5 +1,5 @@ etc/apache%%APACHE2%%/mod_jk.conf.sample etc/apache%%APACHE2%%/workers.properties.sample -libexec/apache%%APACHE2%%/mod_jk.so +%%APACHEMODDIR%%/mod_jk.so @exec %D/sbin/apxs -e -A -n jk %f || true @unexec %D/sbin/apxs -e -A -n jk %f || true >Release-Note: >Audit-Trail: >Unformatted: