Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Mar 2024 13:51:51 GMT
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bd93dd42f9e9 - main - net-mgmt/pandorafms_server: Move man pages to share/man
Message-ID:  <202403181351.42IDppGA093769@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by naddy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bd93dd42f9e946693433f50b742c16b60b90bafc

commit bd93dd42f9e946693433f50b742c16b60b90bafc
Author:     Christian Weisgerber <naddy@FreeBSD.org>
AuthorDate: 2024-03-18 13:22:16 +0000
Commit:     Christian Weisgerber <naddy@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403181351.42IDppGA093769>