From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 16 03:30:12 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 3F77416A6F4 for ; Tue, 16 May 2006 03:30:12 +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 98DF543D46 for ; Tue, 16 May 2006 03:30:11 +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 k4G3UBt5042745 for ; Tue, 16 May 2006 03:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4G3UBuq042741; Tue, 16 May 2006 03:30:11 GMT (envelope-from gnats) Resent-Date: Tue, 16 May 2006 03:30:11 GMT Resent-Message-Id: <200605160330.k4G3UBuq042741@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, Koji Yokota Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 82E8416A7A1; Tue, 16 May 2006 03:29:47 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 553A943D45; Tue, 16 May 2006 03:29:47 +0000 (GMT) (envelope-from linimon@FreeBSD.org) Received: from freefall.freebsd.org (linimon@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4G3Tlti042677; Tue, 16 May 2006 03:29:47 GMT (envelope-from linimon@freefall.freebsd.org) Received: (from linimon@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4G3Tl5a042676; Tue, 16 May 2006 03:29:47 GMT (envelope-from linimon) Message-Id: <200605160329.k4G3Tl5a042676@freefall.freebsd.org> Date: Tue, 16 May 2006 03:29:47 GMT From: Koji Yokota To: FreeBSD-gnats-submit@FreeBSD.org Cc: linimon@FreeBSD.org Subject: ports/97330: [PATCH] japanese/phpgroupware: install destination is wrong 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, 16 May 2006 03:30:12 -0000 >Number: 97330 >Category: ports >Synopsis: [PATCH] japanese/phpgroupware: install destination is wrong >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue May 16 03:30:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Koji Yokota >Release: FreeBSD 6.1-STABLE amd64 >Organization: Otaru University of Commerce >Environment: System: FreeBSD hoge.otaru-uc.ac.jp 6.1-STABLE FreeBSD 6.1-STABLE #0: Thu May 11 02:25:24 JST 2006 hoge@hoge.otaru-uc.ac.jp:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Files are mistakenly installed in a wrong directory, /usr/local/www/data/phpgroupware/phpgroupware. In addition, the directory /usr/local/www/data/.... is not appropriate when www/apache22 is used. In that case, the directory should be under /usr/local/www/apache22/data/.... >How-To-Repeat: any time >Fix: --- diff begins here --- --- Makefile.orig Mon May 15 23:31:56 2006 +++ Makefile Tue May 16 00:32:34 2006 @@ -18,13 +18,23 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/phpgroupware -INSTALLDIR= ${PREFIX}/www/data/phpgroupware + +## Define WITH_APACHE22 if the installed version of Apache is 2.2 +.if defined(WITH_APACHE22) +PHPDATA= www/apache22/data/phpgroupware +PLIST_SUB+= PHPDATA="www/apache22/data/phpgroupware" +.else +PHPDATA= www/data/phpgroupware +PLIST_SUB+= PHPDATA="www/data/phpgroupware" +.endif + +INSTALLDIR?= ${PREFIX}/${PHPDATA} USE_PHP= mbstring USE_BZIP2= yes do-install: - @${CP} -r ${WRKSRC} ${PREFIX}/www/data/ + @${CP} -r ${WRKSRC} ${INSTALLDIR} @${CHOWN} -R www:www ${INSTALLDIR} @${CHMOD} -R 770 ${INSTALLDIR} >Release-Note: >Audit-Trail: >Unformatted: