- Rename msynctool-devel to osynctool.

  * msynctool development has ceased.
  * The upstream project has renamed to OpenSync
  * Copy msynctool-devel instead of msynctool due to it being much more
    up-to-date and because development has stopped on the former
    project.
- Unbreak
- Update to 0.39
- Pass maintainership to submitter

PR:		ports/179053
Submitted by:	Danilo Egea Gondolfo <danilogondolfo@gmail.com>

8 files changed, 28 insertions, 34 deletions

diff --git a/MOVED b/MOVED
index d4cfa76cd896..0d349361aab7 100644
--- a/MOVED
+++ b/MOVED
@@ -4371,3 +4371,4 @@ databases/postgresql83-plperl||2013-06-04|Has expired: Update to supported versi
 databases/postgresql83-plpython||2013-06-04|Has expired: Update to supported version
 databases/postgresql83-pltcl||2013-06-04|Has expired: Update to supported version
 databases/postgresql83-server||2013-06-04|Has expired: Update to supported version
+deskutils/msynctool-devel|deskutils/osynctool|2013-06-04|Development of msynctool ceased and project was renamed
diff --git a/deskutils/Makefile b/deskutils/Makefile
index a23f8f1da9cc..4578f2ad4704 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -169,7 +169,6 @@
     SUBDIR += moregroupware
     SUBDIR += mrundlg
     SUBDIR += msynctool
-    SUBDIR += msynctool-devel
     SUBDIR += multisync
     SUBDIR += multisync-backup
     SUBDIR += multisync-syncml
@@ -189,6 +188,7 @@
     SUBDIR += orage
     SUBDIR += org-mode.el
     SUBDIR += osmo
+    SUBDIR += osynctool
     SUBDIR += p5-Data-ICal
     SUBDIR += p5-Goo
     SUBDIR += p5-ZConf-BGSet
diff --git a/deskutils/msynctool-devel/Makefile b/deskutils/msynctool-devel/Makefile
deleted file mode 100644
index e8ddc0629f7d..000000000000
--- a/deskutils/msynctool-devel/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Alexander Logvinov <ports@logvinov.com>
-# $FreeBSD$
-
-PORTNAME=	msynctool
-PORTVERSION=	0.36
-PORTREVISION=	1
-CATEGORIES=	deskutils
-MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Command line client for the OpenSync framework
-
-LIB_DEPENDS=	opensync.1:${PORTSDIR}/devel/libopensync
-
-CONFLICTS=	msynctool-0.2*
-
-USE_BZIP2=	yes
-USES=		cmake:outsource pkgconfig
-
-PLIST_FILES=	bin/${PORTNAME}
-
-BROKEN=		fails to build with recent libopensync
-
-post-patch:
-# Help find opensync, which is apparently renamed in ports
-	${REINPLACE_CMD} -e "s,opensync-1.0,libopensync,g" \
-		${WRKSRC}/cmake/modules/FindOpenSync.cmake
-
-.include <bsd.port.mk>
diff --git a/deskutils/msynctool-devel/distinfo b/deskutils/msynctool-devel/distinfo
deleted file mode 100644
index 774384113942..000000000000
--- a/deskutils/msynctool-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (msynctool-0.36.tar.bz2) = de08e22708348216e0e1ea3c32b4cf0c04d5acae5057b5995fc087790f0ae1a5
-SIZE (msynctool-0.36.tar.bz2) = 34214
diff --git a/deskutils/msynctool/Makefile b/deskutils/msynctool/Makefile
index 7a9c88c02742..3efbea97fce9 100644
--- a/deskutils/msynctool/Makefile
+++ b/deskutils/msynctool/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A command line client for the OpenSync framework
 
 LIB_DEPENDS=	opensync.0:${PORTSDIR}/devel/libopensync022
 
-CONFLICTS=	msynctool-devel-[0-9]*
+CONFLICTS=	osynctool-[0-9]*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/osynctool/Makefile b/deskutils/osynctool/Makefile
new file mode 100644
index 000000000000..d9eae5af107b
--- /dev/null
+++ b/deskutils/osynctool/Makefile
@@ -0,0 +1,23 @@
+# Created by: Alexander Logvinov <ports@logvinov.com>
+# $FreeBSD$
+
+PORTNAME=	osynctool
+PORTVERSION=	0.39
+CATEGORIES=	deskutils
+MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/
+
+MAINTAINER=	danilogondolfo@gmail.com
+COMMENT=	Command line client for the OpenSync framework
+
+LIB_DEPENDS=	opensync:${PORTSDIR}/devel/libopensync
+
+CONFLICTS=	msynctool-0.2*
+
+USE_BZIP2=	yes
+USES=		cmake:outsource pkgconfig
+
+PLIST_FILES=	bin/${PORTNAME} \
+		etc/bash_completion.d/${PORTNAME}.sh
+PLIST_DIRSTRY=	etc/bash_completion.d
+
+.include <bsd.port.mk>
diff --git a/deskutils/osynctool/distinfo b/deskutils/osynctool/distinfo
new file mode 100644
index 000000000000..2abb09453711
--- /dev/null
+++ b/deskutils/osynctool/distinfo
@@ -0,0 +1,2 @@
+SHA256 (osynctool-0.39.tar.bz2) = 9690bc7720fadd1517c56f04b480d99c87304a43dc6e04b89bf1f59bb7e6764d
+SIZE (osynctool-0.39.tar.bz2) = 55850
diff --git a/deskutils/msynctool-devel/pkg-descr b/deskutils/osynctool/pkg-descr
index 5727b2a00f14..5727b2a00f14 100644
--- a/deskutils/msynctool-devel/pkg-descr
+++ b/deskutils/osynctool/pkg-descr