Index: Makefile
===================================================================
--- Makefile	(revision 378668)
+++ Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	seafdav
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -10,8 +11,6 @@
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}WsgiDAV>=0.5:${PORTSDIR}/www/py-wsgidav
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 GH_TAGNAME=	v${PORTVERSION}-server-testing
@@ -20,16 +19,31 @@
 USES=		python:2
 NO_BUILD=	yes
 
+HAIWENDIR=	www/haiwen
+SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
+SEAHUBDIR=	${SEAFILE_SERVER}/seahub
+SITEPACKAGEDIR=	${SEAHUBDIR}/thirdpart
+
+SEAFILE_USERNAME?=	www
+SEAFILE_GROUPNAME?=	${SEAFILE_USERNAME}
+
+PLIST_SUB=	SEAFILE_USERNAME=${SEAFILE_USERNAME} \
+		SEAFILE_GROUPNAME=${SEAFILE_GROUPNAME} \
+		SEAFILE_SERVER=${SEAFILE_SERVER} \
+		SEAHUBDIR=${SEAHUBDIR} \
+		HAIWENDIR=${HAIWENDIR} \
+		SITEPACKAGEDIR=${SITEPACKAGEDIR}
+
 do-install:
-	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/wsgidav/addons/seafile
-	(cd ${WRKSRC}/wsgidav/addons/seafile && ${COPYTREE_SHARE} . \
-		${STAGEDIR}${PYTHON_SITELIBDIR}/wsgidav/addons/seafile)
-	(cd ${STAGEDIR}${PREFIX} && \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITEPACKAGEDIR}/wsgidav
+	(cd ${WRKSRC}/wsgidav && \
 		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-			-d ${PYTHONPREFIX_SITELIBDIR} \
-			-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \
+			-d ${WRKSRC}/wsgidav \
+			-f ${WRKSRC}/wsgidav && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-			-d ${PYTHONPREFIX_SITELIBDIR} \
-			-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
+			-d ${WRKSRC}/wsgidav \
+			-f ${WRKSRC}/wsgidav)
+	(cd ${WRKSRC}/wsgidav && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITEPACKAGEDIR}/wsgidav)
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 378668)
+++ pkg-plist	(working copy)
@@ -1,12 +1,136 @@
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/__init__.py
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/__init__.pyc
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/__init__.pyo
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/domain_controller.py
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/domain_controller.pyc
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/domain_controller.pyo
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/seaf_utils.py
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/seaf_utils.pyc
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/seaf_utils.pyo
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/seafile_dav_provider.py
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/seafile_dav_provider.pyc
-%%PYTHON_SITELIBDIR%%/wsgidav/addons/seafile/seafile_dav_provider.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/__init__.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/__init__.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/__init__.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/__init__.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/__init__.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/__init__.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/couch_property_manager.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/couch_property_manager.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/couch_property_manager.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/hg_dav_provider.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/hg_dav_provider.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/hg_dav_provider.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/mongo_property_manager.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/mongo_property_manager.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/mongo_property_manager.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/mysql_dav_provider.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/mysql_dav_provider.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/mysql_dav_provider.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/nt_domain_controller.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/nt_domain_controller.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/nt_domain_controller.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/__init__.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/__init__.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/__init__.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/domain_controller.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/domain_controller.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/domain_controller.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/seaf_utils.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/seaf_utils.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/seaf_utils.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/seafile_dav_provider.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/seafile_dav_provider.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/addons/seafile/seafile_dav_provider.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dav_error.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dav_error.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dav_error.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dav_provider.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dav_provider.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dav_provider.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/debug_filter.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/debug_filter.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/debug_filter.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dir_browser.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dir_browser.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/dir_browser.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/domain_controller.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/domain_controller.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/domain_controller.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/error_printer.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/error_printer.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/error_printer.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/fs_dav_provider.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/fs_dav_provider.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/fs_dav_provider.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/http_authenticator.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/http_authenticator.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/http_authenticator.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/dav_provider_interface.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/dav_provider_interface.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/dav_provider_interface.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/domaincontrollerinterface.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/domaincontrollerinterface.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/domaincontrollerinterface.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/lockmanagerinterface.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/lockmanagerinterface.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/lockmanagerinterface.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/propertymanagerinterface.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/propertymanagerinterface.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/interfaces/propertymanagerinterface.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/lock_manager.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/lock_manager.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/lock_manager.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/lock_storage.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/lock_storage.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/lock_storage.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/property_manager.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/property_manager.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/property_manager.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/request_resolver.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/request_resolver.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/request_resolver.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/request_server.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/request_server.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/request_server.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/rw_lock.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/rw_lock.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/rw_lock.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/__init__.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/__init__.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/__init__.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/dav_provider_tools.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/dav_provider_tools.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/dav_provider_tools.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/mongo_dav_provider.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/mongo_dav_provider.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/mongo_dav_provider.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/virtual_dav_provider.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/virtual_dav_provider.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/samples/virtual_dav_provider.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/__init__.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/__init__.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/__init__.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/cherrypy_wsgiserver/LICENSE.txt
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/cherrypy_wsgiserver/__init__.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/cherrypy_wsgiserver/__init__.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/cherrypy_wsgiserver/__init__.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/ext_wsgiutils_server.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/ext_wsgiutils_server.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/ext_wsgiutils_server.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/run_reloading_server.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/run_reloading_server.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/run_reloading_server.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/run_server.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/run_server.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/run_server.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/sample_wsgidav.conf
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/server_sample.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/server_sample.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/server_sample.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/settings.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/settings.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/server/settings.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/util.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/util.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/util.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/version.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/version.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/version.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/wsgidav_app.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/wsgidav_app.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/wsgidav_app.pyo
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/xml_tools.py
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/xml_tools.pyc
+%%SEAFILE_SERVER%%/seahub/thirdpart/wsgidav/xml_tools.pyo
+@exec install -d -o %%SEAFILE_USERNAME%% -g %%SEAFILE_GROUPNAME%% -m 755 %D/%%SEAHUBDIR%%
+@exec install -d -o %%SEAFILE_USERNAME%% -g %%SEAFILE_GROUPNAME%% -m 755 %D/%%HAIWENDIR%%