3 files changed, 32 insertions, 7 deletions

diff --git a/devel/flyspray/Makefile b/devel/flyspray/Makefile
index 5dd9dab0c9b1..b6ed59607b16 100644
--- a/devel/flyspray/Makefile
+++ b/devel/flyspray/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	flyspray
-PORTVERSION=	0.9.9.5.1
+PORTVERSION=	0.9.9.6
 CATEGORIES=	devel www
-MASTER_SITES=	http://twinkie.foobar.org/files/
+MASTER_SITES=	http://flyspray.org/
 
 MAINTAINER=	nick@foobar.org
 COMMENT=	A simple, easy-to-use web based bug tracking system
@@ -16,10 +16,11 @@ COMMENT=	A simple, easy-to-use web based bug tracking system
 RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
 
 USE_PHP=	pcre session zlib xml gd
-USE_BZIP2=	yes
+USE_ZIP=	yes
 WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 OPTIONS=	GRAPHVIZ "Install Graphviz for task dependency graphs" off \
 		MYSQLI "Use MySQLi Database Interface" on \
diff --git a/devel/flyspray/distinfo b/devel/flyspray/distinfo
index 20c2d3be32b2..bf5311c1177f 100644
--- a/devel/flyspray/distinfo
+++ b/devel/flyspray/distinfo
@@ -1,3 +1,3 @@
-MD5 (flyspray-0.9.9.5.1.tar.bz2) = 54c5327b507349f2963a3d899f5b9d91
-SHA256 (flyspray-0.9.9.5.1.tar.bz2) = 6bd3d9bee474feb2e75cdf181bba750655068ad35b05ba677e632dbd5e5bfd4a
-SIZE (flyspray-0.9.9.5.1.tar.bz2) = 971055
+MD5 (flyspray-0.9.9.6.zip) = 095b46b08881554790830edab51970ed
+SHA256 (flyspray-0.9.9.6.zip) = c5c728bb66aca8c8ded3533387a751a129a2096b230f9dd1c16f77d1767bbe6c
+SIZE (flyspray-0.9.9.6.zip) = 1573955
diff --git a/devel/flyspray/pkg-plist b/devel/flyspray/pkg-plist
index 2738cc140c78..ee7f4ff89adc 100644
--- a/devel/flyspray/pkg-plist
+++ b/devel/flyspray/pkg-plist
@@ -88,6 +88,21 @@
 %%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/external/Zend/Http/Client/Adapter/Interface.php
+%%DATADIR%%/includes/external/Zend/Http/Client/Adapter/Socket.php
+%%DATADIR%%/includes/external/Zend/Http/Client.php
+%%DATADIR%%/includes/external/Zend/Http/Response.php
+%%DATADIR%%/includes/external/Zend/Loader.php
+%%DATADIR%%/includes/external/Zend/Registry.php
+%%DATADIR%%/includes/external/Zend/Rest/Client/Result.php
+%%DATADIR%%/includes/external/Zend/Rest/Client.php
+%%DATADIR%%/includes/external/Zend/Service/Abstract.php
+%%DATADIR%%/includes/external/Zend/Uri/Http.php
+%%DATADIR%%/includes/external/Zend/Uri.php
+%%DATADIR%%/includes/external/Zend/Validate/Abstract.php
+%%DATADIR%%/includes/external/Zend/Validate/Hostname.php
+%%DATADIR%%/includes/external/Zend/Validate/Interface.php
+%%DATADIR%%/includes/external/Zend/Validate/Ip.php
 %%DATADIR%%/includes/fix.inc.php
 %%DATADIR%%/includes/i18n.inc.php
 %%DATADIR%%/includes/modify.inc.php
@@ -199,6 +214,7 @@
 %%DATADIR%%/lang/hu.php
 %%DATADIR%%/lang/it.php
 %%DATADIR%%/lang/ja.php
+%%DATADIR%%/lang/mk.php
 %%DATADIR%%/lang/nl.php
 %%DATADIR%%/lang/pl.php
 %%DATADIR%%/lang/pt_br.php
@@ -421,7 +437,6 @@
 %%DATADIR%%/setup/templates/administration.tpl
 %%DATADIR%%/setup/templates/complete_install.tpl
 %%DATADIR%%/setup/templates/database.tpl
-%%DATADIR%%/setup/templates/license.tpl
 %%DATADIR%%/setup/templates/pre_install.tpl
 %%DATADIR%%/setup/templates/structure.tpl
 %%DATADIR%%/setup/templates/upgrade.tpl
@@ -622,6 +637,15 @@
 @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/Zend/Http/Client/Adapter
+@dirrm %%DATADIR%%/includes/external/Zend/Http/Client
+@dirrm %%DATADIR%%/includes/external/Zend/Http
+@dirrm %%DATADIR%%/includes/external/Zend/Rest/Client
+@dirrm %%DATADIR%%/includes/external/Zend/Rest
+@dirrm %%DATADIR%%/includes/external/Zend/Service
+@dirrm %%DATADIR%%/includes/external/Zend/Uri
+@dirrm %%DATADIR%%/includes/external/Zend/Validate
+@dirrm %%DATADIR%%/includes/external/Zend
 @dirrm %%DATADIR%%/includes/external
 @dirrm %%DATADIR%%/includes
 @dirrm %%DATADIR%%/javascript/callbacks