svn commit: r397470 - in head/devel/flyspray: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sun Sep 20 22:26:08 2015
New Revision: 397470
URL: https://svnweb.freebsd.org/changeset/ports/397470

Log:
  - Only use DOCS-related pkg-message when DOCS are enabled
  - Switch vardir handling from pkg-install script to @dir
  - Use options helpers
  - Add NO_ARCH
  - Reset maintainer by his own request
  
  PR:		203196
  Submitted by:	amdmi3
  Approved by:	nick at foobar.org (maintainer)

Deleted:
  head/devel/flyspray/files/pkg-install.in
Modified:
  head/devel/flyspray/Makefile
  head/devel/flyspray/pkg-plist

Modified: head/devel/flyspray/Makefile
==============================================================================
--- head/devel/flyspray/Makefile	Sun Sep 20 22:18:22 2015	(r397469)
+++ head/devel/flyspray/Makefile	Sun Sep 20 22:26:08 2015	(r397470)
@@ -3,11 +3,11 @@
 
 PORTNAME=	flyspray
 PORTVERSION=	0.9.9.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel www
 MASTER_SITES=	http://flyspray.org/
 
-MAINTAINER=	nick at foobar.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Simple, easy-to-use web based bug tracking system
 
 RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
@@ -17,6 +17,7 @@ USES=		dos2unix zip
 WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 DOS2UNIX_REGEX=	.php
@@ -24,6 +25,8 @@ DOS2UNIX_REGEX=	.php
 OPTIONS_DEFINE=	GRAPHVIZ MYSQL MYSQLI PGSQL DOCS
 OPTIONS_DEFAULT=	MYSQLI
 
+DOCS_SUB_FILES=	pkg-message
+
 MYSQLI_DESC=	Use MySQLi Database Interface
 
 FLYSPRAYDIR=	${PREFIX}/share/${PORTNAME}
@@ -44,15 +47,7 @@ FLYSPRAY_FILES=	cache docs/licences/gnu_
 		includes index.php javascript lang plugins robots.txt \
 		schedule.php scripts setup templates themes
 
-SUB_FILES+=	pkg-message pkg-install
-SUB_LIST+=	FLYSPRAYDIR="${FLYSPRAYDIR}" \
-		ATTACHMENTDIR="${ATTACHMENTDIR}" \
-		MKDIR="${MKDIR}" \
-		CHOWN="${CHOWN}" \
-		CHMOD="${CHMOD}" \
-		WWWGRP="${WWWGRP}" \
-		WWWOWN="${WWWOWN}"
-PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 MYSQL_USE=	PHP=mysql
 MYSQLI_USE=	PHP=mysqli
@@ -78,6 +73,9 @@ do-install:
 		(cd ${FSINSTALLDIR} && ${TAR} -xf -)
 	${LN} -sf ${ATTACHMENTDIR} ${FSINSTALLDIR}/attachments
 	${LN} -sf ${PREFIX}/share/adodb ${FSINSTALLDIR}
+	${MKDIR} ${STAGEDIR}${ATTACHMENTDIR}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/docs/${file} ${STAGEDIR}${DOCSDIR}

Modified: head/devel/flyspray/pkg-plist
==============================================================================
--- head/devel/flyspray/pkg-plist	Sun Sep 20 22:18:22 2015	(r397469)
+++ head/devel/flyspray/pkg-plist	Sun Sep 20 22:26:08 2015	(r397470)
@@ -851,3 +851,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/NuvolaIcons.licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/jsCalendar.licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+ at dir %%DATADIR%%/themes/CleanFS/mime/video
+ at dir %%DATADIR%%/themes/CleanFS/mime/image
+ at dir %%DATADIR%%/themes/CleanFS/mime/audio
+ at dir %%DATADIR%%/themes/Bluey/mime/video
+ at dir %%DATADIR%%/themes/Bluey/mime/image
+ at dir %%DATADIR%%/themes/Bluey/mime/audio
+ at dir(%%WWWOWN%%,%%WWWGRP%%,750) /var/db/flyspray/attachments
+ at dir /var/db/flyspray