Attachment 152228 Details for Bug 196922 – svn diff

[patch] svn diff

net-mgmt_seafile.diff (text/plain), 12.25 KB, created by Jingfeng Yan on 2015-01-27 01:39:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jingfeng Yan

Created: 2015-01-27 01:39:02 UTC

Size: 12.25 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 377959)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	seafile
> PORTVERSION=	3.1.4
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-mgmt devel
> 
> MAINTAINER=	yan_jingfeng@yahoo.com
>@@ -19,8 +19,8 @@
> 		libinotify.so:${PORTSDIR}/devel/libinotify \
> 		libccnet.so:${PORTSDIR}/net-mgmt/ccnet
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo \
>-		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
>+		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
> 		bash:${PORTSDIR}/shells/bash
> 
> USE_GITHUB=	yes
>@@ -29,6 +29,7 @@
> GH_COMMIT=	ac58109
> 
> USES=		autoreconf iconv libtool pathfix pkgconfig python:2 shebangfix
>+SHEBANG_FILES=	scripts/*.sh scripts/upgrade/*.sh
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
> USE_LDCONFIG=	yes
>@@ -38,11 +39,23 @@
> 
> CONFIGURE_ARGS=	--enable-server
> INSTALL_TARGET=	install-strip
>-WWWDIR=		${PREFIX}/www/haiwen/seafile-server
>-SEABIN=		${STAGEDIR}${WWWDIR}/seafile/bin
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>+WWWDIR=		${PREFIX}/www/haiwen
>+SEAFILE_SERVER=	${WWWDIR}/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} \
>+		SEABIN=${SEABIN} \
>+		SEALIB=${SEALIB}
>+
> MAKE_JOBS_UNSAFE=	yes
> 
> OPTIONS_DEFINE=		FUSE RIAK
>@@ -63,21 +76,25 @@
> .endif
> 
> post-install:
>-	@${MKDIR} ${SEABIN} \
>-		${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile \
>-		${STAGEDIR}${WWWDIR}/upgrade
>+	@${MKDIR} ${STAGEDIR}${SEABIN} ${STAGEDIR}${SEALIB}\
>+		${STAGEDIR}${SEAFILE_SERVER}/seafile/share/doc/seafile \
>+		${STAGEDIR}${SEAFILE_SERVER}/upgrade
> .for SERVPROG in fileserver seaf-fsck seafserv-gc seaf-fuse seaf-migrate \
> 	seaf-server seaf-server-init seafile-controller seafserv-tool
> 	if [ -e "${STAGEDIR}${PREFIX}/bin/${SERVPROG}" ]; then \
>-		${LN} ${STAGEDIR}${PREFIX}/bin/${SERVPROG} ${SEABIN}; \
>+		${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/${SERVPROG} ${STAGEDIR}${SEABIN}; \
>+		${RM} ${STAGEDIR}${PREFIX}/bin/${SERVPROG}; \
> 	fi
> .endfor
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][yh] ${STAGEDIR}${WWWDIR}
>+	(cd ${STAGEDIR}${PREFIX}/lib && \
>+		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${SEALIB})
>+	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
>+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][yh] ${STAGEDIR}${SEAFILE_SERVER}
> 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/upgrade/*.[ps][yh] \
>-		${STAGEDIR}${WWWDIR}/upgrade
>+		${STAGEDIR}${SEAFILE_SERVER}/upgrade
> 	${INSTALL_DATA} ${WRKSRC}/doc/seafile-tutorial.doc \
>-		${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile/
>+		${STAGEDIR}${SEAFILE_SERVER}/seafile/share/doc/seafile/
> 	(cd ${WRKSRC}/scripts/upgrade && \
>-		${COPYTREE_SHARE} sql ${STAGEDIR}${WWWDIR}/upgrade)
>+		${COPYTREE_SHARE} sql ${STAGEDIR}${SEAFILE_SERVER}/upgrade)
> 
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 377959)
>+++ pkg-plist	(working copy)
>@@ -1,16 +1,7 @@
>-bin/fileserver
> bin/seaf-cli
> bin/seaf-daemon
>-bin/seaf-fsck
>-%%FUSE%%bin/seaf-fuse
>-bin/seaf-migrate
>-bin/seaf-server
>-bin/seaf-server-init
> bin/seafile
> bin/seafile-admin
>-bin/seafile-controller
>-bin/seafserv-gc
>-bin/seafserv-tool
> include/seafile/monitor-rpc.h
> include/seafile/seafile-object.h
> include/seafile/seafile-rpc.h
>@@ -19,78 +10,119 @@
> lib/libseafile.so
> lib/libseafile.so.0
> lib/libseafile.so.0.0.0
>-%%PYTHON_SITELIBDIR%%/seafile/__init__.py
>-%%PYTHON_SITELIBDIR%%/seafile/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/seafile/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/seafile/rpcclient.py
>-%%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyc
>-%%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyo
>-%%PYTHON_SITELIBDIR%%/seaserv/__init__.py
>-%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/seaserv/api.py
>-%%PYTHON_SITELIBDIR%%/seaserv/api.pyc
>-%%PYTHON_SITELIBDIR%%/seaserv/api.pyo
>-%%PYTHON_SITELIBDIR%%/seaserv/service.py
>-%%PYTHON_SITELIBDIR%%/seaserv/service.pyc
>-%%PYTHON_SITELIBDIR%%/seaserv/service.pyo
> libdata/pkgconfig/libseafile.pc
> man/man1/ccnet.1.gz
> man/man1/seaf-cli.1.gz
> man/man1/seaf-daemon.1.gz
> man/man1/seafile-applet.1.gz
>-%%WWWDIR%%/check_init_admin.py
>-%%WWWDIR%%/reset-admin.sh
>-%%WWWDIR%%/seaf-cli-wrapper.sh
>-%%WWWDIR%%/seaf-fuse.sh
>-%%WWWDIR%%/seaf-gc.sh
>-%%WWWDIR%%/seafile.sh
>-%%WWWDIR%%/seafile/bin/fileserver
>-%%WWWDIR%%/seafile/bin/seaf-fsck
>-%%FUSE%%%%WWWDIR%%/seafile/bin/seaf-fuse
>-%%WWWDIR%%/seafile/bin/seaf-migrate
>-%%WWWDIR%%/seafile/bin/seaf-server
>-%%WWWDIR%%/seafile/bin/seaf-server-init
>-%%WWWDIR%%/seafile/bin/seafile-controller
>-%%WWWDIR%%/seafile/bin/seafserv-gc
>-%%WWWDIR%%/seafile/bin/seafserv-tool
>-%%PORTDOCS%%%%WWWDIR%%/seafile/%%DOCSDIR%%/seafile-tutorial.doc
>-%%WWWDIR%%/seahub.sh
>-%%WWWDIR%%/setup-seafile-mysql.py
>-%%WWWDIR%%/setup-seafile-mysql.sh
>-%%WWWDIR%%/setup-seafile.sh
>-%%WWWDIR%%/sqlite2mysql.py
>-%%WWWDIR%%/sqlite2mysql.sh
>-%%WWWDIR%%/upgrade/add_collate.sh
>-%%WWWDIR%%/upgrade/db_update_1.3_1.4.py
>-%%WWWDIR%%/upgrade/db_update_helper.py
>-%%WWWDIR%%/upgrade/minor-upgrade.sh
>-%%WWWDIR%%/upgrade/sql/1.6.0/mysql/seahub.sql
>-%%WWWDIR%%/upgrade/sql/1.6.0/sqlite3/seahub.sql
>-%%WWWDIR%%/upgrade/sql/1.7.0/mysql/seafile.sql
>-%%WWWDIR%%/upgrade/sql/1.7.0/mysql/seahub.sql
>-%%WWWDIR%%/upgrade/sql/1.7.0/sqlite3/seafile.sql
>-%%WWWDIR%%/upgrade/sql/1.7.0/sqlite3/seahub.sql
>-%%WWWDIR%%/upgrade/sql/1.8.0/mysql/ccnet.sql
>-%%WWWDIR%%/upgrade/sql/1.8.0/mysql/seahub.sql
>-%%WWWDIR%%/upgrade/sql/1.8.0/sqlite3/seahub.sql
>-%%WWWDIR%%/upgrade/sql/2.0.0/mysql/seahub.sql
>-%%WWWDIR%%/upgrade/sql/2.0.0/sqlite3/seahub.sql
>-%%WWWDIR%%/upgrade/sql/2.1.0/mysql/seahub.sql
>-%%WWWDIR%%/upgrade/sql/2.1.0/sqlite3/seahub.sql
>-%%WWWDIR%%/upgrade/sql/2.2.0/mysql/ccnet.sql
>-%%WWWDIR%%/upgrade/sql/3.0.0/mysql/seahub.sql
>-%%WWWDIR%%/upgrade/sql/3.0.0/sqlite3/seahub.sql
>-%%WWWDIR%%/upgrade/sql/3.1.0/mysql/seahub.sql
>-%%WWWDIR%%/upgrade/sql/3.1.0/sqlite3/seahub.sql
>-%%WWWDIR%%/upgrade/upgrade_1.2_1.3.sh
>-%%WWWDIR%%/upgrade/upgrade_1.3_1.4.sh
>-%%WWWDIR%%/upgrade/upgrade_1.4_1.5.sh
>-%%WWWDIR%%/upgrade/upgrade_1.5_1.6.sh
>-%%WWWDIR%%/upgrade/upgrade_1.6_1.7.sh
>-%%WWWDIR%%/upgrade/upgrade_1.7_1.8.sh
>-%%WWWDIR%%/upgrade/upgrade_1.8_2.0.sh
>-%%WWWDIR%%/upgrade/upgrade_2.0_2.1.sh
>-%%WWWDIR%%/upgrade/upgrade_2.1_2.2.sh
>-%%WWWDIR%%/upgrade/upgrade_2.2_3.0.sh
>-%%WWWDIR%%/upgrade/upgrade_3.0_3.1.sh
>+@owner %%SEAFILE_USERNAME%%
>+@group %%SEAFILE_GROUPNAME%%
>+%%WWWDIR%%/seafile-server/check_init_admin.py
>+%%WWWDIR%%/seafile-server/reset-admin.sh
>+%%WWWDIR%%/seafile-server/seaf-cli-wrapper.sh
>+%%WWWDIR%%/seafile-server/seaf-fuse.sh
>+%%WWWDIR%%/seafile-server/seaf-gc.sh
>+%%WWWDIR%%/seafile-server/seafile.sh
>+%%WWWDIR%%/seafile-server/seafile/bin/fileserver
>+%%WWWDIR%%/seafile-server/seafile/bin/seaf-fsck
>+%%WWWDIR%%/seafile-server/seafile/bin/seaf-fuse
>+%%WWWDIR%%/seafile-server/seafile/bin/seaf-migrate
>+%%WWWDIR%%/seafile-server/seafile/bin/seaf-server
>+%%WWWDIR%%/seafile-server/seafile/bin/seaf-server-init
>+%%WWWDIR%%/seafile-server/seafile/bin/seafile-controller
>+%%WWWDIR%%/seafile-server/seafile/bin/seafserv-gc
>+%%WWWDIR%%/seafile-server/seafile/bin/seafserv-tool
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.py
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.pyc
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.pyo
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.py
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyc
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyo
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.py
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyc
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyo
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.py
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.pyc
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.pyo
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.py
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyc
>+%%WWWDIR%%/seafile-server/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyo
>+%%PORTDOCS%%%%WWWDIR%%/seafile-server/seafile/%%DOCSDIR%%/seafile-tutorial.doc
>+%%WWWDIR%%/seafile-server/seahub.sh
>+%%WWWDIR%%/seafile-server/setup-seafile-mysql.py
>+%%WWWDIR%%/seafile-server/setup-seafile-mysql.sh
>+%%WWWDIR%%/seafile-server/setup-seafile.sh
>+%%WWWDIR%%/seafile-server/sqlite2mysql.py
>+%%WWWDIR%%/seafile-server/sqlite2mysql.sh
>+%%WWWDIR%%/seafile-server/upgrade/add_collate.sh
>+%%WWWDIR%%/seafile-server/upgrade/db_update_1.3_1.4.py
>+%%WWWDIR%%/seafile-server/upgrade/db_update_helper.py
>+%%WWWDIR%%/seafile-server/upgrade/minor-upgrade.sh
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.6.0/mysql/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.6.0/sqlite3/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.7.0/mysql/seafile.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.7.0/mysql/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.7.0/sqlite3/seafile.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.7.0/sqlite3/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.8.0/mysql/ccnet.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.8.0/mysql/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/1.8.0/sqlite3/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/2.0.0/mysql/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/2.0.0/sqlite3/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/2.1.0/mysql/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/2.1.0/sqlite3/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/2.2.0/mysql/ccnet.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/3.0.0/mysql/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/3.0.0/sqlite3/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/3.1.0/mysql/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/sql/3.1.0/sqlite3/seahub.sql
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_1.2_1.3.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_1.3_1.4.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_1.4_1.5.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_1.5_1.6.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_1.6_1.7.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_1.7_1.8.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_1.8_2.0.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_2.0_2.1.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_2.1_2.2.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_2.2_3.0.sh
>+%%WWWDIR%%/seafile-server/upgrade/upgrade_3.0_3.1.sh
>+@dir %%WWWDIR%%
>+@dir %%SEAFILE_SERVER%%
>+@dir %%SEAFILE_SERVER%%/seafile
>+@dir %%SEABIN%%
>+@dir %%SEALIB%%
>+@dir %%SEALIB%%/%%PYTHON_VERSION%%
>+@dir %%SEALIB%%/%%PYTHON_VERSION%%/site-packages
>+@dir %%SEALIB%%/%%PYTHON_VERSION%%/site-packages/seafile
>+@dir %%SEALIB%%/%%PYTHON_VERSION%%/site-packages/seaserv
>+@dir %%SEAFILE_SERVER%%/seafile/share
>+@dir %%SEAFILE_SERVER%%/seafile/share/doc
>+@dir %%SEAFILE_SERVER%%/seafile/share/doc/seafile
>+@dir %%SEAFILE_SERVER%%/upgrade
>+@dir %%SEAFILE_SERVER%%/upgrade/sql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.6.0
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.6.0/mysql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.6.0/sqlite3
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.7.0
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.7.0/mysql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.7.0/sqlite3
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.8.0
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.8.0/mysql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/1.8.0/sqlite3
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/2.0.0
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/2.0.0/mysql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/2.0.0/sqlite3
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/2.1.0
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/2.1.0/mysql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/2.1.0/sqlite3
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/2.2.0
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/2.2.0/mysql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/3.0.0
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/3.0.0/mysql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/3.0.0/sqlite3
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/3.1.0
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/3.1.0/mysql
>+@dir %%SEAFILE_SERVER%%/upgrade/sql/3.1.0/sqlite3
>+@owner
>+@group

Actions: View | Diff

Attachments on bug 196922: 151883 | 152228 | 152229 | 152230 | 152772 | 152774 | 153355 | 153356