From nobody Fri Mar 22 10:40:23 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Jkb5SLHz5DZwH; Fri, 22 Mar 2024 10:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Jkb2ht3z4k32; Fri, 22 Mar 2024 10:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711104023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nSUL0/L7Vvpkg1rjTqnbEPQvgk1m85wHEBP4HLVcbJs=; b=mRQ2FzcJYFyTfNQCUUUJ2OZZPp8nWXJYUV257DNx68sNjWfOhzm/zgoe1DMlr6e5ZJE9BJ svMEkdt1bgYAQMVlbbuvWq95J7op2Cj9kKu7skCRmYCsniwlE3WSFtnsUgtk4taJlH8pln SyKa5lKgMs1zzKTO3oYSi7LO7Fapa1vfWOZEQXEyS/TarPIs4XUGVT4aOFrPSbTbtx/2/P tBJEGelTjajrzmmUO2goAl90KkLMcXPEniW343ocUR+c+B6gOi9sbxXcRzwsNF1u9vJGTQ aLkziCfN2bZGFnDvjiewhgprOfyMf2zKSWWea+Xqz5unpLGETGFk2UgRUsWOUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711104023; a=rsa-sha256; cv=none; b=kOEaJmyN5f1idngVis0bwBLVN3dwIMw7fdBaOxSV1dyjk4lukC6j+Bq9NI/twQcBRa0Kfm jb2KnQC2JD0HeQJP7JyRfES8bV0iGRi7c1h7WRrlW4dDNI2klUeXsWlWkTccoTE0xY5CpZ 1pJGAkgvjRrC+fTutrkaWpZQP4CtdoyaGnnSy8De7Wpd4tUgdB97KHAsNNWnGBUyWK1s0K cMwMak7/1oEuRQZ2ZwV4BnmXYOpJu5NjNEfmDtrY94h7ce1x9IdBxlov9oWSZwt1skyJam vbh6kj9TAL9A1wKfAwGfn7rSLalQp/ZPnHANrTBjw9RAn1zE2OgAksD52+dMCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711104023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nSUL0/L7Vvpkg1rjTqnbEPQvgk1m85wHEBP4HLVcbJs=; b=wmdK3H6QZPHaOgQziM7geXMQ1CXSmspf/uVRMivDHRaoeZro3aHW53o9HMGGYO81KlsTJo jhM24UQ9fagab62gytRj8TG0cZFLQ4VbQxi7cK9w/X1Z8o0Uzlmv6F8joqp7minStOlSBh g62DvbEY8HmVD5EClriFivUPTAcAWBRV9XCWlvDo4jEOD9crkz5/iZg/FxqD5PXjnqZWPK bwSCrqkm4Gcof3vIsZf7WLl/r3zNkTEXAARr9mo+u+rDRXvKqJXoqfs1szdjJo20CQOXUu DWv1vrDUwsdihbhVBcptnzuaHuQHvHJ1l5hBZyaoy2jrePxKVSPCOFqamzsPVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Jkb2KHDz1FDy; Fri, 22 Mar 2024 10:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MAeNxg007232; Fri, 22 Mar 2024 10:40:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MAeN0n007229; Fri, 22 Mar 2024 10:40:23 GMT (envelope-from git) Date: Fri, 22 Mar 2024 10:40:23 GMT Message-Id: <202403221040.42MAeN0n007229@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 4b91392c180b - main - sysutils/lizardfs: Move man pages to share/man List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b91392c180b0feb79d5777da22e61286d03cfc4 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b91392c180b0feb79d5777da22e61286d03cfc4 commit 4b91392c180b0feb79d5777da22e61286d03cfc4 Author: Nuno Teixeira AuthorDate: 2024-03-22 10:22:28 +0000 Commit: Nuno Teixeira CommitDate: 2024-03-22 10:39:43 +0000 sysutils/lizardfs: Move man pages to share/man Approved by: portmgr (blanket) --- sysutils/lizardfs/Makefile | 4 +- sysutils/lizardfs/files/patch-CMakeLists.txt | 10 ++-- sysutils/lizardfs/pkg-plist | 90 ++++++++++++++-------------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/sysutils/lizardfs/Makefile b/sysutils/lizardfs/Makefile index bb2e9ebc1443..7feaf1fd1408 100644 --- a/sysutils/lizardfs/Makefile +++ b/sysutils/lizardfs/Makefile @@ -1,7 +1,7 @@ PORTNAME= lizardfs PORTVERSION= 3.12.0 DISTVERSIONPREFIX= v -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org @@ -37,7 +37,7 @@ 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 \ 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,6 +1,6 @@ --- 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() @@ -15,20 +15,18 @@ 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}) 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 @@ -55,51 +55,6 @@ 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 @@ -108,6 +63,51 @@ 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