Index: head/net-mgmt/ccnet-client/Makefile =================================================================== --- head/net-mgmt/ccnet-client/Makefile (revision 448016) +++ head/net-mgmt/ccnet-client/Makefile (revision 448017) @@ -1,40 +1,43 @@ # $FreeBSD$ PORTNAME= ccnet-client -PORTVERSION= ${SEAFILE_CLIENT_VER} DISTVERSIONPREFIX= v -PORTREVISION= 1 +DISTVERSION= ${SEAFILE_CLIENT_VER} CATEGORIES= net-mgmt devel MAINTAINER= ultima@FreeBSD.org COMMENT= Framework for writing networked applications LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libsqlite3.so:databases/sqlite3 \ libzdb.so:databases/libzdb \ libuuid.so:misc/e2fsprogs-libuuid \ libevent.so:devel/libevent \ libjansson.so:devel/jansson -CONFLICTS= ccnet-server-[0-9]* - -USES= autoreconf gettext libtool localbase pathfix pkgconfig \ +USES= autoreconf libtool localbase pathfix pkgconfig \ python:-2.7 ssl USE_GNOME= glib20 USE_LDCONFIG= yes USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= haiwen GH_PROJECT= ccnet +CONFLICTS= ccnet-server-[0-9]* + CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" GNU_CONFIGURE= yes INSTALL_TARGET= install-strip + +OPTIONS_DEFINE= NLS + +NLS_USES= gettext .include "${.CURDIR}/../seafile-client/Makefile.include" .include Index: head/net-mgmt/ccnet-client/distinfo =================================================================== --- head/net-mgmt/ccnet-client/distinfo (revision 448016) +++ head/net-mgmt/ccnet-client/distinfo (revision 448017) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498237201 -SHA256 (haiwen-ccnet-v6.0.7_GH0.tar.gz) = c4e02b5b77d774ffaa47235e6e265ecce00f656766a2f232397ce86eeb3162fa -SIZE (haiwen-ccnet-v6.0.7_GH0.tar.gz) = 179356 +TIMESTAMP = 1502838537 +SHA256 (haiwen-ccnet-v6.1.0_GH0.tar.gz) = 6b91c1a1a00622a2a07669dae144dd7fcd8f11275912384aa65d33da05088a60 +SIZE (haiwen-ccnet-v6.1.0_GH0.tar.gz) = 179362 Index: head/net-mgmt/seafile-client/Makefile =================================================================== --- head/net-mgmt/seafile-client/Makefile (revision 448016) +++ head/net-mgmt/seafile-client/Makefile (revision 448017) @@ -1,61 +1,66 @@ # $FreeBSD$ PORTNAME= seafile-client -PORTVERSION= ${SEAFILE_CLIENT_VER} DISTVERSIONPREFIX= v +DISTVERSION= ${SEAFILE_CLIENT_VER} CATEGORIES= net-mgmt MAINTAINER= ultima@FreeBSD.org COMMENT= Open Source Cloud Storage (Client) 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-client \ libevent.so:devel/libevent \ 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-server-[0-9]* - +USES= autoreconf iconv libarchive libtool localbase mysql \ + pathfix pkgconfig python:-2.7 shebangfix sqlite ssl USE_GITHUB= yes GH_ACCOUNT= haiwen GH_PROJECT= seafile -USES= autoreconf gettext iconv libarchive libtool mysql pathfix \ - pkgconfig python:-2.7 shebangfix sqlite ssl USE_GNOME= glib20 +USE_LDCONFIG= yes + +CONFLICTS= seafile-server-[0-9]* + SHEBANG_FILES= *.sh scripts/*.sh app/seaf-cli integration-tests/*.sh + GNU_CONFIGURE= yes -USE_LDCONFIG= yes CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" +CPPFLAGS+= -I${LOCALBASE}/include/evhtp INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/evhtp -LDFLAGS+= -L${LOCALBASE}/lib + +OPTIONS_DEFINE= NLS + +NLS_USES= gettext .include post-patch: # Fix P_KTHREAD r295435 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100097 ${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c .endif makesum-all: .for PORT in net-mgmt/ccnet-client net-mgmt/seafile-client net-mgmt/seafile-gui ${MAKE} -C "${PORTSDIR}/${PORT}" makesum .endfor .include "${.CURDIR}/Makefile.include" .include Index: head/net-mgmt/seafile-client/Makefile.include =================================================================== --- head/net-mgmt/seafile-client/Makefile.include (revision 448016) +++ head/net-mgmt/seafile-client/Makefile.include (revision 448017) @@ -1,3 +1,3 @@ # $FreeBSD$ -SEAFILE_CLIENT_VER=6.0.7 +SEAFILE_CLIENT_VER=6.1.0 Index: head/net-mgmt/seafile-client/distinfo =================================================================== --- head/net-mgmt/seafile-client/distinfo (revision 448016) +++ head/net-mgmt/seafile-client/distinfo (revision 448017) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498237202 -SHA256 (haiwen-seafile-v6.0.7_GH0.tar.gz) = e563eade01330bf679f3e6b9f0202b198170cdd8ec80642d9fb670b3a5cda793 -SIZE (haiwen-seafile-v6.0.7_GH0.tar.gz) = 823384 +TIMESTAMP = 1502838102 +SHA256 (haiwen-seafile-v6.1.0_GH0.tar.gz) = 06871c6b2ecf27c5c87329b5be03b5aba37cf7c6a4cc81867d3d8451c4ecfb0f +SIZE (haiwen-seafile-v6.1.0_GH0.tar.gz) = 823289 Index: head/net-mgmt/seafile-gui/Makefile =================================================================== --- head/net-mgmt/seafile-gui/Makefile (revision 448016) +++ head/net-mgmt/seafile-gui/Makefile (revision 448017) @@ -1,44 +1,47 @@ # $FreeBSD$ PORTNAME= seafile-gui -PORTVERSION= ${SEAFILE_CLIENT_VER} DISTVERSIONPREFIX= v +DISTVERSION= ${SEAFILE_CLIENT_VER} CATEGORIES= net-mgmt devel MAINTAINER= ultima@FreeBSD.org COMMENT= Open Source Cloud Storage (Client) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libseafile.so:net-mgmt/seafile-client \ libsqlite3.so:databases/sqlite3 \ libccnet.so:net-mgmt/ccnet-client \ libjansson.so:devel/jansson \ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid +USES= compiler:c++11-lang cmake pkgconfig shebangfix ssl +SHEBANG_FILES= extensions/*.sh scripts/*.sh fsplugin/*.sh \ + scripts/*.py + USE_GITHUB= yes GH_ACCOUNT= haiwen GH_PROJECT= seafile-client -USES= compiler:c++11-lang cmake gettext pkgconfig shebangfix ssl -SHEBANG_FILES= extensions/*.sh scripts/*.sh fsplugin/*.sh \ - scripts/*.py USE_GNOME= glib20 USE_QT5= core dbus gui network testlib widgets \ qmake_build buildtools_build linguisttools_build INSTALLS_ICONS= yes -CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 \ +CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 \ -DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \ -DOPENSSL_LIBRARIES="-L${OPENSSLLIB} -lcrypto" -OPTIONS_DEFINE= DEBUG +OPTIONS_DEFINE= DEBUG NLS + +NLS_USES= gettext # Note that per PR 197984, cairo must be built with X11 and XCB options # otherwise configure fails with "cairo needs x11 enabled" message .include "${.CURDIR}/../seafile-client/Makefile.include" .include Index: head/net-mgmt/seafile-gui/distinfo =================================================================== --- head/net-mgmt/seafile-gui/distinfo (revision 448016) +++ head/net-mgmt/seafile-gui/distinfo (revision 448017) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498237204 -SHA256 (haiwen-seafile-client-v6.0.7_GH0.tar.gz) = 3212acab89ec3cee1508dd37826303447b7a738232e455b44ffc1a29d3c48baf -SIZE (haiwen-seafile-client-v6.0.7_GH0.tar.gz) = 2192384 +TIMESTAMP = 1502838671 +SHA256 (haiwen-seafile-client-v6.1.0_GH0.tar.gz) = 6d1d9fdb238cdd8514f2aa22e81cbab7a4b178807e68883a7f8c29afd232369b +SIZE (haiwen-seafile-client-v6.1.0_GH0.tar.gz) = 2246388