Index: head/net-mgmt/ccnet/Makefile
===================================================================
--- head/net-mgmt/ccnet/Makefile	(revision 416097)
+++ head/net-mgmt/ccnet/Makefile	(revision 416098)
@@ -1,72 +1,72 @@
 # $FreeBSD$
 
 PORTNAME=	ccnet
-PORTVERSION=	5.1.1
+PORTVERSION=	5.1.2
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-server
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima1252@gmail.com
 COMMENT=	Framework for writing networked applications
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
 		libglib-2.0.so:devel/glib20 \
 		libsqlite3.so:databases/sqlite3 \
 		libzdb.so:databases/libzdb \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libevent.so:devel/libevent2 \
 		libjansson.so:devel/jansson \
 		libldap.so:net/openldap24-client
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 
-USES=		autoreconf libtool localbase pathfix pkgconfig python:-2.7 \
-		shebangfix
+USES=		autoreconf gettext libtool localbase pathfix pkgconfig \
+		python:-2.7 shebangfix
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 SHEBANG_FILES=	tools/*.py
 PATHFIX_MAKEFILEIN=	Makefile.am
 
 CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-server --enable-ldap
 INSTALL_TARGET=	install-strip
 
 HAIWENDIR=	www/haiwen
 SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
 SEABIN=		${SEAFILE_SERVER}/seafile/bin
 SEALIB=		${SEAFILE_SERVER}/seafile/lib
 
-SEAFILE_USERNAME?=	seafile
-SEAFILE_GROUPNAME?=	${SEAFILE_USERNAME}
+USERS=		seafile
+GROUPS=		${USERS}
 
-PLIST_SUB=	SEAFILE_USERNAME=${SEAFILE_USERNAME} \
-		SEAFILE_GROUPNAME=${SEAFILE_GROUPNAME} \
+PLIST_SUB=	USERS=${USERS} \
+		GROUPS=${GROUPS} \
 		SEAFILE_SERVER=${SEAFILE_SERVER} \
 		HAIWENDIR=${HAIWENDIR}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
 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} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
 	${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: head/net-mgmt/ccnet/distinfo
===================================================================
--- head/net-mgmt/ccnet/distinfo	(revision 416097)
+++ head/net-mgmt/ccnet/distinfo	(revision 416098)
@@ -1,2 +1,2 @@
-SHA256 (haiwen-ccnet-v5.1.1-server_GH0.tar.gz) = d237ae8b54b6ad561b88d517d03a77f5389f3269075c17d484f53b58af3a6705
-SIZE (haiwen-ccnet-v5.1.1-server_GH0.tar.gz) = 221857
+SHA256 (haiwen-ccnet-v5.1.2-server_GH0.tar.gz) = 722d92002e23acd03a519236507f427f8617ea9a1a5086fad8bb85d79bfb0aad
+SIZE (haiwen-ccnet-v5.1.2-server_GH0.tar.gz) = 216062
Index: head/net-mgmt/ccnet/pkg-plist
===================================================================
--- head/net-mgmt/ccnet/pkg-plist	(revision 416097)
+++ head/net-mgmt/ccnet/pkg-plist	(revision 416098)
@@ -1,87 +1,87 @@
 bin/ccnet
 bin/ccnet-demo-client
 bin/ccnet-demo-server
 bin/ccnet-tool
 bin/ccnet-server
 include/ccnet.h
 include/ccnet/async-rpc-proc.h
 include/ccnet/ccnet-client.h
 include/ccnet/ccnet-object.h
 include/ccnet/ccnet-session-base.h
 include/ccnet/ccnetrpc-transport.h
 include/ccnet/cevent.h
 include/ccnet/invoke-service-proc.h
 include/ccnet/job-mgr.h
 include/ccnet/message.h
 include/ccnet/mqclient-proc.h
 include/ccnet/option.h
 include/ccnet/packet.h
 include/ccnet/peer.h
 include/ccnet/proc-factory.h
 include/ccnet/processor.h
 include/ccnet/rpcserver-proc.h
 include/ccnet/sendcmd-proc.h
 include/ccnet/status-code.h
 include/ccnet/threaded-rpcserver-proc.h
 include/ccnet/timer.h
 include/ccnet/valid-check.h
 lib/libccnet.a
 lib/libccnet.so
 lib/libccnet.so.0
 lib/libccnet.so.0.0.0
 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(%%SEAFILE_USERNAME%%,%%SEAFILE_GROUPNAME%%,755) %%HAIWENDIR%%
+@dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%