3 files changed, 20 insertions, 42 deletions

diff --git a/devel/flyspray/Makefile b/devel/flyspray/Makefile
index 39d0aef9ffc3..faaed8c26e4a 100644
--- a/devel/flyspray/Makefile
+++ b/devel/flyspray/Makefile
@@ -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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>
diff --git a/devel/flyspray/files/README.FreeBSD b/devel/flyspray/files/README.FreeBSD
index 0873f0450299..3355dac2128b 100644
--- a/devel/flyspray/files/README.FreeBSD
+++ b/devel/flyspray/files/README.FreeBSD
@@ -61,10 +61,7 @@ You can upgrade from a previous version of Flyspray by doing the following:
    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";
 
diff --git a/devel/flyspray/pkg-plist b/devel/flyspray/pkg-plist
index 6418db00d28d..0d7cc4ab2a6b 100644
--- a/devel/flyspray/pkg-plist
+++ b/devel/flyspray/pkg-plist
@@ -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