Update to 1.5.0.

6 files changed, 26 insertions, 36 deletions

diff --git a/deskutils/mirall/Makefile b/deskutils/mirall/Makefile
index f94652e403f6..5b48d9a003a9 100644
--- a/deskutils/mirall/Makefile
+++ b/deskutils/mirall/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mirall
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://download.owncloud.com/download/
+MASTER_SITES=	http://download.owncloud.com/desktop/stable/
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	The ownCloud Desktop Syncing Client
@@ -28,6 +28,8 @@ OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 DOCS_USE=	TEX=latex:build
 
+PLIST_SUB+=	VERSION=${PORTVERSION}
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/deskutils/mirall/distinfo b/deskutils/mirall/distinfo
index 6b2747646ce6..b1cb478fa701 100644
--- a/deskutils/mirall/distinfo
+++ b/deskutils/mirall/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mirall-1.4.2.tar.bz2) = 381915dd9f39d6f731cb4ed2964c33945c4b5ad99f3746d83d812ac2995f9380
-SIZE (mirall-1.4.2.tar.bz2) = 1255233
+SHA256 (mirall-1.5.0.tar.bz2) = 64532680da1c452b7b591550d07f25b554283ec65d448d41366ea2105b959a18
+SIZE (mirall-1.5.0.tar.bz2) = 1318514
diff --git a/deskutils/mirall/files/patch-doc__CMakeLists.txt b/deskutils/mirall/files/patch-doc__CMakeLists.txt
deleted file mode 100644
index 838fc310700a..000000000000
--- a/deskutils/mirall/files/patch-doc__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./doc/CMakeLists.txt.orig	2013-09-26 11:13:19.000000000 +0200
-+++ ./doc/CMakeLists.txt	2013-10-16 14:57:42.000000000 +0200
-@@ -36,7 +36,7 @@
- 				     -D latex_logo=${LATEX_LOGO}
- 				     ${CMAKE_CURRENT_SOURCE_DIR}
- 				     ${SPHINX_PDF_DIR} )
--        add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
-+        add_custom_target(doc-pdf $(MAKE) -C ${SPHINX_PDF_DIR} all-pdf
- 		                  DEPENDS doc-latex )
-         add_dependencies(doc doc-pdf)
-         if (WITH_DOC)
diff --git a/deskutils/mirall/files/patch-src__CMakeLists.txt b/deskutils/mirall/files/patch-src__CMakeLists.txt
index f48bae3b1b73..618fade4d0a1 100644
--- a/deskutils/mirall/files/patch-src__CMakeLists.txt
+++ b/deskutils/mirall/files/patch-src__CMakeLists.txt
@@ -8,12 +8,3 @@
  ENDIF()
  IF( WIN32 ) 
      set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_win.cpp)
-@@ -140,7 +141,7 @@
- list(APPEND libsync_LINK_TARGETS
-     ${QT_LIBRARIES}
-     ${CSYNC_LIBRARY}
--    dl
-+    inotify
- )
- 
- if(QTKEYCHAIN_FOUND)
diff --git a/deskutils/mirall/files/patch-src__mirall__utility.cpp b/deskutils/mirall/files/patch-src__mirall__utility.cpp
deleted file mode 100644
index 28454d4c0717..000000000000
--- a/deskutils/mirall/files/patch-src__mirall__utility.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mirall/utility.cpp.orig	2013-09-04 11:09:12.000000000 +0200
-+++ ./src/mirall/utility.cpp	2013-09-18 15:01:54.000000000 +0200
-@@ -313,7 +313,7 @@
- 
- qint64 Utility::freeDiskSpace(const QString &path, bool *ok)
- {
--#ifdef Q_OS_MAC
-+#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
-     struct statvfs stat;
-     statvfs(path.toUtf8().data(), &stat);
-     return (qint64) stat.f_bavail * stat.f_frsize;
diff --git a/deskutils/mirall/pkg-plist b/deskutils/mirall/pkg-plist
index efd542c4bb3c..66699c942a3a 100644
--- a/deskutils/mirall/pkg-plist
+++ b/deskutils/mirall/pkg-plist
@@ -1,10 +1,24 @@
 bin/owncloud
+bin/owncloudcmd
 @unexec if cmp -s %D/etc/ownCloud/sync-exclude.lst.sample %D/etc/ownCloud/sync-exclude.lst; then rm -f %D/etc/ownCloud/sync-exclude.lst; fi
 etc/ownCloud/sync-exclude.lst.sample
 @exec if [ ! -f %D/etc/ownCloud/sync-exclude.lst ] ; then cp -p %D/%F %B/sync-exclude.lst; fi
+include/owncloudsync/creds/abstractcredentials.h
+include/owncloudsync/creds/httpcredentials.h
+include/owncloudsync/mirall/account.h
+include/owncloudsync/mirall/csyncthread.h
+include/owncloudsync/mirall/folder.h
+include/owncloudsync/mirall/folderman.h
+include/owncloudsync/mirall/folderwatcher.h
+include/owncloudsync/mirall/mirallconfigfile.h
+include/owncloudsync/mirall/networkjobs.h
+include/owncloudsync/mirall/progressdispatcher.h
+include/owncloudsync/mirall/syncfileitem.h
+include/owncloudsync/mirall/syncjournaldb.h
+include/owncloudsync/mirall/syncresult.h
 lib/libowncloudsync.so
 lib/libowncloudsync.so.0
-lib/libowncloudsync.so.1.4.2
+lib/libowncloudsync.so.%%VERSION%%
 share/applications/owncloud.desktop
 %%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
 %%PORTDOCS%%%%DOCSDIR%%/html/_images/icon.png
@@ -28,6 +42,7 @@ share/applications/owncloud.desktop
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/introduction.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/options.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/owncloud.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/owncloudcmd.1.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/troubleshooting.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/visualtour.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif
@@ -62,6 +77,7 @@ share/applications/owncloud.desktop
 %%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
 %%PORTDOCS%%%%DOCSDIR%%/html/options.html
 %%PORTDOCS%%%%DOCSDIR%%/html/owncloud.1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/owncloudcmd.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/search.html
 %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
@@ -120,4 +136,7 @@ share/owncloud/i18n/mirall_zh_TW.qm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/_images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry include/owncloudsync/mirall
+@dirrmtry include/owncloudsync/creds
+@dirrmtry include/owncloudsync
 @dirrmtry etc/ownCloud