From owner-svn-ports-all@FreeBSD.ORG Sat Jul 5 00:24:57 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org 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 6F5FCF56; Sat, 5 Jul 2014 00:24:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 5C7952286; Sat, 5 Jul 2014 00:24:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s650OvKB082311; Sat, 5 Jul 2014 00:24:57 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s650Oute082308; Sat, 5 Jul 2014 00:24:56 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201407050024.s650Oute082308@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 5 Jul 2014 00:24:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360710 - in head/devel/flyspray: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jul 2014 00:24:57 -0000 Author: bapt Date: Sat Jul 5 00:24:56 2014 New Revision: 360710 URL: http://svnweb.freebsd.org/changeset/ports/360710 QAT: https://qat.redports.org/buildarchive/r360710/ Log: Support stage PR: 191498 Submitted by: nick@foobar.org Modified: head/devel/flyspray/Makefile head/devel/flyspray/files/README.FreeBSD head/devel/flyspray/pkg-plist Modified: head/devel/flyspray/Makefile ============================================================================== --- head/devel/flyspray/Makefile Sat Jul 5 00:22:07 2014 (r360709) +++ head/devel/flyspray/Makefile Sat Jul 5 00:24:56 2014 (r360710) @@ -3,7 +3,7 @@ PORTNAME= flyspray PORTVERSION= 0.9.9.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel www MASTER_SITES= http://flyspray.org/ @@ -21,13 +21,13 @@ NO_WRKSUBDIR= yes DOS2UNIX_REGEX= .php -OPTIONS_DEFINE= GRAPHVIZ MYSQL MYSQLI POSTGRES +OPTIONS_DEFINE= GRAPHVIZ MYSQL MYSQLI PGSQL OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= Use MySQLi Database Interface -POSTGRES_DESC= Use PostgreSQL Database Interface FLYSPRAYDIR= ${PREFIX}/share/${PORTNAME} +FSINSTALLDIR= ${STAGEDIR}${FLYSPRAYDIR} ATTACHMENTDIR= ${DBDIR}/${PORTNAME}/attachments DBDIR= /var/db @@ -52,25 +52,12 @@ SUB_LIST+= FLYSPRAYDIR="${FLYSPRAYDIR}" CHMOD="${CHMOD}" \ WWWGRP="${WWWGRP}" \ WWWOWN="${WWWOWN}" +PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -.endif - -.if ${PORT_OPTIONS:MMYSQLI} -USE_PHP+= mysqli -.endif - -.if ${PORT_OPTIONS:MPOSTGRES} -USE_PHP+= pgsql -.endif - -.if ${PORT_OPTIONS:MGRAPHVIZ} -RUN_DEPENDS+= ${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz -.endif +MYSQL_USE= PHP=mysql +MYSQLI_USE= PHP=mysqli +PGSQL_USE= PHP=pgsql +GRAPHVIZ_RUN_DEPENDS= ${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz post-patch: @${CP} ${PKGDIR}/files/README.FreeBSD ${WRKSRC}/docs/ @@ -83,27 +70,17 @@ post-patch: @${RM} ${WRKSRC}/includes/fix.inc.php.bak do-install: - ${MKDIR} ${FLYSPRAYDIR} - ${CHMOD} 755 ${FLYSPRAYDIR} + ${MKDIR} ${FSINSTALLDIR} ${CP} ${WRKSRC}/setup/upgrade/${PORTVERSION}/flyspray.conf.php ${WRKSRC}/flyspray.conf.php-dist - ${TOUCH} ${FLYSPRAYDIR}/flyspray.conf.php + ${TOUCH} ${FSINSTALLDIR}/flyspray.conf.php cd ${WRKSRC} && \ ${TAR} cf - ${FLYSPRAY_FILES} | \ - (cd ${FLYSPRAYDIR} && ${TAR} -xf -) - ${LN} -s ${ATTACHMENTDIR} ${FLYSPRAYDIR}/attachments - ${LN} -s ${PREFIX}/share/adodb ${FLYSPRAYDIR} - ${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/cache ${FLYSPRAYDIR}/flyspray.conf.php - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -post-install: install-doc - @${CAT} ${PKGMESSAGE} - -install-doc: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + (cd ${FSINSTALLDIR} && ${TAR} -xf -) + ${LN} -sf ${ATTACHMENTDIR} ${FSINSTALLDIR}/attachments + ${LN} -sf ${PREFIX}/share/adodb ${FSINSTALLDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/docs/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Modified: head/devel/flyspray/files/README.FreeBSD ============================================================================== --- head/devel/flyspray/files/README.FreeBSD Sat Jul 5 00:22:07 2014 (r360709) +++ head/devel/flyspray/files/README.FreeBSD Sat Jul 5 00:24:56 2014 (r360710) @@ -61,10 +61,7 @@ You can upgrade from a previous version package. 3) load http://yourserver.example.com/flyspray/setup/upgrade.php in your - browser and follow the instructions. If upgrading from 0.9.9beta2, - manually change the value of "fs_ver" in the {dbprefix}prefs table of - your Flyspray DB to "0.9.9 dev". You can do this using the folowing SQL - command: + browser and follow the instructions. sql> update flyspray_prefs set pref_value = "0.9.9 dev" where pref_name = "fs_ver"; Modified: head/devel/flyspray/pkg-plist ============================================================================== --- head/devel/flyspray/pkg-plist Sat Jul 5 00:22:07 2014 (r360709) +++ head/devel/flyspray/pkg-plist Sat Jul 5 00:24:56 2014 (r360710) @@ -7,7 +7,11 @@ %%DATADIR%%/header.php %%DATADIR%%/htaccess.dist %%DATADIR%%/flyspray.conf.php-dist +@owner %%WWWOWN%% +@group %%WWWGRP%% %%DATADIR%%/flyspray.conf.php +@owner +@group %%DATADIR%%/includes/.htaccess %%DATADIR%%/includes/class.backend.php %%DATADIR%%/includes/class.database.php