Index: Makefile
===================================================================
--- Makefile	(revision 378668)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ccnet
 PORTVERSION=	3.1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	yan_jingfeng@yahoo.com
@@ -12,7 +12,6 @@
 
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/devel/libsearpc \
-		libcrypto.so:${PORTSDIR}/security/openssl \
 		libglib-2.0.so:${PORTSDIR}/devel/glib20 \
 		libgobject-2.0.so:${PORTSDIR}/devel/glib20 \
 		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
@@ -19,7 +18,8 @@
 		libzdb.so:${PORTSDIR}/databases/libzdb \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libjansson.so:${PORTSDIR}/devel/jansson
+		libjansson.so:${PORTSDIR}/devel/jansson \
+		libldap.so:${PORTSDIR}/net/openldap24-client
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
@@ -33,18 +33,35 @@
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/event2
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/event2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-server
+CONFIGURE_ARGS+=--enable-server --enable-ldap
 INSTALL_TARGET=	install-strip
 
 WITH_OPENSSL_PORT=	yes
 USE_OPENSSL=	yes
 
-WWWDIR=		${PREFIX}/www/haiwen/seafile-server
-SEABIN=		${STAGEDIR}${WWWDIR}/seafile/bin
+HAIWENDIR=	www/haiwen
+SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
+SEABIN=		${SEAFILE_SERVER}/seafile/bin
+SEALIB=		${SEAFILE_SERVER}/seafile/lib
 
+SEAFILE_USERNAME?=	www
+SEAFILE_GROUPNAME?=	${SEAFILE_USERNAME}
+
+PLIST_SUB=	SEAFILE_USERNAME=${SEAFILE_USERNAME} \
+		SEAFILE_GROUPNAME=${SEAFILE_GROUPNAME} \
+		SEAFILE_SERVER=${SEAFILE_SERVER} \
+		HAIWENDIR=${HAIWENDIR}
+
 post-install:
-	@${MKDIR} ${SEABIN}
-	${LN} ${STAGEDIR}${PREFIX}/bin/ccnet-init ${SEABIN}
-	${LN} ${STAGEDIR}${PREFIX}/bin/ccnet-server ${SEABIN}
+	@${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}
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 378668)
+++ pkg-plist	(working copy)
@@ -1,9 +1,6 @@
 bin/ccnet
 bin/ccnet-demo-client
 bin/ccnet-demo-server
-bin/ccnet-init
-bin/ccnet-server
-bin/ccnet-servtool
 bin/ccnet-tool
 include/ccnet.h
 include/ccnet/async-rpc-proc.h
@@ -31,57 +28,59 @@
 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
-%%WWWDIR%%/seafile/bin/ccnet-init
-%%WWWDIR%%/seafile/bin/ccnet-server
+%%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
+@exec install -d -o %%SEAFILE_USERNAME%% -g %%SEAFILE_GROUPNAME%% -m 755 %D/%%HAIWENDIR%%