4 files changed, 55 insertions, 45 deletions

diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
index 06a33d5099ae..3c81b5a92b13 100644
--- a/net-mgmt/seafile-server/Makefile
+++ b/net-mgmt/seafile-server/Makefile
@@ -46,27 +46,10 @@ INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/evhtp
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-HAIWENDIR=	www/haiwen
-SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
-SEABIN=		${SEAFILE_SERVER}/seafile/bin
-SEALIB=		${SEAFILE_SERVER}/seafile/lib
-
-USERS=		seafile
-GROUPS=		${USERS}
-
 USE_RC_SUBR=	seafile
-PLIST_SUB=	USERS=${USERS} \
-		GROUPS=${GROUPS} \
-		SEAFILE_SERVER=${SEAFILE_SERVER} \
-		HAIWENDIR=${HAIWENDIR}
 
 SUB_FILES=	pkg-message
 
-SUB_LIST+=	USERS=${USERS} \
-		GROUPS=${GROUPS} \
-		SEAFILE_SERVER=${SEAFILE_SERVER} \
-		HAIWENDIR=${HAIWENDIR}
-
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		FUSE
diff --git a/net-mgmt/seafile-server/Makefile.include b/net-mgmt/seafile-server/Makefile.include
index 93710439b9cf..add8c6f3b901 100644
--- a/net-mgmt/seafile-server/Makefile.include
+++ b/net-mgmt/seafile-server/Makefile.include
@@ -1,3 +1,30 @@
 # $FreeBSD$
 
-SEAFILE_VER=6.0.9
+SEAFILE_VER=6.0.10
+SEAHUB_VER=6.0.13
+
+
+# Various vars used in most/all the Makefiles
+HAIWENDIR=	www/haiwen
+SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
+SEAHUBDIR=	${SEAFILE_SERVER}/seahub
+SEABIN=		${SEAFILE_SERVER}/seafile/bin
+SEALIB=		${SEAFILE_SERVER}/seafile/lib
+SITEPACKAGEDIR=	${SEAHUBDIR}/thirdpart
+SEAHUB_DATA_DIR=	${HAIWENDIR}/seahub-data
+
+USERS=		seafile
+GROUPS=		${USERS}
+
+PLIST_SUB+=	USERS=${USERS} \
+		GROUPS=${GROUPS} \
+		SEAFILE_SERVER=${SEAFILE_SERVER} \
+		SEAHUBDIR=${SEAHUBDIR} \
+		HAIWENDIR=${HAIWENDIR} \
+		SITEPACKAGEDIR=${SITEPACKAGEDIR}
+
+SUB_LIST+=	USERS=${USERS} \
+		GROUPS=${GROUPS} \
+		SEAFILE_SERVER=${SEAFILE_SERVER} \
+		HAIWENDIR=${HAIWENDIR} \
+		PYTHON=${PYTHON_VERSION}
diff --git a/net-mgmt/seafile-server/distinfo b/net-mgmt/seafile-server/distinfo
index 7e9730886495..3379755ab0d4 100644
--- a/net-mgmt/seafile-server/distinfo
+++ b/net-mgmt/seafile-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490929086
-SHA256 (haiwen-seafile-server-v6.0.9-server_GH0.tar.gz) = 2ccd7ed40ac61b013659b2ed75669510c87440c4f562d2cb67a807346e66ce93
-SIZE (haiwen-seafile-server-v6.0.9-server_GH0.tar.gz) = 695210
+TIMESTAMP = 1492228562
+SHA256 (haiwen-seafile-server-v6.0.10-server_GH0.tar.gz) = 7e6a8ebaa4b2b40c2854fbe9fd6608d24a219318be1271dd00603ebbb4fe90c1
+SIZE (haiwen-seafile-server-v6.0.10-server_GH0.tar.gz) = 695741
diff --git a/net-mgmt/seafile-server/pkg-plist b/net-mgmt/seafile-server/pkg-plist
index 5b31af71d924..abde6745d1e1 100644
--- a/net-mgmt/seafile-server/pkg-plist
+++ b/net-mgmt/seafile-server/pkg-plist
@@ -1,11 +1,13 @@
-bin/seafile-controller
 bin/seaf-server
+bin/seafile-controller
 include/seafile/seafile-object.h
 libdata/pkgconfig/libseafile.pc
-%%SEAFILE_SERVER%%/seaf-cli-wrapper.sh
+%%SEAFILE_SERVER%%/breakpad.py
 %%SEAFILE_SERVER%%/check_init_admin.py
 %%SEAFILE_SERVER%%/migrate-to-ceph.sh
 %%SEAFILE_SERVER%%/reset-admin.sh
+%%SEAFILE_SERVER%%/seaf-cli-wrapper.sh
+%%SEAFILE_SERVER%%/seaf-fsck.sh
 %%SEAFILE_SERVER%%/seaf-fuse.sh
 %%SEAFILE_SERVER%%/seaf-gc.sh
 %%SEAFILE_SERVER%%/seafile.sh
@@ -18,34 +20,32 @@ libdata/pkgconfig/libseafile.pc
 %%SEAFILE_SERVER%%/seafile/bin/seafserv-gc
 %%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/__init__.%%PYTHON_PYOEXTENSION%%
 %%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%%/seafile/rpcclient.%%PYTHON_PYOEXTENSION%%
 %%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/__init__.%%PYTHON_PYOEXTENSION%%
 %%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/api.%%PYTHON_PYOEXTENSION%%
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.py
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyo
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.%%PYTHON_PYOEXTENSION%%
 %%SEAFILE_SERVER%%/seafile/share/doc/seafile/seafile-tutorial.doc
-%%SEAFILE_SERVER%%/breakpad.py
 %%SEAFILE_SERVER%%/seafobj_migrate.py
-%%SEAFILE_SERVER%%/seahub.sh
-%%SEAFILE_SERVER%%/setup-seafile.sh
+%%SEAHUBDIR%%.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%%/seaf-fsck.sh
 %%SEAFILE_SERVER%%/upgrade/fix_mysql_user.py
+%%SEAFILE_SERVER%%/upgrade/minor-upgrade.sh
 %%SEAFILE_SERVER%%/upgrade/regenerate_secret_key.sh
 %%SEAFILE_SERVER%%/upgrade/sql/1.6.0/mysql/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/sql/1.6.0/sqlite3/seahub.sql
@@ -61,8 +61,8 @@ libdata/pkgconfig/libseafile.pc
 %%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/%%GTK3_VERSION%%/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/%%GTK3_VERSION%%/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/sql/4.1.0/mysql/ccnet.sql
@@ -77,6 +77,14 @@ libdata/pkgconfig/libseafile.pc
 %%SEAFILE_SERVER%%/upgrade/sql/4.3.0/sqlite3/.gitkeep
 %%SEAFILE_SERVER%%/upgrade/sql/4.4.0/mysql/.gitkeep
 %%SEAFILE_SERVER%%/upgrade/sql/4.4.0/sqlite3/.gitkeep
+%%SEAFILE_SERVER%%/upgrade/sql/5.0.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/5.0.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/5.1.0/mysql/seafile.sql
+%%SEAFILE_SERVER%%/upgrade/sql/5.1.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/5.1.0/sqlite3/seafile.sql
+%%SEAFILE_SERVER%%/upgrade/sql/5.1.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.0.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.0.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
@@ -93,15 +101,7 @@ libdata/pkgconfig/libseafile.pc
 %%SEAFILE_SERVER%%/upgrade/upgrade_4.1_4.2.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_4.2_4.3.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_4.3_4.4.sh
-%%SEAFILE_SERVER%%/upgrade/sql/5.0.0/mysql/seahub.sql
-%%SEAFILE_SERVER%%/upgrade/sql/5.0.0/sqlite3/seahub.sql
-%%SEAFILE_SERVER%%/upgrade/sql/5.1.0/mysql/seafile.sql
-%%SEAFILE_SERVER%%/upgrade/sql/5.1.0/mysql/seahub.sql
-%%SEAFILE_SERVER%%/upgrade/sql/5.1.0/sqlite3/seafile.sql
-%%SEAFILE_SERVER%%/upgrade/sql/5.1.0/sqlite3/seahub.sql
-%%SEAFILE_SERVER%%/upgrade/sql/6.0.0/mysql/seahub.sql
-%%SEAFILE_SERVER%%/upgrade/sql/6.0.0/sqlite3/seahub.sql
-%%SEAFILE_SERVER%%/upgrade/upgrade_5.1_6.0.sh
-%%SEAFILE_SERVER%%/upgrade/upgrade_5.0_5.1.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_4.4_5.0.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_5.0_5.1.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_5.1_6.0.sh
 @dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%