Adding conflict rule for seafile-client and seafile-server

[Daniel Oelschlegel <amoibos%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Sat Feb 25 16:08:45 2017 +0000
Changeset:	3d526606cdd00eb513745646987998ccfba4dc97

Modified Files:
	seafile-client/Makefile
	seafile-client/distinfo
	seafile-gui/Makefile
	seafile-gui/distinfo
	seafile-server/Makefile
Added Files:
	seafile-client/buildlink3.mk

Log Message:
Adding conflict rule for seafile-client and seafile-server

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3d526606cdd00eb513745646987998ccfba4dc97

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 seafile-client/Makefile      |  7 ++++---
 seafile-client/buildlink3.mk | 22 ++++++++++++++++++++++
 seafile-client/distinfo      |  8 ++++----
 seafile-gui/Makefile         |  9 +++------
 seafile-gui/distinfo         | 11 ++++-------
 seafile-server/Makefile      |  2 ++
 6 files changed, 39 insertions(+), 20 deletions(-)

diffs:
diff --git a/seafile-client/Makefile b/seafile-client/Makefile
index 410bd883bf..f3d06e3fc7 100644
--- a/seafile-client/Makefile
+++ b/seafile-client/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	net
 GITHUB_PROJECT=	seafile
-VERSION=	6.0.2
+VERSION=	6.0.3
 DISTNAME=	v${VERSION}
 PKGNAME=	seafile-client-${VERSION}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/}
@@ -25,6 +25,8 @@ AUTOMAKE_REQD=	1.9
 USE_LANGUAGES+=	c c++
 USE_TOOLS+=	pkg-config automake aclocal autoheader autoconf gmake
 
+CONFLICTS=	seafile-server-[0-9]*
+
 SUBST_CLASSES+=		python
 SUBST_STAGE.python=	pre-configure
 SUBST_FILES.python=	app/seaf-cli daemon/seaf-daemon
@@ -34,11 +36,11 @@ pre-configure:
 	set -e; cd ${WRKSRC}; \
 	libtoolize; aclocal; autoheader; automake -a --foreign -i; autoconf
 
+.include "../../devel/libinotify/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../wip/ccnet-server/buildlink3.mk"
 .include "../../wip/libsearpc/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../wip/seafile-server/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
@@ -46,5 +48,4 @@ pre-configure:
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../wip/libevhtp/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-#.include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/seafile-client/buildlink3.mk b/seafile-client/buildlink3.mk
new file mode 100644
index 0000000000..589dd2264b
--- /dev/null
+++ b/seafile-client/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	seafile-client
+BUILDLINK_TREE+=	libseafile
+
+.if !defined(SEAFILE_CLIENT_BUILDLINK3_MK)
+SEAFILE_CLIENT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.seafile-client+=	seafile-client>=6.0.0
+BUILDLINK_PKGSRCDIR.seafile-client?=	../../wip/seafile-client
+.endif	# SEAFILE_CLIENT_BUILDLINK3_MK
+
+
+.if !defined(LIBSEAFILE_BUILDLINK3_MK)
+LIBSEAFILE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libseafile+=	seafile-client>=6.0.0
+BUILDLINK_PKGSRCDIR.libseafile?=	../../wip/seafile-client
+.endif	# LIBSEAFILE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libseafile
+BUILDLINK_TREE+=	-seafile-client
diff --git a/seafile-client/distinfo b/seafile-client/distinfo
index 7ec147e86b..95e3b583ea 100644
--- a/seafile-client/distinfo
+++ b/seafile-client/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (seafile/v6.0.2.tar.gz) = 92cf107c11569ea09fde8ffde21a9611ad5f66e7
-RMD160 (seafile/v6.0.2.tar.gz) = 863740c6859153814b323ecaeed7aaa9737e0bd8
-SHA512 (seafile/v6.0.2.tar.gz) = ae79265927b3c2e2fd955affbc2f61c44f29071ede8b4dead66030afda271405c3cd3d3b6c136229ea1c6c994bd0f46a5667143ca89d0d3174efa75101162585
-Size (seafile/v6.0.2.tar.gz) = 455040 bytes
+SHA1 (seafile/v6.0.3.tar.gz) = 417f60f3b52b571eea533c3c62594e418a1473e0
+RMD160 (seafile/v6.0.3.tar.gz) = 3c0517e525146cdcc42d1bac088145e1356ddafe
+SHA512 (seafile/v6.0.3.tar.gz) = f494ea4509e721675fbc6014743933b29f22ada6b5bb38e70cdc3d129695b61980dfc1f6473bcf7ee5a0cd4db7a54ddff9296e7b5c76612896197ff4290054d7
+Size (seafile/v6.0.3.tar.gz) = 454398 bytes
 SHA1 (patch-common_obj-backend-fs.c) = a02039cb7b7e18094acfdf03603aaaf65a04257e
 SHA1 (patch-configure.ac) = 31dd263769416c447a2fe25ef3b0ab6324057919
 SHA1 (patch-daemon_Makefile.am) = 577bb58378dec7777272b11f6431832a75fce59d
diff --git a/seafile-gui/Makefile b/seafile-gui/Makefile
index 7c16a111a4..48e829e3cc 100644
--- a/seafile-gui/Makefile
+++ b/seafile-gui/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	net
 GITHUB_PROJECT=	seafile-client
-VERSION=	6.0.2
+VERSION=	6.0.3
 DISTNAME=	v${VERSION}
 PKGNAME=	seafile-gui-${VERSION}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/}
@@ -23,15 +23,12 @@ USE_CMAKE=	yes
 USE_LANGUAGES+=	c c++
 USE_TOOLS+=	pkg-config cmake
 
-DEPENDS+=	seafile-client>=6.0:../../wip/seafile-client
-
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../wip/ccnet-server/buildlink3.mk"
 .include "../../wip/libsearpc/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../wip/seafile-server/buildlink3.mk"
-#.include "../../wip/seafile-client/buildlink3.mk"
-#.include "../../devel/libuuid/buildlink3.mk"
+.include "../../wip/seafile-client/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
 #.include "../../x11/qt5-qtwebsockets/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 #.include "../../x11/qt5-sqlite3/buildlink3.mk"
diff --git a/seafile-gui/distinfo b/seafile-gui/distinfo
index b9f1b38371..0c854103ab 100644
--- a/seafile-gui/distinfo
+++ b/seafile-gui/distinfo
@@ -1,9 +1,6 @@
 $NetBSD$
 
-SHA1 (seafile-client/v6.0.2.tar.gz) = 44b66481c332942fc783d9ac2339056095ffd7ea
-RMD160 (seafile-client/v6.0.2.tar.gz) = a1723bea6a2ac9970fb5402053a4db82a753b0fe
-SHA512 (seafile-client/v6.0.2.tar.gz) = eeac924b18db8e97babd7f725aed34b64611558826407e53e69b388ac00e61652c71c52e27fbd5f43f92b479373b345bc45b0582112215f37449af96b5fe3ba5
-Size (seafile-client/v6.0.2.tar.gz) = 2166417 bytes
-#SHA1 (patch-configure.ac) = b64ab704bc65d2d93506741d9ce81c4f84de8b2d
-#SHA1 (patch-daemon_Makefile.am) = 6342d9d0f7219ae1df1b639d05a5021336ac1f66
-#SHA1 (patch-lib_Makefile.am) = 98a35c1965a431aa1ced13e271568a05e293d9d5
+SHA1 (seafile-client/v6.0.3.tar.gz) = d29fdfe6ea7a9b86d0ab9acf7cc21d6944985f85
+RMD160 (seafile-client/v6.0.3.tar.gz) = ffeefbb46ed7867c6bcc5515c1684b46bee26cb5
+SHA512 (seafile-client/v6.0.3.tar.gz) = 90f64b367672390a0488669ea8d8c305271496f1f84a40eadd6df53283b101355a08f0a4914e2ed3c83bcc544f63a8a0941dfa49f0ff0a7fe61547692c1adfdc
+Size (seafile-client/v6.0.3.tar.gz) = 2170583 bytes
diff --git a/seafile-server/Makefile b/seafile-server/Makefile
index 7fa611be44..c631e5eafb 100644
--- a/seafile-server/Makefile
+++ b/seafile-server/Makefile
@@ -35,6 +35,8 @@ CONFIGURE_ARGS+=	--disable-fuse \
 
 DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
 
+CONFLICTS=	seafile-client-[0-9]*
+
 SUBST_CLASSES+=		python
 SUBST_STAGE.python=	pre-configure
 SUBST_FILES.python=	tools/seafile-admin