2 files changed, 27 insertions, 19 deletions

diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile
index 0afb920333be..df4f067a6b77 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	owncloud
 PORTVERSION=	5.0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://download.owncloud.org/community/
 
@@ -21,8 +21,6 @@ USE_PHP=	ctype curl dom fileinfo filter gd hash iconv json ldap \
 WANT_PHP_WEB=	yes
 DEFAULT_PHP_VER=5
 
-WWWDOCROOT?=	www
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
@@ -30,21 +28,9 @@ SUB_FILES=	pkg-message
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	SQLITE
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	client
-USE_PHP+=	mysql pdo_mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-USE_PHP+=	pgsql pdo_pgsql
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USE_PHP+=	sqlite3 pdo_sqlite
-.endif
+MYSQL_USE=	MYSQL=client PHP=mysql,pdo_mysql
+PGSQL_USE=	PGSQL=yes PHP=pdo_pgsql,pgsql
+SQLITE_USE=	PHP=pdo_sqlite,sqlite3 SQLITE=yes
 
 do-install:
 	@${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}
diff --git a/www/owncloud/pkg-plist b/www/owncloud/pkg-plist
index c9a671594cd2..3cf6242d73a0 100644
--- a/www/owncloud/pkg-plist
+++ b/www/owncloud/pkg-plist
@@ -1,5 +1,5 @@
-@group www
 @owner www
+@group www
 %%WWWDIR%%/.htaccess
 %%WWWDIR%%/3rdparty/Archive/Tar.php
 %%WWWDIR%%/3rdparty/Console/Getopt.php
@@ -2122,6 +2122,7 @@
 %%WWWDIR%%/apps/files_pdfviewer/viewer.php
 %%WWWDIR%%/apps/files_sharing/appinfo/app.php
 %%WWWDIR%%/apps/files_sharing/appinfo/info.xml
+%%WWWDIR%%/apps/files_sharing/appinfo/routes.php
 %%WWWDIR%%/apps/files_sharing/appinfo/update.php
 %%WWWDIR%%/apps/files_sharing/appinfo/version
 %%WWWDIR%%/apps/files_sharing/css/public.css
@@ -2183,6 +2184,7 @@
 %%WWWDIR%%/apps/files_sharing/l10n/zh_CN.GB2312.php
 %%WWWDIR%%/apps/files_sharing/l10n/zh_CN.php
 %%WWWDIR%%/apps/files_sharing/l10n/zh_TW.php
+%%WWWDIR%%/apps/files_sharing/lib/api.php
 %%WWWDIR%%/apps/files_sharing/lib/cache.php
 %%WWWDIR%%/apps/files_sharing/lib/permissions.php
 %%WWWDIR%%/apps/files_sharing/lib/share/file.php
@@ -2193,6 +2195,7 @@
 %%WWWDIR%%/apps/files_sharing/public.php
 %%WWWDIR%%/apps/files_sharing/templates/authenticate.php
 %%WWWDIR%%/apps/files_sharing/templates/public.php
+%%WWWDIR%%/apps/files_sharing/tests/api.php
 %%WWWDIR%%/apps/files_texteditor/ajax/loadfile.php
 %%WWWDIR%%/apps/files_texteditor/ajax/savefile.php
 %%WWWDIR%%/apps/files_texteditor/appinfo/app.php
@@ -3837,12 +3840,18 @@
 %%WWWDIR%%/core/doc/admin/_sources/maintenance/index.txt
 %%WWWDIR%%/core/doc/admin/_sources/maintenance/migrating.txt
 %%WWWDIR%%/core/doc/admin/_sources/maintenance/update.txt
+%%WWWDIR%%/core/doc/admin/_static/ajax-loader.gif
 %%WWWDIR%%/core/doc/admin/_static/basic.css
 %%WWWDIR%%/core/doc/admin/_static/bootstrap-responsive.css
 %%WWWDIR%%/core/doc/admin/_static/bootstrap-sphinx.css
 %%WWWDIR%%/core/doc/admin/_static/bootstrap.css
 %%WWWDIR%%/core/doc/admin/_static/bootstrap.js
+%%WWWDIR%%/core/doc/admin/_static/comment-bright.png
+%%WWWDIR%%/core/doc/admin/_static/comment-close.png
+%%WWWDIR%%/core/doc/admin/_static/comment.png
 %%WWWDIR%%/core/doc/admin/_static/doctools.js
+%%WWWDIR%%/core/doc/admin/_static/down-pressed.png
+%%WWWDIR%%/core/doc/admin/_static/down.png
 %%WWWDIR%%/core/doc/admin/_static/file.png
 %%WWWDIR%%/core/doc/admin/_static/img/glyphicons-halflings-white.png
 %%WWWDIR%%/core/doc/admin/_static/img/glyphicons-halflings.png
@@ -3857,6 +3866,9 @@
 %%WWWDIR%%/core/doc/admin/_static/searchtools.js
 %%WWWDIR%%/core/doc/admin/_static/style.css
 %%WWWDIR%%/core/doc/admin/_static/underscore.js
+%%WWWDIR%%/core/doc/admin/_static/up-pressed.png
+%%WWWDIR%%/core/doc/admin/_static/up.png
+%%WWWDIR%%/core/doc/admin/_static/websupport.js
 %%WWWDIR%%/core/doc/admin/configuration/auth_ldap.html
 %%WWWDIR%%/core/doc/admin/configuration/background_jobs.html
 %%WWWDIR%%/core/doc/admin/configuration/configuration_3rdparty.html
@@ -3952,12 +3964,18 @@
 %%WWWDIR%%/core/doc/user/_sources/pim/sync_thunderbird.txt
 %%WWWDIR%%/core/doc/user/_sources/pim/troubleshooting.txt
 %%WWWDIR%%/core/doc/user/_sources/webinterface.txt
+%%WWWDIR%%/core/doc/user/_static/ajax-loader.gif
 %%WWWDIR%%/core/doc/user/_static/basic.css
 %%WWWDIR%%/core/doc/user/_static/bootstrap-responsive.css
 %%WWWDIR%%/core/doc/user/_static/bootstrap-sphinx.css
 %%WWWDIR%%/core/doc/user/_static/bootstrap.css
 %%WWWDIR%%/core/doc/user/_static/bootstrap.js
+%%WWWDIR%%/core/doc/user/_static/comment-bright.png
+%%WWWDIR%%/core/doc/user/_static/comment-close.png
+%%WWWDIR%%/core/doc/user/_static/comment.png
 %%WWWDIR%%/core/doc/user/_static/doctools.js
+%%WWWDIR%%/core/doc/user/_static/down-pressed.png
+%%WWWDIR%%/core/doc/user/_static/down.png
 %%WWWDIR%%/core/doc/user/_static/file.png
 %%WWWDIR%%/core/doc/user/_static/img/glyphicons-halflings-white.png
 %%WWWDIR%%/core/doc/user/_static/img/glyphicons-halflings.png
@@ -3972,6 +3990,9 @@
 %%WWWDIR%%/core/doc/user/_static/searchtools.js
 %%WWWDIR%%/core/doc/user/_static/style.css
 %%WWWDIR%%/core/doc/user/_static/underscore.js
+%%WWWDIR%%/core/doc/user/_static/up-pressed.png
+%%WWWDIR%%/core/doc/user/_static/up.png
+%%WWWDIR%%/core/doc/user/_static/websupport.js
 %%WWWDIR%%/core/doc/user/bookmarks.html
 %%WWWDIR%%/core/doc/user/contents.html
 %%WWWDIR%%/core/doc/user/files/configuring_big_file_upload.html
@@ -5872,6 +5893,7 @@
 @dirrmtry %%WWWDIR%%/apps/files_texteditor/appinfo
 @dirrmtry %%WWWDIR%%/apps/files_texteditor/ajax
 @dirrmtry %%WWWDIR%%/apps/files_texteditor
+@dirrmtry %%WWWDIR%%/apps/files_sharing/tests
 @dirrmtry %%WWWDIR%%/apps/files_sharing/templates
 @dirrmtry %%WWWDIR%%/apps/files_sharing/lib/share
 @dirrmtry %%WWWDIR%%/apps/files_sharing/lib