* Updated to 6.1.0

* Cleanup Makefile
* Added default on option, NLS for portlint

Approved by:	lifanov (mentor, implicit)

7 files changed, 40 insertions, 29 deletions

diff --git a/net-mgmt/ccnet-client/Makefile b/net-mgmt/ccnet-client/Makefile
index bf1aacfb257e..95a0a000764c 100644
--- a/net-mgmt/ccnet-client/Makefile
+++ b/net-mgmt/ccnet-client/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	ccnet-client
-PORTVERSION=	${SEAFILE_CLIENT_VER}
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+DISTVERSION=	${SEAFILE_CLIENT_VER}
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -20,9 +19,7 @@ LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
 		libevent.so:devel/libevent \
 		libjansson.so:devel/jansson
 
-CONFLICTS=	ccnet-server-[0-9]*
-
-USES=		autoreconf gettext libtool localbase pathfix pkgconfig \
+USES=		autoreconf libtool localbase pathfix pkgconfig \
 		python:-2.7 ssl
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
@@ -31,10 +28,16 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 GH_PROJECT=	ccnet
 
+CONFLICTS=	ccnet-server-[0-9]*
+
 CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
+OPTIONS_DEFINE=	NLS
+
+NLS_USES=	gettext
+
 .include "${.CURDIR}/../seafile-client/Makefile.include"
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ccnet-client/distinfo b/net-mgmt/ccnet-client/distinfo
index c5d61dc9c3c4..65d90fd5f53f 100644
--- a/net-mgmt/ccnet-client/distinfo
+++ b/net-mgmt/ccnet-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498237201
-SHA256 (haiwen-ccnet-v6.0.7_GH0.tar.gz) = c4e02b5b77d774ffaa47235e6e265ecce00f656766a2f232397ce86eeb3162fa
-SIZE (haiwen-ccnet-v6.0.7_GH0.tar.gz) = 179356
+TIMESTAMP = 1502838537
+SHA256 (haiwen-ccnet-v6.1.0_GH0.tar.gz) = 6b91c1a1a00622a2a07669dae144dd7fcd8f11275912384aa65d33da05088a60
+SIZE (haiwen-ccnet-v6.1.0_GH0.tar.gz) = 179362
diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile
index 5119dc5203fc..ff8d12f16d99 100644
--- a/net-mgmt/seafile-client/Makefile
+++ b/net-mgmt/seafile-client/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	seafile-client
-PORTVERSION=	${SEAFILE_CLIENT_VER}
 DISTVERSIONPREFIX=	v
+DISTVERSION=	${SEAFILE_CLIENT_VER}
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -25,23 +25,28 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 \
 		bash:shells/bash
 
-CONFLICTS=	seafile-server-[0-9]*
-
+USES=		autoreconf iconv libarchive libtool localbase mysql \
+		pathfix pkgconfig python:-2.7 shebangfix sqlite ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 GH_PROJECT=	seafile
 
-USES=		autoreconf gettext iconv libarchive libtool mysql pathfix \
-		pkgconfig python:-2.7 shebangfix sqlite ssl
 USE_GNOME=	glib20
+USE_LDCONFIG=	yes
+
+CONFLICTS=	seafile-server-[0-9]*
+
 SHEBANG_FILES=	*.sh scripts/*.sh app/seaf-cli integration-tests/*.sh
+
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
+CPPFLAGS+=	-I${LOCALBASE}/include/evhtp
 
 INSTALL_TARGET=	install-strip
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/evhtp
-LDFLAGS+=	-L${LOCALBASE}/lib
+
+OPTIONS_DEFINE=	NLS
+
+NLS_USES=	gettext
 
 .include <bsd.port.options.mk>
 
diff --git a/net-mgmt/seafile-client/Makefile.include b/net-mgmt/seafile-client/Makefile.include
index f8bf331bac2b..d9a5ab1a596e 100644
--- a/net-mgmt/seafile-client/Makefile.include
+++ b/net-mgmt/seafile-client/Makefile.include
@@ -1,3 +1,3 @@
 # $FreeBSD$
 
-SEAFILE_CLIENT_VER=6.0.7
+SEAFILE_CLIENT_VER=6.1.0
diff --git a/net-mgmt/seafile-client/distinfo b/net-mgmt/seafile-client/distinfo
index ae50b91ae3aa..661a9d0de0a0 100644
--- a/net-mgmt/seafile-client/distinfo
+++ b/net-mgmt/seafile-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498237202
-SHA256 (haiwen-seafile-v6.0.7_GH0.tar.gz) = e563eade01330bf679f3e6b9f0202b198170cdd8ec80642d9fb670b3a5cda793
-SIZE (haiwen-seafile-v6.0.7_GH0.tar.gz) = 823384
+TIMESTAMP = 1502838102
+SHA256 (haiwen-seafile-v6.1.0_GH0.tar.gz) = 06871c6b2ecf27c5c87329b5be03b5aba37cf7c6a4cc81867d3d8451c4ecfb0f
+SIZE (haiwen-seafile-v6.1.0_GH0.tar.gz) = 823289
diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile
index aa2a3e0217b5..55e0a3cad79a 100644
--- a/net-mgmt/seafile-gui/Makefile
+++ b/net-mgmt/seafile-gui/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	seafile-gui
-PORTVERSION=	${SEAFILE_CLIENT_VER}
 DISTVERSIONPREFIX=	v
+DISTVERSION=	${SEAFILE_CLIENT_VER}
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -19,22 +19,25 @@ LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
 		libevent.so:devel/libevent \
 		libuuid.so:misc/e2fsprogs-libuuid
 
+USES=		compiler:c++11-lang cmake pkgconfig shebangfix ssl
+SHEBANG_FILES=	extensions/*.sh scripts/*.sh fsplugin/*.sh \
+		scripts/*.py
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 GH_PROJECT=	seafile-client
 
-USES=		compiler:c++11-lang cmake gettext pkgconfig shebangfix ssl
-SHEBANG_FILES=	extensions/*.sh scripts/*.sh fsplugin/*.sh \
-		scripts/*.py
 USE_GNOME=	glib20
 USE_QT5=	core dbus gui network testlib widgets \
 		qmake_build buildtools_build linguisttools_build
 INSTALLS_ICONS=	yes
-CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 \
+CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 \
 		-DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \
 		-DOPENSSL_LIBRARIES="-L${OPENSSLLIB} -lcrypto"
 
-OPTIONS_DEFINE=		DEBUG
+OPTIONS_DEFINE=	DEBUG NLS
+
+NLS_USES=	gettext
 
 # Note that per PR 197984, cairo must be built with X11 and XCB options
 # otherwise configure fails with "cairo needs x11 enabled" message
diff --git a/net-mgmt/seafile-gui/distinfo b/net-mgmt/seafile-gui/distinfo
index 1ab3ec5c4928..fdc4ec7647a8 100644
--- a/net-mgmt/seafile-gui/distinfo
+++ b/net-mgmt/seafile-gui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498237204
-SHA256 (haiwen-seafile-client-v6.0.7_GH0.tar.gz) = 3212acab89ec3cee1508dd37826303447b7a738232e455b44ffc1a29d3c48baf
-SIZE (haiwen-seafile-client-v6.0.7_GH0.tar.gz) = 2192384
+TIMESTAMP = 1502838671
+SHA256 (haiwen-seafile-client-v6.1.0_GH0.tar.gz) = 6d1d9fdb238cdd8514f2aa22e81cbab7a4b178807e68883a7f8c29afd232369b
+SIZE (haiwen-seafile-client-v6.1.0_GH0.tar.gz) = 2246388