From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 29 07:30:23 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 291E916A416 for ; Fri, 29 Sep 2006 07:30:23 +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 D47DF43D46 for ; Fri, 29 Sep 2006 07:30: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 k8T7UHT7052184 for ; Fri, 29 Sep 2006 07:30:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8T7UHjD052180; Fri, 29 Sep 2006 07:30:17 GMT (envelope-from gnats) Resent-Date: Fri, 29 Sep 2006 07:30:17 GMT Resent-Message-Id: <200609290730.k8T7UHjD052180@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, Hirohisa Yamaguchi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B85C416A407 for ; Fri, 29 Sep 2006 07:24:49 +0000 (UTC) (envelope-from umq@ueo.co.jp) Received: from mvs1.plala.or.jp (mvs1.plala.or.jp [58.93.247.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF03743D45 for ; Fri, 29 Sep 2006 07:24:48 +0000 (GMT) (envelope-from umq@ueo.co.jp) Received: from eupheme.kaumoge.org ([125.205.176.135]) by mvs1.plala.or.jp with ESMTP id <20060929072447.PZHX21584.mvs1.plala.or.jp@eupheme.kaumoge.org> for ; Fri, 29 Sep 2006 16:24:47 +0900 Received: from calliope.kaumoge.org (calliope.kaumoge.org [192.168.24.120]) by eupheme.kaumoge.org (8.12.11/8.12.11/20030713) with ESMTP id k8T7P8FO017987 for ; Fri, 29 Sep 2006 16:25:08 +0900 (JST) (envelope-from umq@ueo.co.jp) Message-Id: <868xk3b0e9.wl%umq@ueo.co.jp> Date: Fri, 29 Sep 2006 16:24:46 +0900 From: Hirohisa Yamaguchi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103800: [patch] www/apache22 multiple instantiation does not work in recent releases 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: Fri, 29 Sep 2006 07:30:23 -0000 >Number: 103800 >Category: ports >Synopsis: [patch] www/apache22 multiple instantiation does not work in recent releases >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Sep 29 07:30:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Hirohisa Yamaguchi >Release: FreeBSD 7.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD calliope.****.org 7.0-CURRENT FreeBSD 7.0-CURRENT #2: Fri Sep 1 13:15:27 JST 2006 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64 >Description: In recent releases, .sh suffix on rc start scripts are deleted. http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.port.mk#rev1.510 In ``multiple instantiation'' feature, the rc script calls itself recursively, and a change in name of the script file might cause failure. >How-To-Repeat: 1. setting up www/apache22 to run multiple instance 2. $PREFIX/etc/rc.d/apache22 start >Fix: the patch follows: diff -Npru ports.orig/www/apache22/Makefile ports/www/apache22/Makefile --- ports.orig/www/apache22/Makefile Mon Sep 25 01:16:39 2006 +++ ports/www/apache22/Makefile Fri Sep 29 15:46:34 2006 @@ -126,6 +126,13 @@ CONFIGURE_ARGS+= --with-ldap \ .include "${APACHEDIR}/Makefile.modules" .include +# .sh suffix is stripped in recent releases. +.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 )) +SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}" +.else +SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}" +.endif + .if defined(WITH_APR_FROM_PORTS) PLIST_SUB+= APR_PORTS="@comment " LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr diff -Npru ports.orig/www/apache22/files/apache22.sh.in ports/www/apache22/files/apache22.sh.in --- ports.orig/www/apache22/files/apache22.sh.in Mon Sep 25 01:16:40 2006 +++ ports/www/apache22/files/apache22.sh.in Fri Sep 29 15:43:48 2006 @@ -92,7 +92,7 @@ else if [ "x$1" != "xrestart" ]; then for profile in ${apache22_profiles}; do echo "===> apache22 profile: ${profile}" - %%PREFIX%%/etc/rc.d/apache22.sh $1 ${profile} + %%RC_SCRIPT%% $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" >Release-Note: >Audit-Trail: >Unformatted: