Attachment 152234 Details for Bug 196869 – svn diff

[patch] svn diff

www_py-seafdav.diff (text/plain), 13.13 KB, created by Jingfeng Yan on 2015-01-27 01:43:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jingfeng Yan

Created: 2015-01-27 01:43:28 UTC

Size: 13.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 377959)
>+++ 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,30 @@
> USES=		python:2
> NO_BUILD=	yes
> 
>+WWWDIR=		${PREFIX}/www/haiwen
>+SEAFILE_SERVER=	${WWWDIR}/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} \
>+		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}${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}${SITEPACKAGEDIR}/wsgidav)
> 
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 377959)
>+++ pkg-plist	(working copy)
>@@ -1,12 +1,149 @@
>-%%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
>+@owner %%SEAFILE_USERNAME%%
>+@group %%SEAFILE_GROUPNAME%%
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/__init__.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/__init__.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/__init__.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/__init__.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/__init__.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/__init__.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/couch_property_manager.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/couch_property_manager.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/couch_property_manager.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/hg_dav_provider.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/hg_dav_provider.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/hg_dav_provider.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/mongo_property_manager.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/mongo_property_manager.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/mongo_property_manager.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/mysql_dav_provider.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/mysql_dav_provider.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/mysql_dav_provider.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/nt_domain_controller.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/nt_domain_controller.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/nt_domain_controller.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/__init__.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/__init__.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/__init__.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/domain_controller.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/domain_controller.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/domain_controller.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/seaf_utils.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/seaf_utils.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/seaf_utils.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/seafile_dav_provider.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/seafile_dav_provider.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/addons/seafile/seafile_dav_provider.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dav_error.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dav_error.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dav_error.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dav_provider.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dav_provider.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dav_provider.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/debug_filter.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/debug_filter.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/debug_filter.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dir_browser.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dir_browser.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/dir_browser.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/domain_controller.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/domain_controller.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/domain_controller.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/error_printer.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/error_printer.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/error_printer.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/fs_dav_provider.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/fs_dav_provider.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/fs_dav_provider.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/http_authenticator.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/http_authenticator.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/http_authenticator.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/dav_provider_interface.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/dav_provider_interface.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/dav_provider_interface.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/domaincontrollerinterface.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/domaincontrollerinterface.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/domaincontrollerinterface.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/lockmanagerinterface.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/lockmanagerinterface.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/lockmanagerinterface.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/propertymanagerinterface.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/propertymanagerinterface.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/interfaces/propertymanagerinterface.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/lock_manager.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/lock_manager.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/lock_manager.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/lock_storage.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/lock_storage.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/lock_storage.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/property_manager.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/property_manager.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/property_manager.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/request_resolver.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/request_resolver.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/request_resolver.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/request_server.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/request_server.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/request_server.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/rw_lock.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/rw_lock.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/rw_lock.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/__init__.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/__init__.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/__init__.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/dav_provider_tools.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/dav_provider_tools.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/dav_provider_tools.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/mongo_dav_provider.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/mongo_dav_provider.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/mongo_dav_provider.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/virtual_dav_provider.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/virtual_dav_provider.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/samples/virtual_dav_provider.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/__init__.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/__init__.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/__init__.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/cherrypy_wsgiserver/LICENSE.txt
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/cherrypy_wsgiserver/__init__.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/cherrypy_wsgiserver/__init__.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/cherrypy_wsgiserver/__init__.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/ext_wsgiutils_server.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/ext_wsgiutils_server.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/ext_wsgiutils_server.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/run_reloading_server.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/run_reloading_server.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/run_reloading_server.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/run_server.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/run_server.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/run_server.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/sample_wsgidav.conf
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/server_sample.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/server_sample.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/server_sample.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/settings.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/settings.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/server/settings.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/util.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/util.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/util.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/version.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/version.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/version.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/wsgidav_app.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/wsgidav_app.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/wsgidav_app.pyo
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/xml_tools.py
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/xml_tools.pyc
>+%%WWWDIR%%/seafile-server/seahub/thirdpart/wsgidav/xml_tools.pyo
>+@dir %%WWWDIR%%
>+@dir %%SEAFILE_SERVER%%
>+@dir %%SEAHUBDIR%%
>+@dir %%SITEPACKAGEDIR%%
>+@dir %%SITEPACKAGEDIR%%/wsgidav
>+@dir %%SITEPACKAGEDIR%%/wsgidav/addons
>+@dir %%SITEPACKAGEDIR%%/wsgidav/addons/seafile
>+@dir %%SITEPACKAGEDIR%%/wsgidav/interfaces
>+@dir %%SITEPACKAGEDIR%%/wsgidav/samples
>+@dir %%SITEPACKAGEDIR%%/wsgidav/server
>+@dir %%SITEPACKAGEDIR%%/wsgidav/server/cherrypy_wsgiserver
>+@owner
>+@group

Actions: View | Diff

Attachments on bug 196869: 151830 | 151831 | 151832 | 151833 | 151879 | 152234 | 152235 | 152236 | 152237 | 152777 | 152778 | 153361 | 153362 | 153363