Add net/owncloudclient and remove net/mirall.

Approved by gdt@.

net/owncloudclient supercedes net/mirall. Really net/owncloudclient is
update to net/mirall.

10 files changed, 55 insertions, 113 deletions

diff --git a/net/Makefile b/net/Makefile
index d0ec3c27a70..4949c164c35 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1065 2015/03/10 21:28:45 bsiegert Exp $
+# $NetBSD: Makefile,v 1.1066 2015/03/25 20:12:03 ryoon Exp $
 #
 
 COMMENT=	Networking tools
@@ -303,7 +303,6 @@ SUBDIR+=	microdc2
 SUBDIR+=	mikutter
 SUBDIR+=	mimms
 SUBDIR+=	miniupnpd
-SUBDIR+=	mirall
 SUBDIR+=	miredo
 SUBDIR+=	mirror
 SUBDIR+=	mitmproxy
@@ -400,6 +399,7 @@ SUBDIR+=	openvpn-nagios
 SUBDIR+=	openwbem
 SUBDIR+=	ortp
 SUBDIR+=	overnet
+SUBDIR+=	owncloudclient
 SUBDIR+=	p5-Cisco-Abbrev
 SUBDIR+=	p5-DNS-LDNS
 SUBDIR+=	p5-DNS-ZoneParse
diff --git a/net/mirall/DESCR b/net/mirall/DESCR
deleted file mode 100644
index 81cbfc7f972..00000000000
--- a/net/mirall/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Mirall is a tool to synchronize files from ownCloud Server with
-your computer. It uses OCSync as its syncing backend.
diff --git a/net/mirall/MESSAGE b/net/mirall/MESSAGE
deleted file mode 100644
index 700891e4d29..00000000000
--- a/net/mirall/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2013/11/22 12:11:49 ryoon Exp $
-
-To see the status of mirall's owncloud command. You should have status bar
-of XFCE or other desktop environment.
-===========================================================================
diff --git a/net/mirall/distinfo b/net/mirall/distinfo
deleted file mode 100644
index bf68f04c7e5..00000000000
--- a/net/mirall/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2014/12/30 22:11:44 ryoon Exp $
-
-SHA1 (mirall-1.7.1.tar.bz2) = 8b9f85033032747293b1ee91da1307ad2310b0d3
-RMD160 (mirall-1.7.1.tar.bz2) = 2766e6655b9596156085460bb67c9f99c1e07348
-Size (mirall-1.7.1.tar.bz2) = 12668153 bytes
-SHA1 (patch-src_CMakeLists.txt) = 4ca3edba3f94fdf00d817035fde8354794adbb0c
-SHA1 (patch-src_mirall_utility.cpp) = 8387a78fc46d1f2fe4de4f0633670091b031f7a9
diff --git a/net/mirall/patches/patch-src_CMakeLists.txt b/net/mirall/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index f9c17410a1a..00000000000
--- a/net/mirall/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.4 2014/12/30 22:11:44 ryoon Exp $
-
-* Add NetBSD support.
-
---- src/CMakeLists.txt.orig	2014-12-18 11:45:49.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -22,11 +25,11 @@ if ( APPLE )
-     )
- endif()
- 
--IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-     list(APPEND OS_SPECIFIC_LINK_LIBRARIES
- 	inotify
-     )
--ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
- 
- if(SPARKLE_FOUND AND NOT BUILD_LIBRARIES_ONLY)
-     list (APPEND OS_SPECIFIC_LINK_LIBRARIES ${SPARKLE_LIBRARY})
diff --git a/net/mirall/patches/patch-src_mirall_utility.cpp b/net/mirall/patches/patch-src_mirall_utility.cpp
deleted file mode 100644
index bb5903eba09..00000000000
--- a/net/mirall/patches/patch-src_mirall_utility.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_mirall_utility.cpp,v 1.4 2014/12/30 22:11:44 ryoon Exp $
-
-* https://github.com/owncloud/mirall/issues/1060
-
---- src/mirall/utility.cpp.orig	2014-12-18 11:45:49.000000000 +0000
-+++ src/mirall/utility.cpp
-@@ -172,7 +172,7 @@ void Utility::setLaunchOnStartup(const Q
- 
- qint64 Utility::freeDiskSpace(const QString &path, bool *ok)
- {
--#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL)
-+#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_NETBSD)
-     struct statvfs stat;
-     statvfs(path.toUtf8().data(), &stat);
-     return (qint64) stat.f_bavail * stat.f_frsize;
-@@ -365,7 +365,7 @@ bool Utility::isUnix()
- 
- bool Utility::isLinux()
- {
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) || defined(Q_OS_NETBSD)
-     return true;
- #else
-     return false;
diff --git a/net/owncloudclient/DESCR b/net/owncloudclient/DESCR
new file mode 100644
index 00000000000..1335edae556
--- /dev/null
+++ b/net/owncloudclient/DESCR
@@ -0,0 +1,2 @@
+ownCloud client is a tool to synchronize files from ownCloud Server
+with your computer.
diff --git a/net/mirall/Makefile b/net/owncloudclient/Makefile
index 76e775f315a..b44308d1fc3 100644
--- a/net/mirall/Makefile
+++ b/net/owncloudclient/Makefile
@@ -1,39 +1,31 @@
-# $NetBSD: Makefile,v 1.12 2014/12/31 08:41:43 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2015/03/25 20:12:04 ryoon Exp $
 
-DISTNAME=	mirall-1.7.1
+DISTNAME=	owncloudclient-1.8.0
 CATEGORIES=	net
-MASTER_SITES=	http://download.owncloud.com/desktop/stable/
+MASTER_SITES=	https://download.owncloud.com/desktop/stable/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ryoon@NetBSD.org
-HOMEPAGE=	http://owncloud.org/sync-clients/
-COMMENT=	Graphical file synchronization program for OwnCloud
+HOMEPAGE=	https://owncloud.com/
+COMMENT=	Synchronization program for ownCloud
 LICENSE=	gnu-gpl-v2
 
 # Do not use libocsync.so from net/ocsync.
 CONFLICTS=	ocsync-[0-9]*
-
-USE_LANGUAGES=	c c++
+CONFLICTS=	mirall-[0-9]*
 
 USE_CMAKE=	yes
-OBJDIR=		../build
-CONFIGURE_DIRS=	${OBJDIR}
-CMAKE_ARG_PATH=	../${DISTNAME}
-
-BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+USE_LANGUAGES=	c c++
 
 # I have no idea about CMake...
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/owncloud
 
 ETCDIR=			etc/ownCloud
 MAKE_DIRS+=		${ETCDIR}
-EGDIR=		${PREFIX}/share/examples/mirall
-INSTALLATION_DIRS=	${ETCDIR} share/examples/mirall
-CONF_FILES+=	${EGDIR}/sync-exclude.lst \
-		${PKG_SYSCONFDIR}/ownCloud/sync-exclude.lst
-
-pre-configure:
-	cd ${WRKSRC} && mkdir ${OBJDIR}
+EGDIR=			${PREFIX}/share/examples/owncloud
+INSTALLATION_DIRS=	${ETCDIR} share/examples/owncloud
+CONF_FILES+=		${EGDIR}/sync-exclude.lst \
+			${PKG_SYSCONFDIR}/ownCloud/sync-exclude.lst
 
 post-install:
 	mv ${DESTDIR}${PKG_SYSCONFDIR}/ownCloud/sync-exclude.lst \
diff --git a/net/mirall/PLIST b/net/owncloudclient/PLIST
index 4ef00f34ff9..7bb1591ce42 100644
--- a/net/mirall/PLIST
+++ b/net/owncloudclient/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2014/12/30 22:11:44 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.1 2015/03/25 20:12:04 ryoon Exp $
 bin/owncloud
 bin/owncloudcmd
 include/httpbf.h
 include/owncloudsync/creds/abstractcredentials.h
 include/owncloudsync/creds/httpcredentials.h
 include/owncloudsync/mirall/account.h
-include/owncloudsync/mirall/mirallconfigfile.h
+include/owncloudsync/mirall/configfile.h
 include/owncloudsync/mirall/networkjobs.h
 include/owncloudsync/mirall/progressdispatcher.h
 include/owncloudsync/mirall/syncengine.h
@@ -20,7 +20,7 @@ lib/owncloud/libocsync.so
 lib/owncloud/libocsync.so.0
 lib/owncloud/libocsync.so.0.2.1
 share/applications/owncloud.desktop
-share/examples/mirall/sync-exclude.lst
+share/examples/owncloud/sync-exclude.lst
 share/icons/hicolor/128x128/apps/ownCloud_error.png
 share/icons/hicolor/128x128/apps/ownCloud_error_shared.png
 share/icons/hicolor/128x128/apps/ownCloud_ok.png
@@ -47,6 +47,7 @@ share/icons/hicolor/256x256/apps/ownCloud_sync.png
 share/icons/hicolor/256x256/apps/ownCloud_sync_shared.png
 share/icons/hicolor/256x256/apps/ownCloud_warn.png
 share/icons/hicolor/256x256/apps/ownCloud_warn_shared.png
+share/icons/hicolor/256x256/apps/owncloud.png
 share/icons/hicolor/32x32/apps/ownCloud_error.png
 share/icons/hicolor/32x32/apps/ownCloud_error_shared.png
 share/icons/hicolor/32x32/apps/ownCloud_ok.png
@@ -65,6 +66,7 @@ share/icons/hicolor/48x48/apps/ownCloud_sync_shared.png
 share/icons/hicolor/48x48/apps/ownCloud_warn.png
 share/icons/hicolor/48x48/apps/ownCloud_warn_shared.png
 share/icons/hicolor/48x48/apps/owncloud.png
+share/icons/hicolor/512x512/apps/owncloud.png
 share/icons/hicolor/64x64/apps/ownCloud_error.png
 share/icons/hicolor/64x64/apps/ownCloud_error_shared.png
 share/icons/hicolor/64x64/apps/ownCloud_ok.png
@@ -83,34 +85,34 @@ share/icons/hicolor/72x72/apps/ownCloud_sync_shared.png
 share/icons/hicolor/72x72/apps/ownCloud_warn.png
 share/icons/hicolor/72x72/apps/ownCloud_warn_shared.png
 share/nautilus-python/extensions/syncstate.py
-share/owncloud/i18n/mirall_TW.qm
-share/owncloud/i18n/mirall_ca.qm
-share/owncloud/i18n/mirall_cs.qm
-share/owncloud/i18n/mirall_de.qm
-share/owncloud/i18n/mirall_el.qm
-share/owncloud/i18n/mirall_en.qm
-share/owncloud/i18n/mirall_es.qm
-share/owncloud/i18n/mirall_es_AR.qm
-share/owncloud/i18n/mirall_et.qm
-share/owncloud/i18n/mirall_eu.qm
-share/owncloud/i18n/mirall_fa.qm
-share/owncloud/i18n/mirall_fi.qm
-share/owncloud/i18n/mirall_fr.qm
-share/owncloud/i18n/mirall_gl.qm
-share/owncloud/i18n/mirall_hu.qm
-share/owncloud/i18n/mirall_it.qm
-share/owncloud/i18n/mirall_ja.qm
-share/owncloud/i18n/mirall_nl.qm
-share/owncloud/i18n/mirall_pl.qm
-share/owncloud/i18n/mirall_pt.qm
-share/owncloud/i18n/mirall_pt_BR.qm
-share/owncloud/i18n/mirall_ru.qm
-share/owncloud/i18n/mirall_sk.qm
-share/owncloud/i18n/mirall_sl.qm
-share/owncloud/i18n/mirall_sv.qm
-share/owncloud/i18n/mirall_th.qm
-share/owncloud/i18n/mirall_tr.qm
-share/owncloud/i18n/mirall_uk.qm
-share/owncloud/i18n/mirall_zh_CN.qm
-share/owncloud/i18n/mirall_zh_TW.qm
+share/owncloud/i18n/client_TW.qm
+share/owncloud/i18n/client_ca.qm
+share/owncloud/i18n/client_cs.qm
+share/owncloud/i18n/client_de.qm
+share/owncloud/i18n/client_el.qm
+share/owncloud/i18n/client_en.qm
+share/owncloud/i18n/client_es.qm
+share/owncloud/i18n/client_es_AR.qm
+share/owncloud/i18n/client_et.qm
+share/owncloud/i18n/client_eu.qm
+share/owncloud/i18n/client_fa.qm
+share/owncloud/i18n/client_fi.qm
+share/owncloud/i18n/client_fr.qm
+share/owncloud/i18n/client_gl.qm
+share/owncloud/i18n/client_hu.qm
+share/owncloud/i18n/client_it.qm
+share/owncloud/i18n/client_ja.qm
+share/owncloud/i18n/client_nl.qm
+share/owncloud/i18n/client_pl.qm
+share/owncloud/i18n/client_pt.qm
+share/owncloud/i18n/client_pt_BR.qm
+share/owncloud/i18n/client_ru.qm
+share/owncloud/i18n/client_sk.qm
+share/owncloud/i18n/client_sl.qm
+share/owncloud/i18n/client_sv.qm
+share/owncloud/i18n/client_th.qm
+share/owncloud/i18n/client_tr.qm
+share/owncloud/i18n/client_uk.qm
+share/owncloud/i18n/client_zh_CN.qm
+share/owncloud/i18n/client_zh_TW.qm
 @pkgdir etc/ownCloud
diff --git a/net/owncloudclient/distinfo b/net/owncloudclient/distinfo
new file mode 100644
index 00000000000..838f4fc5974
--- /dev/null
+++ b/net/owncloudclient/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/03/25 20:12:04 ryoon Exp $
+
+SHA1 (owncloudclient-1.8.0.tar.bz2) = 6d1ea605bc61da085f958056c65ad28aac72f17e
+RMD160 (owncloudclient-1.8.0.tar.bz2) = 0cbefe7723a128cbb478f583a3e80a31486a1d99
+Size (owncloudclient-1.8.0.tar.bz2) = 13556481 bytes