From nobody Mon Mar 18 13:51:51 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 4Tyx9M2d3xz5Dmnx; Mon, 18 Mar 2024 13:51:51 +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 4Tyx9M1sTVz4Lfh; Mon, 18 Mar 2024 13:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710769911; 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=Bxfrfd6fBscCUJ5ZQbSkQpIJAUUhj0vFzWcuECIEbsE=; b=FM+1M8WjNr4o9aveO/19C6u9FzrFWbJm8VekO42rpI4ipUA6W8q1epcaWyNhuK2cAZnPSg BqcWf6TaRIpt2Uck1SjPSTtK3TeSbINEkzNH7Jssz0fvFvT24DZuLCzgcLbNMiP1Vz/RrK O8/dQeq2hnyMsdgGNu3MQT79sLxqHD6fqhW6XZaqnq+gJvgdCoP2zKvOBtchrUTzuXNQ+0 mfORAd1S1hptePCErv2OtgSV4xFU2ejwVpxEBgRhKnfWUPOU4MNfWOa26mJGB60sqAnX0g +qnDA3yOZgYt+U8GVyqIaHnQiOPboUaQK9P/QIyqiftVtHeXSj2RKIom+6fg9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710769911; a=rsa-sha256; cv=none; b=xgGy8PE4PAM3WvaBt1sZHU0nL61DfCY1YfayHsZkvZb1y4dsSp+qowBtWHPtZMfVb5zaaU cTeg9A0keEBoB0uykHTcw1yvm9ROWAStnNYcBeL4omQRTr/Q7milu8nFN1az3zQtVZmFEo d5dWk/JcCyeafrAzfzVcAameJ2LZk/fzAm96BNHOEGhw85HuVSmh3CPYqzR64xU31fzu2E yjz2odfRR1eba4g8C/DCmgew88/3lcPLtDakLmR8cEcj0U0sZa1noQKdPgUqztVYF4RFTG puFIv381eVt1eXok6ljDWkpXRtuEM8LY461A1i4vRsAdw56MydxZAy1Xa7EKNg== 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=1710769911; 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=Bxfrfd6fBscCUJ5ZQbSkQpIJAUUhj0vFzWcuECIEbsE=; b=Y3obVqDc612Y/5v6njVzmD21gpzGb1jiBM1GaRS0ZYW0lvEhWUnr6FcN1vLkCOXdZIVyoM JcsW5saOhUCcKmDgL6r4BiWlXFMRjtvcTXoe6I+aXHmLuqVuB+15qYSRrNoZ/nhCZE2TwD Oo+cF5kOMEIn02ofZrMHkFwG/j/MRP8zfB0cczq3un+x1ccq7Wo8/cMoZul2ZGdefjCOWZ DKiqz6TS/Y+MTTz4T+JM6AR7mx1LcEijLLDjD4EBI/ccuvOWS93ozXJtYmCYVYPKVU3GLt R2gKmUhLBCcTJMGnBNXo33Ul1xOqGt3irBfYRSzy2b3low5vzd2U7ZKTAWCUlQ== 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 4Tyx9M1LpmzQNZ; Mon, 18 Mar 2024 13:51:51 +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 42IDppV5093772; Mon, 18 Mar 2024 13:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IDppGA093769; Mon, 18 Mar 2024 13:51:51 GMT (envelope-from git) Date: Mon, 18 Mar 2024 13:51:51 GMT Message-Id: <202403181351.42IDppGA093769@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: bd93dd42f9e9 - main - net-mgmt/pandorafms_server: 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: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd93dd42f9e946693433f50b742c16b60b90bafc Auto-Submitted: auto-generated The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd93dd42f9e946693433f50b742c16b60b90bafc commit bd93dd42f9e946693433f50b742c16b60b90bafc Author: Christian Weisgerber AuthorDate: 2024-03-18 13:22:16 +0000 Commit: Christian Weisgerber CommitDate: 2024-03-18 13:51:37 +0000 net-mgmt/pandorafms_server: Move man pages to share/man Approved by: portmgr (blanket) --- net-mgmt/pandorafms_server/Makefile | 9 +-------- .../pandorafms_server/files/patch-pandora__server__installer | 11 +++++++++++ net-mgmt/pandorafms_server/pkg-plist | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/net-mgmt/pandorafms_server/Makefile b/net-mgmt/pandorafms_server/Makefile index 84e37cd0fc08..64bbd745a1e8 100644 --- a/net-mgmt/pandorafms_server/Makefile +++ b/net-mgmt/pandorafms_server/Makefile @@ -1,5 +1,5 @@ PORTNAME= pandora_server -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= koichiro@rworks.jp @@ -95,13 +95,6 @@ RUN_DEPENDS+= ${LOCALBASE}/sbin/ipmi-sensors:sysutils/freeipmi .endif post-patch: - @${REINPLACE_CMD} \ - -e 's|%%PREFIX%%|${PREFIX}|g' \ - -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|%%PANDORA_ETCDIR%%|${PANDORA_ETCDIR}|g' \ - -e 's|%%PANDORA_LOGDIR%%|${PANDORA_LOGDIR}|g' \ - -e 's|%%PANDORA_SPOOLDIR%%|${PANDORA_SPOOLDIR}|g' \ - ${WRKSRC}/pandora_server_installer @${REINPLACE_CMD} -i "" \ -e 's,/usr/bin/perl,${PERL},g' \ `${GREP} -rl /usr/bin/perl ${WRKSRC} | ${GREP} -v pandora_server_installer` diff --git a/net-mgmt/pandorafms_server/files/patch-pandora__server__installer b/net-mgmt/pandorafms_server/files/patch-pandora__server__installer new file mode 100644 index 000000000000..5efe63c846d5 --- /dev/null +++ b/net-mgmt/pandorafms_server/files/patch-pandora__server__installer @@ -0,0 +1,11 @@ +--- pandora_server_installer.orig 2024-03-18 13:19:50 UTC ++++ pandora_server_installer +@@ -92,7 +92,7 @@ set_global_vars () { + PANDORA_CFG_FILE_DIST=$DISTRO/pandora_server.conf.new + PANDORA_INIT_SCRIPT=$DISTRO/pandora_server + TENTACLE_INIT_SCRIPT=$DISTRO/tentacle_server +- MANDIR=$PREFIX/man/man1 ++ MANDIR=$PREFIX/share/man/man1 + INITDIR=$PREFIX/etc/rc.d + PERL=/usr/local/bin/perl + PANDORA_RC_VAR="pandora_server_enable" diff --git a/net-mgmt/pandorafms_server/pkg-plist b/net-mgmt/pandorafms_server/pkg-plist index 7e0c126163dd..62c873beed91 100644 --- a/net-mgmt/pandorafms_server/pkg-plist +++ b/net-mgmt/pandorafms_server/pkg-plist @@ -25,8 +25,8 @@ %%SITE_PERL%%/PandoraFMS/Traceroute.pm %%SITE_PERL%%/PandoraFMS/Traceroute/PurePerl.pm %%SITE_PERL%%/PandoraFMS/WMIServer.pm -man/man1/pandora_server.1.gz -man/man1/tentacle_server.1.gz +share/man/man1/pandora_server.1.gz +share/man/man1/tentacle_server.1.gz %%DATADIR%%/util/alert_multicast.pl %%DATADIR%%/util/change_remoteconfig.pl %%DATADIR%%/util/compaq_chassis_trap_manager.pl