Date: Mon, 26 Dec 2016 14:56:02 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429530 - in head: . net-mgmt net-mgmt/seafile net-mgmt/seafile-client net-mgmt/seafile-client/files net-mgmt/seafile-gui Message-ID: <201612261456.uBQEu21O054268@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Mon Dec 26 14:56:02 2016 New Revision: 429530 URL: https://svnweb.freebsd.org/changeset/ports/429530 Log: Move net-mgmt/seafile to net-mgmt/seafile-client, update to version 6.0.1 PR: 215360 Submitted by: Ultima1252@gmail.com (maintainer of net-mgmt/seafile) Added: head/net-mgmt/seafile-client/ - copied from r429529, head/net-mgmt/seafile/ Deleted: head/net-mgmt/seafile/ head/net-mgmt/seafile-client/files/patch-daemon_repo-mgr.c head/net-mgmt/seafile-client/files/pkg-message.in head/net-mgmt/seafile-client/files/seafile.in Modified: head/MOVED head/net-mgmt/Makefile head/net-mgmt/seafile-client/Makefile head/net-mgmt/seafile-client/distinfo head/net-mgmt/seafile-client/files/patch-daemon_vc-utils.c head/net-mgmt/seafile-client/pkg-plist head/net-mgmt/seafile-gui/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Dec 26 14:44:33 2016 (r429529) +++ head/MOVED Mon Dec 26 14:56:02 2016 (r429530) @@ -8849,3 +8849,4 @@ www/py33-requests|www/py3-requests|2016- www/py34-requests|www/py3-requests|2016-12-26|No need for 4 versions of py-requests www/py35-requests|www/py3-requests|2016-12-26|No need for 4 versions of py-requests net-mgmt/ccnet|net-mgmt/ccnet-client|2016-12-26|Split into -client and -server parts +net-mgmt/seafile|net-mgmt/seafile-client|2016-12-26|Split into -client and -server parts Modified: head/net-mgmt/Makefile ============================================================================== --- head/net-mgmt/Makefile Mon Dec 26 14:44:33 2016 (r429529) +++ head/net-mgmt/Makefile Mon Dec 26 14:56:02 2016 (r429530) @@ -304,7 +304,7 @@ SUBDIR += sblim-wbemcli SUBDIR += scli SUBDIR += sdig - SUBDIR += seafile + SUBDIR += seafile-client SUBDIR += seafile-gui SUBDIR += seafile-server SUBDIR += send Modified: head/net-mgmt/seafile-client/Makefile ============================================================================== --- head/net-mgmt/seafile/Makefile Mon Dec 26 14:44:33 2016 (r429529) +++ head/net-mgmt/seafile-client/Makefile Mon Dec 26 14:56:02 2016 (r429530) @@ -1,14 +1,12 @@ # $FreeBSD$ -PORTNAME= seafile -PORTVERSION= 6.0.0 -PORTREVISION= 1 +PORTNAME= seafile-client +PORTVERSION= 6.0.1 DISTVERSIONPREFIX= v -DISTVERSIONSUFFIX= -server CATEGORIES= net-mgmt MAINTAINER= ultima1252@gmail.com -COMMENT= Open Source Cloud Storage (Server) +COMMENT= Open Source Cloud Storage (Client) LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt @@ -19,7 +17,7 @@ LIB_DEPENDS= libsearpc.so:devel/libsearp libzdb.so:databases/libzdb \ libcurl.so:ftp/curl \ libinotify.so:devel/libinotify \ - libccnet.so:net-mgmt/ccnet \ + libccnet.so:net-mgmt/ccnet-client \ libevent.so:devel/libevent2 \ libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson @@ -31,6 +29,7 @@ CONFLICTS= seafile-server-[0-9]* USE_GITHUB= yes GH_ACCOUNT= haiwen +GH_PROJECT= seafile USES= autoreconf gettext iconv libarchive libtool mysql pathfix \ pkgconfig python:-2.7 shebangfix sqlite ssl @@ -43,34 +42,10 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" -CONFIGURE_ARGS= --enable-server 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= ${PORTNAME} -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 RIAK OPTIONS_SUB= yes @@ -99,36 +74,5 @@ post-patch: ${WRKSRC}/scripts/seaf-cli-wrapper.sh ${REINPLACE_CMD} 's/<evhtp.h>/<evhtp\/evhtp.h>/' ${WRKSRC}/server/upload-file.c \ ${WRKSRC}/server/access-file.c ${WRKSRC}/server/http-server.c -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${SEABIN} ${STAGEDIR}${PREFIX}/${SEALIB} \ - ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/seafile/share/doc/seafile \ - ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/upgrade -.for SERVPROG in seaf-fsck seafserv-gc seaf-fuse seaf-migrate \ - seaf-server seaf-server-init seafile-controller - if [ -e "${STAGEDIR}${PREFIX}/bin/${SERVPROG}" ]; then \ - ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/${SERVPROG} ${STAGEDIR}${PREFIX}/${SEABIN}; \ - ${RM} ${STAGEDIR}${PREFIX}/bin/${SERVPROG}; \ - fi -.endfor -.for SERVPROG in seafile-controller seaf-server - ${LN} -s ${PREFIX}/${SEABIN}/${SERVPROG} ${STAGEDIR}${PREFIX}/bin/ -.endfor - - ${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/bin/seaf-cli ${STAGEDIR}${PREFIX}/${SEABIN}/seaf-cli.py - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/seaf-cli-wrapper.sh ${STAGEDIR}${PREFIX}/bin/seaf-cli - (cd ${STAGEDIR}${PREFIX}/lib && \ - ${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB}) - @${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} \ - ${WRKSRC}/scripts/seaf-cli-wrapper.sh \ - ${WRKSRC}/scripts/sqlite2mysql.[ps][yh] \ - ${WRKSRC}/scripts/setup-seafile.sh \ - ${STAGEDIR}${PREFIX}/bin/seafile-admin - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][yh] ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER} - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/upgrade/*.[ps][yh] \ - ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/upgrade - ${INSTALL_DATA} ${WRKSRC}/doc/seafile-tutorial.doc \ - ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/seafile/share/doc/seafile/ - (cd ${WRKSRC}/scripts/upgrade && \ - ${COPYTREE_SHARE} sql ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/upgrade) .include <bsd.port.mk> Modified: head/net-mgmt/seafile-client/distinfo ============================================================================== --- head/net-mgmt/seafile/distinfo Mon Dec 26 14:44:33 2016 (r429529) +++ head/net-mgmt/seafile-client/distinfo Mon Dec 26 14:56:02 2016 (r429530) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470238743 -SHA256 (haiwen-seafile-v6.0.0-server_GH0.tar.gz) = 778b4248c6596f25d337ea18b9422eeb6950c9b86456ac535c0f7c2fd5e8148f -SIZE (haiwen-seafile-v6.0.0-server_GH0.tar.gz) = 1149598 +TIMESTAMP = 1481772891 +SHA256 (haiwen-seafile-v6.0.1_GH0.tar.gz) = c212833ff21af19554d216ab3f5c01c3a5878d4bd30b4f71c67ec9b71416a095 +SIZE (haiwen-seafile-v6.0.1_GH0.tar.gz) = 1154256 Modified: head/net-mgmt/seafile-client/files/patch-daemon_vc-utils.c ============================================================================== --- head/net-mgmt/seafile/files/patch-daemon_vc-utils.c Mon Dec 26 14:44:33 2016 (r429529) +++ head/net-mgmt/seafile-client/files/patch-daemon_vc-utils.c Mon Dec 26 14:56:02 2016 (r429530) @@ -1,15 +1,6 @@ ---- daemon/vc-utils.c.orig 2016-04-05 08:38:26 UTC +--- daemon/vc-utils.c.orig 2016-12-03 06:02:47 UTC +++ daemon/vc-utils.c -@@ -664,7 +664,7 @@ error: - - #endif /* defined WIN32 || defined __APPLE__ */ - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) - - char * - build_checkout_path (const char *worktree, const char *ce_name, int len) -@@ -724,7 +724,7 @@ checkout_entry (struct cache_entry *ce, +@@ -736,7 +736,7 @@ checkout_entry (struct cache_entry *ce, gboolean force_conflict = FALSE; path_in = g_build_path ("/", o->base, ce->name, NULL); Modified: head/net-mgmt/seafile-client/pkg-plist ============================================================================== --- head/net-mgmt/seafile/pkg-plist Mon Dec 26 14:44:33 2016 (r429529) +++ head/net-mgmt/seafile-client/pkg-plist Mon Dec 26 14:56:02 2016 (r429530) @@ -1,7 +1,5 @@ bin/seaf-cli bin/seaf-daemon -bin/seafile-controller -bin/seaf-server include/seafile/monitor-rpc.h include/seafile/seafile-object.h include/seafile/seafile-rpc.h @@ -10,104 +8,21 @@ 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/seaf-cli.1.gz man/man1/seaf-daemon.1.gz -%%SEAFILE_SERVER%%/check_init_admin.py -%%SEAFILE_SERVER%%/reset-admin.sh -%%SEAFILE_SERVER%%/seaf-fuse.sh -%%SEAFILE_SERVER%%/seaf-gc.sh -%%SEAFILE_SERVER%%/seafile.sh -%%SEAFILE_SERVER%%/seafile/bin/seaf-fsck -%%FUSE%%%%SEAFILE_SERVER%%/seafile/bin/seaf-fuse -%%SEAFILE_SERVER%%/seafile/bin/seaf-cli.py -%%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/%%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%%/breakpad.py -%%SEAFILE_SERVER%%/seahub.sh -%%SEAFILE_SERVER%%/setup-seafile-mysql.py -%%SEAFILE_SERVER%%/setup-seafile-mysql.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/regenerate_secret_key.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/sql/4.1.0/mysql/ccnet.sql -%%SEAFILE_SERVER%%/upgrade/sql/4.1.0/mysql/seafile.sql -%%SEAFILE_SERVER%%/upgrade/sql/4.1.0/sqlite3/ccnet/groupmgr.sql -%%SEAFILE_SERVER%%/upgrade/sql/4.1.0/sqlite3/seafile.sql -%%SEAFILE_SERVER%%/upgrade/sql/4.2.0/mysql/seafile.sql -%%SEAFILE_SERVER%%/upgrade/sql/4.2.0/mysql/seahub.sql -%%SEAFILE_SERVER%%/upgrade/sql/4.2.0/sqlite3/seafile.sql -%%SEAFILE_SERVER%%/upgrade/sql/4.2.0/sqlite3/seahub.sql -%%SEAFILE_SERVER%%/upgrade/sql/4.3.0/mysql/.gitkeep -%%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/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 -%%SEAFILE_SERVER%%/upgrade/upgrade_3.1_4.0.sh -%%SEAFILE_SERVER%%/upgrade/upgrade_4.0_4.1.sh -%%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 -@dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%% Modified: head/net-mgmt/seafile-gui/Makefile ============================================================================== --- head/net-mgmt/seafile-gui/Makefile Mon Dec 26 14:44:33 2016 (r429529) +++ head/net-mgmt/seafile-gui/Makefile Mon Dec 26 14:56:02 2016 (r429530) @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libglib-2.0.so:devel/glib20 \ libsearpc.so:devel/libsearpc \ - libseafile.so:net-mgmt/seafile \ + libseafile.so:net-mgmt/seafile-client \ libsqlite3.so:databases/sqlite3 \ libccnet.so:net-mgmt/ccnet-client \ libjansson.so:devel/jansson \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612261456.uBQEu21O054268>