Date: Tue, 16 May 2006 03:29:47 GMT From: Koji Yokota <yokota@res.otaru-uc.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: linimon@FreeBSD.org Subject: ports/97330: [PATCH] japanese/phpgroupware: install destination is wrong Message-ID: <200605160329.k4G3Tl5a042676@freefall.freebsd.org> Resent-Message-ID: <200605160330.k4G3UBuq042741@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605160329.k4G3Tl5a042676>