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,121 +1,114 @@
 PORTNAME=	pandora_server
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	koichiro@rworks.jp
 COMMENT=	Pandora FMS server
 WWW=		http://www.pandorafms.org/
 
 LICENSE=	${PANDORA_LICENSE}
 LICENSE_FILE=	${PANDORA_LICENSE_FILE}
 
 PANDORA_DEPS=	p5-DBI>=0:databases/p5-DBI \
 		p5-HTML-Parser>=0:www/p5-HTML-Parser \
 		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
 		p5-NetAddr-IP>=0:net-mgmt/p5-NetAddr-IP \
 		net-snmp>=0:net-mgmt/net-snmp \
 		p5-Socket6>=0:net/p5-Socket6 \
 		p5-XML-Simple>=0:textproc/p5-XML-Simple \
 		p5-XML-Twig>=0:textproc/p5-XML-Twig \
 		p5-JSON>=0:converters/p5-JSON
 BUILD_DEPENDS=	${PANDORA_DEPS}
 RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
 		p5-DBD-mysql>=4:databases/p5-DBD-mysql \
 		wmic:net-mgmt/wmi-client \
 		nmap:security/nmap \
 		p5-Encode-Locale>=0:converters/p5-Encode-Locale \
 		${PANDORA_DEPS}
 
 OPTIONS_DEFINE=	DOCS TENTACLE XPROBE PGSQL EXTRAS
 OPTIONS_DEFAULT=	TENTACLE XPROBE EXTRAS
 DOCS_DESC=	Install AUTHORS, ChangeLog and README
 TENTACLE_DESC=	Install tentacle_server
 XPROBE_DESC=	Install xprobe
 PGSQL_DESC=	Use PostgreSQL backend (experimental)
 EXTRAS_DESC=	Extra dependencies for util scripts
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	FreeBSD/pandora_server \
 		bin/pandora_server \
 		util/integrity_check \
 		util/pandora_backup.sh \
 		util/pandora_count.sh \
 		util/pandora_diagnostic.sh \
 		util/pandora_remote_agent.sh \
 		util/pandora_server \
 		util/pandora_watchdog.sh \
 		util/plugin/babel_plugin/babel_plugin.sh \
 		util/plugin/create_integria_incident.sh \
 		util/plugin/dns_plugin.sh \
 		util/plugin/integria_plugin/integria_plugin.sh \
 		util/plugin/mysql_plugin.sh \
 		util/plugin/packet_loss.sh \
 		util/plugin/ssh_pandoraplugin.sh \
 		util/plugin/udp_nmap_plugin.sh \
 		util/plugin/webcheck_plugin.sh \
 		util/snmptrap_gen.sh \
 		util/tentacle_serverd \
 		util/trap_rate.sh
 USE_PERL5=	build run
 SUB_LIST+=	PERL="${PERL}" DATADIR="${DATADIR}"
 SUB_FILES=	pkg-message
 
 .include "${.CURDIR}/bsd.pandora.mk"
 
 PORTDOCS+=	README
 PANDORA_INSTALLER_ARGS+=	--destdir ${STAGEDIR}
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MTENTACLE}
 PLIST_SUB+=	TENTACLE="@comment "
 PANDORA_INSTALLER_ARGS+=--no-tentacle
 .else
 PLIST_SUB+=	TENTACLE=""
 #USE_RC_SUBR+=	tentacle_server
 .endif
 .if ${PORT_OPTIONS:MXPROBE}
 RUN_DEPENDS+=	${LOCALBASE}/bin/xprobe2:net/xprobe
 .endif
 .if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 .if ${PORT_OPTIONS:MEXTRAS}
 # plugin/bgp_pluin.pl
 RUN_DEPENDS+=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 # plugin/multicast.pl
 RUN_DEPENDS+=	p5-IO-Socket-Multicast>=0:net/p5-IO-Socket-Multicast
 # plugin/openvpn_pandoraplugin.pl
 RUN_DEPENDS+=	p5-Net-Telnet>=0:net/p5-Net-Telnet
 # plugin/integria_plugin/integria_plugin.sh, plugin/webcheck_plugin.sh,
 # plugin/babel_plugin/babel_plugin.sh, plugin/create_integria_incident.sh
 RUN_DEPENDS+=	${LOCALBASE}/bin/wget:ftp/wget
 # plugin/ipmi-plugin.pl, recon_scripts/ipmi-recon.pl
 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`
 
 post-install:
 	@${FIND} ${STAGEDIR}${DATADIR} -type l -name PandoraFMS -delete
 .for x in pandora_server tentacle_server
 	@cd ${STAGEDIR}${PREFIX}/etc/rc.d && test -f ${x} \
 		&& ${REINPLACE_CMD} -i "" -e 's|/usr/local|${PREFIX}|g' ${x}
 .endfor
 	@${MV} ${STAGEDIR}${ETCDIR}/pandora_server.conf ${STAGEDIR}${ETCDIR}/pandora_server.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
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
@@ -1,117 +1,117 @@
 %%PERL5_MAN3%%/PandoraFMS::Core.3.gz
 %%PERL5_MAN3%%/PandoraFMS::GIS.3.gz
 %%PERL5_MAN3%%/PandoraFMS::GeoIP.3.gz
 %%PERL5_MAN3%%/PandoraFMS::NmapParser.3.gz
 %%PERL5_MAN3%%/PandoraFMS::Sendmail.3.gz
 %%PERL5_MAN3%%/PandoraFMS::Tools.3.gz
 %%PERL5_MAN3%%/PandoraFMS::Traceroute.3.gz
 %%PERL5_MAN3%%/PandoraFMS::Traceroute::PurePerl.3.gz
 %%SITE_PERL%%/PandoraFMS/Config.pm
 %%SITE_PERL%%/PandoraFMS/Core.pm
 %%SITE_PERL%%/PandoraFMS/DB.pm
 %%SITE_PERL%%/PandoraFMS/DataServer.pm
 %%SITE_PERL%%/PandoraFMS/GIS.pm
 %%SITE_PERL%%/PandoraFMS/GeoIP.pm
 %%SITE_PERL%%/PandoraFMS/NetworkServer.pm
 %%SITE_PERL%%/PandoraFMS/NmapParser.pm
 %%SITE_PERL%%/PandoraFMS/PluginServer.pm
 %%SITE_PERL%%/PandoraFMS/PredictionServer.pm
 %%SITE_PERL%%/PandoraFMS/ProducerConsumerServer.pm
 %%SITE_PERL%%/PandoraFMS/ReconServer.pm
 %%SITE_PERL%%/PandoraFMS/SNMPServer.pm
 %%SITE_PERL%%/PandoraFMS/Sendmail.pm
 %%SITE_PERL%%/PandoraFMS/Server.pm
 %%SITE_PERL%%/PandoraFMS/Tools.pm
 %%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
 %%DATADIR%%/util/compaq_chassis_trap_manager2.pl
 %%DATADIR%%/util/compare_schemas.pl
 %%DATADIR%%/util/esx_trap_manager.pl
 %%DATADIR%%/util/gis.README
 %%DATADIR%%/util/gpx2pandora_agent_data.pl
 %%DATADIR%%/util/integria_rticket.pl
 %%DATADIR%%/util/integrity_check
 %%DATADIR%%/util/n2p.README
 %%DATADIR%%/util/n2p.pl
 %%DATADIR%%/util/pandora2ast/GPL
 %%DATADIR%%/util/pandora2ast/README
 %%DATADIR%%/util/pandora2ast/channelcommands
 %%DATADIR%%/util/pandora2ast/extensions.conf.add
 %%DATADIR%%/util/pandora2ast/pandora2ast.pl
 %%DATADIR%%/util/pandora2ast/text2speech.php
 %%DATADIR%%/util/pandora_DBI_test.pl
 %%DATADIR%%/util/pandora_backup.sh
 %%DATADIR%%/util/pandora_count.sh
 %%DATADIR%%/util/pandora_csvbridge.pl
 %%DATADIR%%/util/pandora_database_check.pl
 %%DATADIR%%/util/pandora_db.pl
 %%DATADIR%%/util/pandora_dbstress.README
 %%DATADIR%%/util/pandora_dbstress.pl
 %%DATADIR%%/util/pandora_diagnostic.sh
 %%DATADIR%%/util/pandora_logrotate
 %%DATADIR%%/util/pandora_manage.pl
 %%DATADIR%%/util/pandora_migrate_plugins.pl
 %%DATADIR%%/util/pandora_migrate_recon_scripts.pl
 %%DATADIR%%/util/pandora_recode_db.pl
 %%DATADIR%%/util/pandora_remote_agent.sh
 %%DATADIR%%/util/pandora_revent.pl
 %%DATADIR%%/util/pandora_revent_create.pl
 %%DATADIR%%/util/pandora_server
 %%DATADIR%%/util/pandora_server_logrotate
 %%DATADIR%%/util/pandora_snmp.README
 %%DATADIR%%/util/pandora_snmp.sh
 %%DATADIR%%/util/pandora_sync_db.pl
 %%DATADIR%%/util/pandora_watchdog.sh
 %%DATADIR%%/util/pandora_xml_stress.README
 %%DATADIR%%/util/pandora_xml_stress.agents
 %%DATADIR%%/util/pandora_xml_stress.conf
 %%DATADIR%%/util/pandora_xml_stress.pl
 %%DATADIR%%/util/pandora_xml_stress_module_source.txt
 %%DATADIR%%/util/plugin/EU_10yrspread.pl
 %%DATADIR%%/util/plugin/SMTP_check.pl
 %%DATADIR%%/util/plugin/babel_plugin/README
 %%DATADIR%%/util/plugin/babel_plugin/babel_plugin.sh
 %%DATADIR%%/util/plugin/babel_plugin/plugin_definition.ini
 %%DATADIR%%/util/plugin/bgp_plugin.pl
 %%DATADIR%%/util/plugin/create_integria_incident.sh
 %%DATADIR%%/util/plugin/dns_plugin.sh
 %%DATADIR%%/util/plugin/dummy_plugin.pl
 %%DATADIR%%/util/plugin/iface_bandwith.pl
 %%DATADIR%%/util/plugin/integria_plugin/README
 %%DATADIR%%/util/plugin/integria_plugin/integria_plugin.sh
 %%DATADIR%%/util/plugin/integria_plugin/plugin_definition.ini
 %%DATADIR%%/util/plugin/ipmi-plugin.pl
 %%DATADIR%%/util/plugin/multicast.pl
 %%DATADIR%%/util/plugin/mysql_plugin.sh
 %%DATADIR%%/util/plugin/openvpn_pandoraplugin.pl
 %%DATADIR%%/util/plugin/packet_loss.sh
 %%DATADIR%%/util/plugin/pandora_inventory_change.README
 %%DATADIR%%/util/plugin/pandora_inventory_change.pl
 %%DATADIR%%/util/plugin/pandora_loadgen.pl
 %%DATADIR%%/util/plugin/pandora_server_status.pl
 %%DATADIR%%/util/plugin/snmp_process.pl
 %%DATADIR%%/util/plugin/snmp_remote.pl
 %%DATADIR%%/util/plugin/ssh_pandoraplugin.sh
 %%DATADIR%%/util/plugin/udp_nmap_plugin.sh
 %%DATADIR%%/util/plugin/webcheck_plugin.sh
 %%DATADIR%%/util/recon_scripts/ipmi-recon.pl
 %%DATADIR%%/util/recon_scripts/snmp-recon.pl
 %%DATADIR%%/util/recon_scripts/wmi-recon.pl
 %%DATADIR%%/util/snmptrap_gen.sh
 %%DATADIR%%/util/tentacle_serverd
 %%DATADIR%%/util/trap_rate.sh
 %%DATADIR%%/util/udp_client.pl
 %%DATADIR%%/util/windows.README
 @mode 555
 bin/pandora_exec
 bin/pandora_server
 %%TENTACLE%%bin/tentacle_server
 etc/rc.d/pandora_server
 etc/rc.d/tentacle_server
 @sample(,,440) %%ETCDIR%%/pandora_server.conf.sample