diff --git a/sysutils/lizardfs/Makefile b/sysutils/lizardfs/Makefile index bb2e9ebc1443..7feaf1fd1408 100644 --- a/sysutils/lizardfs/Makefile +++ b/sysutils/lizardfs/Makefile @@ -1,57 +1,57 @@ PORTNAME= lizardfs PORTVERSION= 3.12.0 DISTVERSIONPREFIX= v -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org COMMENT= Open Source Distributed Filesystem WWW= https://lizardfs.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= a2x:textproc/asciidoc \ spdlog>=1.4.2:devel/spdlog LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libfmt.so:devel/libfmt USES= cmake compiler:c11 fuse python shebangfix USE_RC_SUBR= mfscgiserv \ mfschunkserver \ mfsmaster \ mfsmetalogger \ mfspingserv USERS= mfs GROUPS= mfs SHEBANG_FILES= src/cgi/cgiserv.py.in \ src/cgi/lizardfs-cgiserver.py.in \ src/cgi/mfs.cgi.in \ src/cgi/chart.cgi.in USE_GITHUB= yes USE_LDCONFIG= yes CFLAGS+= -DSPDLOG_FMT_EXTERNAL=1 LDFLAGS+= -L${LOCALBASE}/lib -lfmt CMAKE_BUILD_TYPE= Release -CMAKE_ARGS= -DMAN_SUBDIR=man \ +CMAKE_ARGS= \ -DENABLE_WERROR=OFF \ -DENABLE_LIGHTMFS=ON \ -DENABLE_DEBIAN_PATHS=OFF \ -DENABLE_UTILS=ON \ -DENABLE_TESTS=OFF \ -DENABLE_DOCS=ON \ -DENABLE_VERBOSE_ASCIIDOC=ON \ -DENABLE_TCMALLOC=OFF \ -DENABLE_POLONAISE=OFF \ -DENABLE_CLIENT_LIB=ON \ -DENABLE_URAFT=ON \ -DENABLE_TRACES=OFF \ -DENABLE_CRC=ON \ -DENABLE_REQUEST_LOG=OFF \ -DENABLE_NFS_GANESHA=OFF .include diff --git a/sysutils/lizardfs/files/patch-CMakeLists.txt b/sysutils/lizardfs/files/patch-CMakeLists.txt index 229c0beb4d4c..fd2d4079393b 100644 --- a/sysutils/lizardfs/files/patch-CMakeLists.txt +++ b/sysutils/lizardfs/files/patch-CMakeLists.txt @@ -1,39 +1,37 @@ --- CMakeLists.txt.orig 2017-12-20 09:59:37 UTC +++ CMakeLists.txt -@@ -167,13 +167,7 @@ if(ENABLE_TESTS AND NOT THROW_INSTEAD_OF_ABORT) +@@ -167,13 +167,7 @@ endif() message(STATUS "THROW_INSTEAD_OF_ABORT: ${THROW_INSTEAD_OF_ABORT}") endif() -get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) -if (LIB64) - set(LIBSUFFIX "64") -else() - set(LIBSUFFIX "") -endif() -message(STATUS "LIB64: ${LIB64}") +set(LIBSUFFIX "") if(ENABLE_DEBIAN_PATHS) if (NOT CMAKE_INSTALL_PREFIX STREQUAL "/") -@@ -193,9 +187,9 @@ else() +@@ -193,8 +187,8 @@ else() set(SBIN_SUBDIR "sbin") set(LIB_SUBDIR "lib${LIBSUFFIX}") set(ETC_SUBDIR "etc/mfs") - set(RUN_SUBDIR "var/run/mfs") - set(DATA_SUBDIR "var/lib/mfs") -- set(MAN_SUBDIR "share/man") + set(RUN_SUBDIR "/var/run/mfs") + set(DATA_SUBDIR "/var/mfs") -+ set(MAN_SUBDIR "man") + set(MAN_SUBDIR "share/man") set(CGI_SUBDIR "share/mfscgi") set(INCL_SUBDIR "include/lizardfs") - endif() -@@ -205,8 +199,6 @@ set(BIN_PATH ${INSTALL_PREFIX_NO_SLASH}/${BIN_SUBDIR +@@ -205,8 +199,6 @@ set(ETC_PATH ${INSTALL_PREFIX_NO_SLASH}/${ETC_SUBDIR set(SBIN_PATH ${INSTALL_PREFIX_NO_SLASH}/${SBIN_SUBDIR}) set(LIB_PATH ${INSTALL_PREFIX_NO_SLASH}/${LIB_SUBDIR}) set(ETC_PATH ${INSTALL_PREFIX_NO_SLASH}/${ETC_SUBDIR}) -set(RUN_PATH ${INSTALL_PREFIX_NO_SLASH}/${RUN_SUBDIR}) -set(DATA_PATH ${INSTALL_PREFIX_NO_SLASH}/${DATA_SUBDIR}) set(MAN_PATH ${INSTALL_PREFIX_NO_SLASH}/${MAN_SUBDIR}) set(CGI_PATH ${INSTALL_PREFIX_NO_SLASH}/${CGI_SUBDIR}) set(INCL_PATH ${INSTALL_PREFIX_NO_SLASH}/${INCL_SUBDIR}) diff --git a/sysutils/lizardfs/pkg-plist b/sysutils/lizardfs/pkg-plist index 7942a84732dc..d9d585a1e3cd 100644 --- a/sysutils/lizardfs/pkg-plist +++ b/sysutils/lizardfs/pkg-plist @@ -1,119 +1,119 @@ bin/chunk_converter bin/cpp-interpreter.sh bin/crc_converter bin/file-generate bin/file-overwrite bin/file-validate bin/flockcmd bin/lizardfs bin/lizardfs-admin bin/lizardfs-probe bin/lzfs_ping_pong bin/mfsappendchunks bin/mfscheckfile bin/mfsdeleattr bin/mfsdirinfo bin/mfsfileinfo bin/mfsfilerepair bin/mfsgeteattr bin/mfsgetgoal bin/mfsgettrashtime bin/mfsmakesnapshot bin/mfsmount bin/mfsping bin/mfspingserv bin/mfsrepquota bin/mfsrgetgoal bin/mfsrgettrashtime bin/mfsrsetgoal bin/mfsrsettrashtime bin/mfsseteattr bin/mfssetgoal bin/mfssetquota bin/mfssettrashtime bin/mfstools.sh bin/posixlockcmd etc/bash_completion.d/lizardfs etc/mfs/globaliolimits.cfg.dist etc/mfs/iolimits.cfg.dist etc/mfs/mfschunkserver.cfg.dist etc/mfs/mfsexports.cfg.dist etc/mfs/mfsgoals.cfg.dist etc/mfs/mfshdd.cfg.dist etc/mfs/mfsmaster.cfg.dist etc/mfs/mfsmetalogger.cfg.dist etc/mfs/mfsmount.cfg.dist etc/mfs/mfstopology.cfg.dist include/lizardfs/lizardfs_c_api.h include/lizardfs/lizardfs_error_codes.h lib/libchunk_operations_eio.so lib/liblizardfs-client-cpp.a lib/liblizardfs-client-cpp_pic.a lib/liblizardfs-client.a lib/liblizardfs-client.so lib/liblizardfs-client_pic.a lib/liblizardfsmount_shared.so lib/libredirect_bind.so lib/libslow_chunk_scan.so -man/man1/lizardfs-appendchunks.1.gz -man/man1/lizardfs-checkfile.1.gz -man/man1/lizardfs-deleattr.1.gz -man/man1/lizardfs-dirinfo.1.gz -man/man1/lizardfs-fileinfo.1.gz -man/man1/lizardfs-filerepair.1.gz -man/man1/lizardfs-geteattr.1.gz -man/man1/lizardfs-getgoal.1.gz -man/man1/lizardfs-gettrashtime.1.gz -man/man1/lizardfs-makesnapshot.1.gz -man/man1/lizardfs-repquota.1.gz -man/man1/lizardfs-rgetgoal.1.gz -man/man1/lizardfs-rgettrashtime.1.gz -man/man1/lizardfs-rremove.1.gz -man/man1/lizardfs-rsetgoal.1.gz -man/man1/lizardfs-rsettrashtime.1.gz -man/man1/lizardfs-seteattr.1.gz -man/man1/lizardfs-setgoal.1.gz -man/man1/lizardfs-setquota.1.gz -man/man1/lizardfs-settrashtime.1.gz -man/man1/lizardfs.1.gz -man/man1/mfsmount.1.gz -man/man5/globaliolimits.cfg.5.gz -man/man5/iolimits.cfg.5.gz -man/man5/mfschunkserver.cfg.5.gz -man/man5/mfsexports.cfg.5.gz -man/man5/mfsgoals.cfg.5.gz -man/man5/mfshdd.cfg.5.gz -man/man5/mfsmaster.cfg.5.gz -man/man5/mfsmetalogger.cfg.5.gz -man/man5/mfsmount.cfg.5.gz -man/man5/mfstopology.cfg.5.gz -man/man7/lizardfs.7.gz -man/man7/mfs.7.gz -man/man7/moosefs.7.gz -man/man8/lizardfs-admin.8.gz -man/man8/lizardfs-cgiserver.8.gz -man/man8/lizardfs-probe.8.gz -man/man8/mfscgiserv.8.gz -man/man8/mfschunkserver.8.gz -man/man8/mfsmaster.8.gz -man/man8/mfsmetadump.8.gz -man/man8/mfsmetalogger.8.gz -man/man8/mfsmetarestore.8.gz -man/man8/mfsrestoremaster.8.gz sbin/lizardfs-cgiserver sbin/mfscgiserv sbin/mfschunkserver sbin/mfsmaster sbin/mfsmetadump sbin/mfsmetalogger sbin/mfsmetarestore sbin/mfsrestoremaster +share/man/man1/lizardfs-appendchunks.1.gz +share/man/man1/lizardfs-checkfile.1.gz +share/man/man1/lizardfs-deleattr.1.gz +share/man/man1/lizardfs-dirinfo.1.gz +share/man/man1/lizardfs-fileinfo.1.gz +share/man/man1/lizardfs-filerepair.1.gz +share/man/man1/lizardfs-geteattr.1.gz +share/man/man1/lizardfs-getgoal.1.gz +share/man/man1/lizardfs-gettrashtime.1.gz +share/man/man1/lizardfs-makesnapshot.1.gz +share/man/man1/lizardfs-repquota.1.gz +share/man/man1/lizardfs-rgetgoal.1.gz +share/man/man1/lizardfs-rgettrashtime.1.gz +share/man/man1/lizardfs-rremove.1.gz +share/man/man1/lizardfs-rsetgoal.1.gz +share/man/man1/lizardfs-rsettrashtime.1.gz +share/man/man1/lizardfs-seteattr.1.gz +share/man/man1/lizardfs-setgoal.1.gz +share/man/man1/lizardfs-setquota.1.gz +share/man/man1/lizardfs-settrashtime.1.gz +share/man/man1/lizardfs.1.gz +share/man/man1/mfsmount.1.gz +share/man/man5/globaliolimits.cfg.5.gz +share/man/man5/iolimits.cfg.5.gz +share/man/man5/mfschunkserver.cfg.5.gz +share/man/man5/mfsexports.cfg.5.gz +share/man/man5/mfsgoals.cfg.5.gz +share/man/man5/mfshdd.cfg.5.gz +share/man/man5/mfsmaster.cfg.5.gz +share/man/man5/mfsmetalogger.cfg.5.gz +share/man/man5/mfsmount.cfg.5.gz +share/man/man5/mfstopology.cfg.5.gz +share/man/man7/lizardfs.7.gz +share/man/man7/mfs.7.gz +share/man/man7/moosefs.7.gz +share/man/man8/lizardfs-admin.8.gz +share/man/man8/lizardfs-cgiserver.8.gz +share/man/man8/lizardfs-probe.8.gz +share/man/man8/mfscgiserv.8.gz +share/man/man8/mfschunkserver.8.gz +share/man/man8/mfsmaster.8.gz +share/man/man8/mfsmetadump.8.gz +share/man/man8/mfsmetalogger.8.gz +share/man/man8/mfsmetarestore.8.gz +share/man/man8/mfsrestoremaster.8.gz share/mfscgi/chart.cgi share/mfscgi/err.gif share/mfscgi/favicon.ico share/mfscgi/index.html share/mfscgi/logomini.png share/mfscgi/mfs.cgi share/mfscgi/mfs.css /var/mfs/metadata.mfs.empty @dir /var/mfs