Index: head/net-mgmt/seafile-server/Makefile =================================================================== --- head/net-mgmt/seafile-server/Makefile (revision 429976) +++ head/net-mgmt/seafile-server/Makefile (revision 429977) @@ -1,125 +1,125 @@ # $FreeBSD$ PORTNAME= seafile-server -PORTVERSION= 6.0.6 +PORTVERSION= 6.0.7 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -server CATEGORIES= net-mgmt MAINTAINER= ultima1252@gmail.com COMMENT= Open Source Cloud Storage (Server) LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libevhtp.so:www/libevhtp \ libzdb.so:databases/libzdb \ libcurl.so:ftp/curl \ libinotify.so:devel/libinotify \ libccnet.so:net-mgmt/ccnet-server \ libevent.so:devel/libevent2 \ libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 \ bash:shells/bash CONFLICTS= seafile-[0-9]* USE_GITHUB= yes GH_ACCOUNT= haiwen USES= autoreconf gettext iconv libarchive libtool mysql pathfix \ pgsql pkgconfig python:-2.7 shebangfix sqlite ssl USE_GNOME= glib20 SHEBANG_FILES= scripts/*.sh scripts/upgrade/*.sh *.sh scripts/build/*.py \ scripts/*.py scripts/upgrade/*.py tools/seafile-admin GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" PATHFIX_MAKEFILEIN= Makefile.am 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 OPTIONS_SUB= yes FUSE_DESC= Use file system in userspace FUSE_CONFIGURE_ENABLE= fuse FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs OPTIONS_DEFAULT= FUSE OPTIONS_EXCLUDE_DragonFly= FUSE .include post-patch: # Fix P_KTHREAD r295435 .if ${OSVERSION} >= 1100097 ${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c .endif ${REINPLACE_CMD} 's/python/${PYTHON_VERSION}/' \ ${WRKSRC}/scripts/upgrade/regenerate_secret_key.sh ${REINPLACE_CMD} -e 's|^INSTALL.*|INSTALLPATH="${PREFIX}/${SEAFILE_SERVER}/seafile"|' \ ${WRKSRC}/scripts/seaf-cli-wrapper.sh ${REINPLACE_CMD} 's///' ${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 (cd ${STAGEDIR}${PREFIX}/lib && \ ${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB}) @${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} \ ${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 Index: head/net-mgmt/seafile-server/distinfo =================================================================== --- head/net-mgmt/seafile-server/distinfo (revision 429976) +++ head/net-mgmt/seafile-server/distinfo (revision 429977) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481476699 -SHA256 (haiwen-seafile-server-v6.0.6-server_GH0.tar.gz) = 3fa98cb16a7ada6468bffff87dba855501365d0be9c2c10201e8d31412538e3e -SIZE (haiwen-seafile-server-v6.0.6-server_GH0.tar.gz) = 695521 +TIMESTAMP = 1482959890 +SHA256 (haiwen-seafile-server-v6.0.7-server_GH0.tar.gz) = 56bcbc621a7c891d2d5ccde09efebcad797fb3b9d049e108678a8c836304d7d0 +SIZE (haiwen-seafile-server-v6.0.7-server_GH0.tar.gz) = 695733 Index: head/net-mgmt/seafile-server/files/patch-configure.ac =================================================================== --- head/net-mgmt/seafile-server/files/patch-configure.ac (revision 429976) +++ head/net-mgmt/seafile-server/files/patch-configure.ac (revision 429977) @@ -1,119 +1,119 @@ ---- configure.ac.orig 2016-10-09 09:30:49 UTC +--- configure.ac.orig 2016-12-27 07:02:58 UTC +++ configure.ac @@ -51,8 +51,16 @@ else AC_MSG_RESULT(no) fi +AC_MSG_CHECKING(for BSD) +if test `uname | grep -e BSD -e DragonFly | wc -l` = "1"; then + bbsd=true + AC_MSG_RESULT(compile in BSD) +else + AC_MSG_RESULT(no) +fi + AC_MSG_CHECKING(for Linux) -if test "$bmac" != "true" -a "$bwin32" != "true"; then +if test "$bmac" != "true" -a "$bwin32" != "true" -a "$bbsd" != "true"; then blinux=true AC_MSG_RESULT(compile in linux) else @@ -78,6 +86,11 @@ if test "$bwin32" != true; then [compile_fuse=$enableval],[compile_fuse="yes"]) fi +if test "$bbsd" = true; then + AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable fuse virtual file system]), + [compile_fuse=$enableval],[compile_fuse="no"]) +fi + AC_ARG_ENABLE(python, - AC_HELP_STRING([--enable-python],[build ccnet python binding]), + AC_HELP_STRING([--enable-python],[build seafile python binding]), [compile_python=$enableval], @@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${ AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"]) AM_CONDITIONAL([MACOS], [test "$bmac" = "true"]) +AM_CONDITIONAL([BSD], [test "$bbsd" = "true"]) AM_CONDITIONAL([LINUX], [test "$blinux" = "true"]) @@ -134,6 +148,9 @@ if test "$bwin32" = true; then LIB_MAC= MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601" LIB_CRYPT32=-lcrypt32 + ZLIB_LIBS= + LIB_INOTIFY= + LIB_KVM= + LIB_ICONV=-liconv elif test "$bmac" = true ; then LIB_WS32= - LIB_GDI32= -@@ -148,6 +165,26 @@ elif test "$bmac" = true ; then +@@ -149,6 +166,26 @@ elif test "$bmac" = true ; then LIB_MAC="-framework CoreServices" LIB_CRYPT32= LIB_ICONV=-liconv + ZLIB_LIBS= + LIB_INOTIFY= + LIB_KVM= +elif test "$bbsd" = true ; then + LIB_WS32= + LIB_GDI32= + LIB_RT= + LIB_INTL= + LIB_RESOLV= + LIB_UUID=-luuid + LIB_IPHLPAPI= + LIB_SHELL32= + LIB_PSAPI= + LIB_MAC= + MSVC_CFLAGS= + LIB_CRYPT32= + LIB_ICONV=-liconv + ZLIB_LIBS=-lz + LIB_INOTIFY=-linotify + LIB_KVM=-lkvm else LIB_WS32= LIB_GDI32= -@@ -161,6 +198,9 @@ else +@@ -162,6 +199,9 @@ else LIB_MAC= MSVC_CFLAGS= LIB_CRYPT32= + ZLIB_LIBS=-lz + LIB_INOTIFY=-linotify + LIB_KVM= fi AC_SUBST(LIB_WS32) -@@ -173,6 +213,9 @@ AC_SUBST(LIB_IPHLPAPI) +@@ -174,6 +214,9 @@ AC_SUBST(LIB_IPHLPAPI) AC_SUBST(LIB_SHELL32) AC_SUBST(LIB_PSAPI) AC_SUBST(LIB_MAC) +AC_SUBST(ZLIB_LIBS) +AC_SUBST(LIB_INOTIFY) +AC_SUBST(LIB_KVM) AC_SUBST(MSVC_CFLAGS) AC_SUBST(LIB_CRYPT32) AC_SUBST(LIB_ICONV) -@@ -187,7 +230,9 @@ ZDB_REQUIRED=2.10 +@@ -188,7 +231,9 @@ ZDB_REQUIRED=2.10 #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 CURL_REQUIRED=7.17 FUSE_REQUIRED=2.7.3 +if test "$blinux" = true ; then ZLIB_REQUIRED=1.2.0 +fi PKG_CHECK_MODULES(SSL, [openssl]) AC_SUBST(SSL_CFLAGS) -@@ -217,9 +262,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= +@@ -218,9 +263,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= AC_SUBST(LIBEVENT_CFLAGS) AC_SUBST(LIBEVENT_LIBS) +if test "$blinux" = true ; then PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED]) AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) +fi if test x${compile_python} = xyes; then - AM_PATH_PYTHON([2.6]) + AM_PATH_PYTHON([2.6])