From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 21 23:40:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B0B956B9 for ; Wed, 21 May 2014 23:40:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DD252D74 for ; Wed, 21 May 2014 23:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LNe0pX060277 for ; Wed, 21 May 2014 23:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4LNe0iw060276; Wed, 21 May 2014 23:40:00 GMT (envelope-from gnats) Resent-Date: Wed, 21 May 2014 23:40:00 GMT Resent-Message-Id: <201405212340.s4LNe0iw060276@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, Joseph Benden Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88B42692 for ; Wed, 21 May 2014 23:37:19 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C4EC2D5E for ; Wed, 21 May 2014 23:37:19 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LNbJWa036726 for ; Wed, 21 May 2014 23:37:19 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4LNbJbk036723; Wed, 21 May 2014 23:37:19 GMT (envelope-from nobody) Message-Id: <201405212337.s4LNbJbk036723@cgiserv.freebsd.org> Date: Wed, 21 May 2014 23:37:19 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190094: [patch] Add staging support to www/fusionpbx X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 23:40:00 -0000 >Number: 190094 >Category: ports >Synopsis: [patch] Add staging support to www/fusionpbx >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: Wed May 21 23:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Joseph Benden >Release: FreeBSD 11 >Organization: >Environment: FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Adds staging support to www/fusionpbx. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/fusionpbx/Makefile b/www/fusionpbx/Makefile index 99e1bc5..a2dbb7d 100644 --- a/www/fusionpbx/Makefile +++ b/www/fusionpbx/Makefile @@ -12,7 +12,7 @@ COMMENT= PHP5 Graphical User Interface for FreeSwitch LICENSE= MPL -LIB_DEPENDS= odbc:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php${PHP_VER}-pdo_odbc USE_PHP= dom filter ftp json pcre pdo pdo_sqlite posix \ @@ -20,7 +20,7 @@ USE_PHP= dom filter ftp json pcre pdo pdo_sqlite posix \ xsl zlib odbc USE_SQLITE= yes -DEFAULT_PHP_VER= 5 +DEFAULT_VERSIONS=php=5 VARBASE= /var @@ -32,7 +32,6 @@ OPTIONS_DEFINE= PDOPGSQL PDOMYSQL PDOPGSQL_DESC= Install POSTGRESQL PDO Connector PDOMYSQL_DESC= Install MySQL PDO Connector -NO_STAGE= yes .include .if ${PORT_OPTIONS:MPDOPGSQL} @@ -46,13 +45,13 @@ USE_PHP+= mysql pdo_mysql .endif do-install: - @${MKDIR} ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} @${FIND} ${WRKSRC} -name '*.php' -exec ${CHMOD} 644 {} + @cd ${WRKSRC}; ${FIND} . \ - | ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${CHOWN} -R www:www ${WWWDIR} - @${MKDIR} ${VARBASE}/db/fusionpbx - @${CHMOD} -R 0744 ${VARBASE}/db/fusionpbx - @${CHOWN} www:www ${VARBASE}/db/fusionpbx + | ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + @${CHOWN} -R www:www ${STAGEDIR}${WWWDIR} + @${MKDIR} ${STAGEDIR}${VARBASE}/db/fusionpbx + @${CHMOD} -R 0744 ${STAGEDIR}${VARBASE}/db/fusionpbx + @${CHOWN} www:www ${STAGEDIR}${VARBASE}/db/fusionpbx .include diff --git a/www/fusionpbx/pkg-plist b/www/fusionpbx/pkg-plist index 20d575a..f9fd519 100644 --- a/www/fusionpbx/pkg-plist +++ b/www/fusionpbx/pkg-plist @@ -1,3 +1,5 @@ +@owner www +@group www %%WWWDIR%%/.htaccess %%WWWDIR%%/app/adminer/adminer.php %%WWWDIR%%/app/adminer/app_config.php @@ -1601,3 +1603,4 @@ @dirrm %%WWWDIR%%/themes/classic @dirrm %%WWWDIR%%/themes @dirrmtry %%WWWDIR%% +@unexec rmdir "/var/db/fusionpbx" >/dev/null 2>&1 || : >Release-Note: >Audit-Trail: >Unformatted: