net-mgmt/seafile: relocate python files

PR:		196922
Submitted by:	maintainer (JingFeng Yan)

2 files changed, 99 insertions, 91 deletions

diff --git a/net-mgmt/seafile/Makefile b/net-mgmt/seafile/Makefile
index ba674a39d481..65dbca0d28c7 100644
--- a/net-mgmt/seafile/Makefile
+++ b/net-mgmt/seafile/Makefile
@@ -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 @@ LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/devel/libsearpc \
 		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_TAGNAME=	v3.1.4
 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,22 @@ PATHFIX_MAKEFILEIN=	Makefile.am
 
 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
 
+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}
+
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		FUSE RIAK
@@ -63,21 +75,25 @@ OPTIONS_DEFAULT=
 .endif
 
 post-install:
-	@${MKDIR} ${SEABIN} \
-		${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile \
-		${STAGEDIR}${WWWDIR}/upgrade
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SEABIN} ${STAGEDIR}${PREFIX}/${SEALIB}\
+		${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/seafile/share/doc/seafile \
+		${STAGEDIR}${PREFIX}/${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}${PREFIX}/${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}${PREFIX}/${SEALIB})
+	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][yh] ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/upgrade/*.[ps][yh] \
-		${STAGEDIR}${WWWDIR}/upgrade
+		${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/upgrade
 	${INSTALL_DATA} ${WRKSRC}/doc/seafile-tutorial.doc \
-		${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile/
+		${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/seafile/share/doc/seafile/
 	(cd ${WRKSRC}/scripts/upgrade && \
-		${COPYTREE_SHARE} sql ${STAGEDIR}${WWWDIR}/upgrade)
+		${COPYTREE_SHARE} sql ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/upgrade)
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/seafile/pkg-plist b/net-mgmt/seafile/pkg-plist
index d65a8b017f80..7488e9d9feec 100644
--- a/net-mgmt/seafile/pkg-plist
+++ b/net-mgmt/seafile/pkg-plist
@@ -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,79 @@ lib/libseafile.a
 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
+%%SEAFILE_SERVER%%/check_init_admin.py
+%%SEAFILE_SERVER%%/reset-admin.sh
+%%SEAFILE_SERVER%%/seaf-cli-wrapper.sh
+%%SEAFILE_SERVER%%/seaf-fuse.sh
+%%SEAFILE_SERVER%%/seaf-gc.sh
+%%SEAFILE_SERVER%%/seafile.sh
+%%SEAFILE_SERVER%%/seafile/bin/fileserver
+%%SEAFILE_SERVER%%/seafile/bin/seaf-fsck
+%%SEAFILE_SERVER%%/seafile/bin/seaf-fuse
+%%SEAFILE_SERVER%%/seafile/bin/seaf-migrate
+%%SEAFILE_SERVER%%/seafile/bin/seaf-server
+%%SEAFILE_SERVER%%/seafile/bin/seaf-server-init
+%%SEAFILE_SERVER%%/seafile/bin/seafile-controller
+%%SEAFILE_SERVER%%/seafile/bin/seafserv-gc
+%%SEAFILE_SERVER%%/seafile/bin/seafserv-tool
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.py
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.pyo
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.py
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyo
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.py
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyo
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.py
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.pyo
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.py
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyo
+%%PORTDOCS%%%%SEAFILE_SERVER%%/seafile/%%DOCSDIR%%/seafile-tutorial.doc
+%%SEAFILE_SERVER%%/seahub.sh
+%%SEAFILE_SERVER%%/setup-seafile-mysql.py
+%%SEAFILE_SERVER%%/setup-seafile-mysql.sh
+%%SEAFILE_SERVER%%/setup-seafile.sh
+%%SEAFILE_SERVER%%/sqlite2mysql.py
+%%SEAFILE_SERVER%%/sqlite2mysql.sh
+%%SEAFILE_SERVER%%/upgrade/add_collate.sh
+%%SEAFILE_SERVER%%/upgrade/db_update_1.3_1.4.py
+%%SEAFILE_SERVER%%/upgrade/db_update_helper.py
+%%SEAFILE_SERVER%%/upgrade/minor-upgrade.sh
+%%SEAFILE_SERVER%%/upgrade/sql/1.6.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/1.6.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/1.7.0/mysql/seafile.sql
+%%SEAFILE_SERVER%%/upgrade/sql/1.7.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/1.7.0/sqlite3/seafile.sql
+%%SEAFILE_SERVER%%/upgrade/sql/1.7.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/1.8.0/mysql/ccnet.sql
+%%SEAFILE_SERVER%%/upgrade/sql/1.8.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/1.8.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/2.0.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/2.0.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/2.1.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/2.1.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/2.2.0/mysql/ccnet.sql
+%%SEAFILE_SERVER%%/upgrade/sql/3.0.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/3.0.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/3.1.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/3.1.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/upgrade_1.2_1.3.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_1.3_1.4.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_1.4_1.5.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_1.5_1.6.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_1.6_1.7.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_1.7_1.8.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_1.8_2.0.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_2.0_2.1.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_2.1_2.2.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_2.2_3.0.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_3.0_3.1.sh
+@dir(%%SEAFILE_USERNAME%%,%%SEAFILE_GROUPNAME%%,755) %%HAIWENDIR%%