Index: net-mgmt/ccnet/Makefile
===================================================================
--- net-mgmt/ccnet/Makefile	(revision 428763)
+++ net-mgmt/ccnet/Makefile	(working copy)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	ccnet
-PORTVERSION=	6.0.0
+PORTVERSION=	6.0.1
 DISTVERSIONPREFIX=	v
-DISTVERSIONSUFFIX=	-server
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima1252@gmail.com
@@ -32,22 +31,9 @@
 
 CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-server --enable-ldap
+CONFIGURE_ARGS+=	--enable-ldap
 INSTALL_TARGET=	install-strip
 
-HAIWENDIR=	www/haiwen
-SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
-SEABIN=		${SEAFILE_SERVER}/seafile/bin
-SEALIB=		${SEAFILE_SERVER}/seafile/lib
-
-USERS=		seafile
-GROUPS=		${USERS}
-
-PLIST_SUB=	USERS=${USERS} \
-		GROUPS=${GROUPS} \
-		SEAFILE_SERVER=${SEAFILE_SERVER} \
-		HAIWENDIR=${HAIWENDIR}
-
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
@@ -54,17 +40,4 @@
 WITH_OPENSSL_PORT=	yes
 .endif
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${SEABIN} ${STAGEDIR}${PREFIX}/${SEALIB}
-	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-init ${STAGEDIR}${PREFIX}/${SEABIN}
-	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-server ${STAGEDIR}${PREFIX}/${SEABIN}
-	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-servtool ${STAGEDIR}${PREFIX}/${SEABIN}
-	${RM} ${STAGEDIR}${PREFIX}/bin/ccnet-init \
-		${STAGEDIR}${PREFIX}/bin/ccnet-server \
-		${STAGEDIR}${PREFIX}/bin/ccnet-servtool
-	(cd ${STAGEDIR}${PREFIX}/lib && \
-		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
-	${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/
-
 .include <bsd.port.mk>
Index: net-mgmt/ccnet/distinfo
===================================================================
--- net-mgmt/ccnet/distinfo	(revision 428763)
+++ net-mgmt/ccnet/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470238343
-SHA256 (haiwen-ccnet-v6.0.0-server_GH0.tar.gz) = bb7be1c4a6c0a6d4cc9456089c6d16bbeba72541a4a9b59ead8a4075f067fc93
-SIZE (haiwen-ccnet-v6.0.0-server_GH0.tar.gz) = 222098
+TIMESTAMP = 1481772896
+SHA256 (haiwen-ccnet-v6.0.1_GH0.tar.gz) = fc477904240ada0e3f20d840d40e50c4f1693959e6dc78817616f5f49aa4d227
+SIZE (haiwen-ccnet-v6.0.1_GH0.tar.gz) = 222193
Index: net-mgmt/ccnet/pkg-plist
===================================================================
--- net-mgmt/ccnet/pkg-plist	(revision 428763)
+++ net-mgmt/ccnet/pkg-plist	(working copy)
@@ -1,8 +1,9 @@
 bin/ccnet
 bin/ccnet-demo-client
 bin/ccnet-demo-server
+bin/ccnet-init
+bin/ccnet-servtool
 bin/ccnet-tool
-bin/ccnet-server
 include/ccnet.h
 include/ccnet/async-rpc-proc.h
 include/ccnet/ccnet-client.h
@@ -29,59 +30,55 @@
 lib/libccnet.so
 lib/libccnet.so.0
 lib/libccnet.so.0.0.0
+%%PYTHON_SITELIBDIR%%/ccnet/__init__.py
+%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.py
+%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.py
+%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.py
+%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/async/processor.py
+%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.py
+%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.py
+%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/async/timer.py
+%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/client.py
+%%PYTHON_SITELIBDIR%%/ccnet/client.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/client.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/errors.py
+%%PYTHON_SITELIBDIR%%/ccnet/errors.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/errors.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/message.py
+%%PYTHON_SITELIBDIR%%/ccnet/message.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/message.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/packet.py
+%%PYTHON_SITELIBDIR%%/ccnet/packet.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/packet.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/pool.py
+%%PYTHON_SITELIBDIR%%/ccnet/pool.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/pool.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/rpc.py
+%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/status_code.py
+%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/sync_client.py
+%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyo
+%%PYTHON_SITELIBDIR%%/ccnet/utils.py
+%%PYTHON_SITELIBDIR%%/ccnet/utils.pyc
+%%PYTHON_SITELIBDIR%%/ccnet/utils.pyo
 libdata/pkgconfig/libccnet.pc
-%%SEAFILE_SERVER%%/seafile/bin/ccnet-init
-%%SEAFILE_SERVER%%/seafile/bin/ccnet-server
-%%SEAFILE_SERVER%%/seafile/bin/ccnet-servtool
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__init__.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.pyo
-@dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%