pkgsrc/net/mirall and newer ownCloud client

[Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>]

Hi,

Newer ownCloud desktop client is released and it is renamed to
owncludclient from mirall.
owncloudclient has significantly improved GUI.
The desktop environment is not required anymore. It supports twm or
other classic window manager only environment now.
pkgsrc/net/ocsync does not work anymore with recent ownCloud.

I would like to import owncloudclient as pkgsrc/net/owncloudclient
and remove pkgsrc/net/mirall and pkgsrc/net/ocsync during freeze.

patch for pkgsrc/net/owncloudclient is here.
And all patches/patch-* is not necessary.

O.K. to commit? Should I wait pkgsrc-2015Q1 tagging?

Thank you.


diff -ur mirall/DESCR owncloudclient/DESCR
--- mirall/DESCR	2013-11-22 21:11:49.000000000 +0900
+++ owncloudclient/DESCR	2015-03-22 06:58:58.000000000 +0900
@@ -1,2 +1,2 @@
-Mirall is a tool to synchronize files from ownCloud Server with
-your computer. It uses OCSync as its syncing backend.
+ownCloud client is a tool to synchronize files from ownCloud Server
+with your computer.
Only in mirall: MESSAGE
diff -ur mirall/Makefile owncloudclient/Makefile
--- mirall/Makefile	2015-03-21 20:39:44.000000000 +0900
+++ owncloudclient/Makefile	2015-03-22 06:43:39.000000000 +0900
@@ -1,39 +1,27 @@
-# $NetBSD: Makefile,v 1.12 2014/12/31 08:41:43 wiz Exp $
+# $NetBSD$
 
-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@localhost
-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++
-
 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 -ur mirall/PLIST owncloudclient/PLIST
--- mirall/PLIST	2014-12-31 07:11:44.000000000 +0900
+++ owncloudclient/PLIST	2015-03-21 21:26:17.000000000 +0900
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2014/12/30 22:11:44 ryoon Exp $
+@comment $NetBSD$
 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.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_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_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_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 -ur mirall/distinfo owncloudclient/distinfo
--- mirall/distinfo	2014-12-31 07:11:44.000000000 +0900
+++ owncloudclient/distinfo	2015-03-21 20:42:50.000000000 +0900
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2014/12/30 22:11:44 ryoon Exp $
+$NetBSD$
 
-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
+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


--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3