Date: Wed, 21 May 2014 23:37:19 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190094: [patch] Add staging support to www/fusionpbx Message-ID: <201405212337.s4LNbJbk036723@cgiserv.freebsd.org> Resent-Message-ID: <201405212340.s4LNe0iw060276@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
.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 <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405212337.s4LNbJbk036723>