Upgrade 0.9.9.2: [1]

- This upgrade deals with an unspecified security problem in 0.9.9.
- OPTIONaly RUN_DEPEND on Graphviz
- update pkg-message and Readme.FreeBSD

Drop custom hack and use SUB_FILES for pkg-message [2]

PR:		ports/115561 [1]
Submitted by:	Nick Hilliard (maintainer) [1], itetcu@ (me) [2]

6 files changed, 107 insertions, 45 deletions

diff --git a/devel/flyspray/Makefile b/devel/flyspray/Makefile
index c243e0944029..46be96e269d5 100644
--- a/devel/flyspray/Makefile
+++ b/devel/flyspray/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	flyspray
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.9.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.flyspray.org/
 
@@ -15,13 +15,14 @@ COMMENT=	A simple, easy-to-use web based bug tracking system
 
 RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
 
-USE_PHP=	mysql pcre session
-USE_ZIP=	yes
+USE_PHP=	mysql pcre session zlib xml gd
+USE_BZIP2=	yes
 WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
 
-NO_WRKSUBDIR=	yes
+OPTIONS=	GRAPHVIZ "Install Graphviz for task dependency graphs" off
+
 FLYSPRAYDIR=	${PREFIX}/share/${PORTNAME}
 ATTACHMENTDIR=	${DBDIR}/${PORTNAME}/attachments
 DBDIR=		/var/db
@@ -39,7 +40,13 @@ FLYSPRAY_FILES=	cache docs/licences/gnu_lgpl.html \
 		index.php javascript lang plugins robots.txt schedule.php \
 		scripts setup templates themes
 
-PKGMESSAGE=	${WRKSRC}/pkg-message
+SUB_FILES=	pkg-message
+
+.include <bsd.port.pre.mk>
+
+.ifdef WITH_GRAPHVIZ
+RUN_DEPENDS+=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
+.endif
 
 post-patch:
 	@${CP} ${PKGDIR}/files/README.FreeBSD ${WRKSRC}/docs/
@@ -53,8 +60,8 @@ do-install:
 	${CHMOD} 755 ${FLYSPRAYDIR}
 	${TOUCH} ${FLYSPRAYDIR}/flyspray.conf.php
 	cd ${WRKSRC} && \
-		tar cf - ${FLYSPRAY_FILES} | \
-		(cd ${FLYSPRAYDIR} && tar -xf -)
+		${TAR} cf - ${FLYSPRAY_FILES} | \
+		(cd ${FLYSPRAYDIR} && ${TAR} -xf -)
 	${LN} -s ${ATTACHMENTDIR} ${FLYSPRAYDIR}/attachments
 	${LN} -s ${PREFIX}/share/adodb ${FLYSPRAYDIR}
 	@${MKDIR} ${ATTACHMENTDIR}
@@ -64,7 +71,6 @@ do-install:
 	${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/flyspray.conf.php
 
 post-install: install-doc
-	@${SED} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 install-doc:
@@ -75,4 +81,4 @@ install-doc:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/flyspray/distinfo b/devel/flyspray/distinfo
index c1019df92ded..a5fc92935b95 100644
--- a/devel/flyspray/distinfo
+++ b/devel/flyspray/distinfo
@@ -1,3 +1,3 @@
-MD5 (flyspray-0.9.9.zip) = f6c8e3c2b79caa85d27d8cffa253ee63
-SHA256 (flyspray-0.9.9.zip) = 567efbe2742724cc264d908db4c5769248b7e78942cecfe658607c473aa3553d
-SIZE (flyspray-0.9.9.zip) = 1406199
+MD5 (flyspray-0.9.9.2.tar.bz2) = 84e8e2a11ccf3ff4e95e182c6751ddf7
+SHA256 (flyspray-0.9.9.2.tar.bz2) = 8960525b7777d919f665be1c94785fa2f76083b3eee43b0da3166d12f0bbb947
+SIZE (flyspray-0.9.9.2.tar.bz2) = 945582
diff --git a/devel/flyspray/files/README.FreeBSD b/devel/flyspray/files/README.FreeBSD
index 00d9def764c1..8168c0c0c3c9 100644
--- a/devel/flyspray/files/README.FreeBSD
+++ b/devel/flyspray/files/README.FreeBSD
@@ -20,7 +20,7 @@ Configuration Instructions for Flyspray
                 Allow from all
         </Directory>
 
-3) Point your browser to http://yourserver.example.com/flyspray/setup/ and you should
+3) Point your browser to http://yourserver.example.com/flyspray/ and you should
    see the Flyspray installer.
 
 4) Once the setup procedure has been completed, you must remove the "setup"
@@ -55,7 +55,7 @@ You can upgrade from a previous version of Flyspray by doing the following:
 
 sql> update flyspray_prefs set pref_value = "0.9.9 dev" where pref_name = "fs_ver";
 
-3) That's it! Flyspray has been upgraded to 0.9.9.  If you messed up
+3) That's it! Flyspray has been upgraded to 0.9.9.2.  If you messed up
    somehow, you will probably have lost data in the process, and may need to
    re-install your database from your backup, but that's ok because you took
    a backup, right?
diff --git a/devel/flyspray/pkg-message b/devel/flyspray/files/pkg-message.in
index 16fa40397b21..16fa40397b21 100644
--- a/devel/flyspray/pkg-message
+++ b/devel/flyspray/files/pkg-message.in
diff --git a/devel/flyspray/pkg-descr b/devel/flyspray/pkg-descr
index eacf2ba5554c..11fe5c9d1def 100644
--- a/devel/flyspray/pkg-descr
+++ b/devel/flyspray/pkg-descr
@@ -1,22 +1,21 @@
-Need a bug tracking system for your programming project? Having trouble
-finding something that suits your needs? Tried installing Bugzilla, but
-found it too complex?
-
-Flyspray is a power but easy to use bug tracking system for those who don't
-require all the complexities of something like Bugzilla.
+Flyspray is an uncomplicated, web-based bug tracking system written in PHP
+for assisting with software development.
 
 Features include:
 
     * Web-based, platform-independent
-    * Multiple database support (through the ADOdb database abstraction
-      layer)
+    * Multiple database support, currently MySQL and PGSQL
     * Easy installation
     * Easy to use
     * Multiple projects
-    * Permissions-based user groups
     * 'Watching' tasks, with notification of changes (email or Jabber)
     * Comprehensive task history
     * File attachments
     * CSS themes
+    * Advanced search features (though easy to use)
+    * Atom/RSS feeds
+    * Two syntax options for task descriptions and more (Dokuwiki / plain text)
+    * Voting for tasks
+    * Dependency graphs
 
 WWW: http://www.flyspray.org/
diff --git a/devel/flyspray/pkg-plist b/devel/flyspray/pkg-plist
index 10385c1c5066..045b8e00d692 100644
--- a/devel/flyspray/pkg-plist
+++ b/devel/flyspray/pkg-plist
@@ -20,29 +20,72 @@
 %%DATADIR%%/includes/constants.inc.php
 %%DATADIR%%/includes/events.inc.php
 %%DATADIR%%/includes/external/Validate.php
-%%DATADIR%%/includes/external/swift-mailer/CREDITS
-%%DATADIR%%/includes/external/swift-mailer/LICENSE
-%%DATADIR%%/includes/external/swift-mailer/README
-%%DATADIR%%/includes/external/swift-mailer/Swift.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/CRAMMD5.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/LOGIN.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/PLAIN.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/POP3SMTP_.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/README
-%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Multi.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Events/ListenerMapper.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Events/ResponseEvent.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Events/CommandEvent.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Events/SendEvent.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Events/DisconnectEvent.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Events/ConnectEvent.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Events/Listener.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/ClassLoader.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/RecipientList.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/BatchMailer.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Cache.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Sendmail.php
 %%DATADIR%%/includes/external/swift-mailer/Swift/Connection/NativeMail.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Multi.php
 %%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Rotator.php
 %%DATADIR%%/includes/external/swift-mailer/Swift/Connection/SMTP.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Sendmail.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/AntiFlood.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Exception.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/CacheFactory.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message/EmbeddedFile.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message/Encoder.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message/Image.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message/Headers.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message/Attachment.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message/Part.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message/Mime.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message/MimeException.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Events.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Errors.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Log.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/ConnectionBase.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/FileException.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/File.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/PopB4Smtp/Pop3Connection.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/PLAIN.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/CRAMMD5.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/LOGIN.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/$PopB4Smtp$.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/BadResponseException.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Iterator/Array.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Iterator/MySQLResult.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Message.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Exception.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Address.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/AddressContainer.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/EasySwiftResponseTracker.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Decorator/Replacements.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/FileEmbedder.php
 %%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/ConnectionRotator.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Errors.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Example.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Template.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Stream.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Stream/MailProxy.php
-%%DATADIR%%/includes/external/swift-mailer/Swift/Stream/Processor.php
-%%DATADIR%%/includes/external/swift-mailer/VERSION
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/VerboseSending/DefaultView.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/VerboseSending/AbstractView.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Throttler.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Decorator.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/AntiFlood.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/VerboseSending.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/BandwidthMonitor.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/MailSend.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Log/Base.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Log/DefaultLog.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Cache/OutputStream.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Cache/JointOutputStream.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Cache/Disk.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Cache/Memory.php
+%%DATADIR%%/includes/external/swift-mailer/Swift.php
+%%DATADIR%%/includes/external/swift-mailer/EasySwift.php
 %%DATADIR%%/includes/fix.inc.php
 %%DATADIR%%/includes/i18n.inc.php
 %%DATADIR%%/includes/modify.inc.php
@@ -141,6 +184,7 @@
 %%DATADIR%%/javascript/script.aculo.us/javascripttest.rb
 %%DATADIR%%/javascript/script.aculo.us/scriptaculous.js
 %%DATADIR%%/javascript/script.aculo.us/slider.js
+%%DATADIR%%/javascript/script.aculo.us/sound.js
 %%DATADIR%%/javascript/script.aculo.us/unittest.js
 %%DATADIR%%/javascript/tablecontrol.js
 %%DATADIR%%/javascript/tabs.js
@@ -156,6 +200,7 @@
 %%DATADIR%%/lang/nl.php
 %%DATADIR%%/lang/pl.php
 %%DATADIR%%/lang/pt_br.php
+%%DATADIR%%/lang/sv_SE.php
 %%DATADIR%%/lang/ru.php
 %%DATADIR%%/lang/zh_cn.php
 %%DATADIR%%/plugins/.htaccess
@@ -391,6 +436,11 @@
 %%DATADIR%%/setup/upgrade/0.9.9/rename_columns.php
 %%DATADIR%%/setup/upgrade/0.9.9/upgrade.info
 %%DATADIR%%/setup/upgrade/0.9.9/upgrade_assignments.php
+%%DATADIR%%/setup/upgrade/0.9.9.2/lowercase_emails.php
+%%DATADIR%%/setup/upgrade/0.9.9.2/update_users.xml
+%%DATADIR%%/setup/upgrade/0.9.9.2/upgrade.info
+%%DATADIR%%/setup/upgrade/0.9.9.2/flyspray.conf.php
+%%DATADIR%%/setup/upgrade/0.9.9.2/flyspray-install.xml
 %%DATADIR%%/templates/.htaccess
 %%DATADIR%%/templates/admin.cat.tpl
 %%DATADIR%%/templates/admin.editgroup.tpl
@@ -545,14 +595,20 @@
 %%PORTDOCS%%%%DOCSDIR%%/jsCalendar.licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/cache/dokuwiki
 @dirrm %%DATADIR%%/cache
 @dirrm %%DATADIR%%/docs/licences
 @dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Events
 @dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Connection
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Message
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/PopB4Smtp
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Iterator
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Decorator
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/VerboseSending
 @dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Plugin
-@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Stream
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Log
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Cache
 @dirrm %%DATADIR%%/includes/external/swift-mailer/Swift
 @dirrm %%DATADIR%%/includes/external/swift-mailer
 @dirrm %%DATADIR%%/includes/external
@@ -587,6 +643,7 @@
 @dirrm %%DATADIR%%/setup/styles
 @dirrm %%DATADIR%%/setup/templates
 @dirrm %%DATADIR%%/setup/upgrade/0.9.9
+@dirrm %%DATADIR%%/setup/upgrade/0.9.9.2
 @dirrm %%DATADIR%%/setup/upgrade
 @dirrm %%DATADIR%%/setup
 @dirrm %%DATADIR%%/templates