Attachment #208482 for bug #241207




# $FreeBSD$

PORTNAME=	FusionInventory-Agent
PORTVERSION=	2.5.1
CATEGORIES=	net-mgmt
USE_GITHUB=     yes
GH_ACCOUNT=     fusioninventory
PKGNAMEPREFIX=	p5-

MAINTAINER=	freebsd@simweb.ch


BUILD_DEPENDS=	${RUN_DEPENDS}
RUN_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
		p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
		p5-libwww>=0:www/p5-libwww \
		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
		p5-Proc-PID-File>=0:devel/p5-Proc-PID-File \
		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
		p5-Text-Template>=0:textproc/p5-Text-Template \
		p5-XML-TreePP>=0:textproc/p5-XML-TreePP \
		p5-XML-XPath>=0:textproc/p5-XML-XPath
TEST_DEPENDS=	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
		p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
		p5-HTTP-Proxy>=0:www/p5-HTTP-Proxy \
		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
		p5-HTTP-Server-Simple-Authen>=0:www/p5-HTTP-Server-Simple-Authen \

		p5-Test-MockObject>=0:devel/p5-Test-MockObject \
		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings

OPTIONS_DEFINE=		CUPS DMIDECODE DEPLOY NETDISC NETINV PCIUTILS \
		p5-FusionInventory-Agent-Task-SNMPQuery-*

OPTIONS_DEFINE=		CUPS DAEMON DMIDECODE DEPLOY NETDISC NETINV PCIUTILS \
			SSL VMWARE WOL ZLIB
OPTIONS_DEFAULT=	DMIDECODE PCIUTILS ZLIB
OPTIONS_SUB=	yes

DAEMON_DESC=	Daemon mode, with opt. web interface
DEPLOY_DESC=	Deployment task
DMIDECODE_DESC=	Dmidecode hardware information
NETDISC_DESC=	Network discovery task

USE_RC_SUBR=	fusioninventory

CUPS_RUN_DEPENDS=	p5-Net-CUPS>=0.6:print/p5-Net-CUPS
DAEMON_RUN_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
			p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
			p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
DEPLOY_RUN_DEPENDS=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
			p5-SHA>=0:security/p5-SHA \
			p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
			p5-JSON>=0:converters/p5-JSON \
			p5-Net-Ping>=2.67:net/p5-Net-Ping \
			p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
			p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
			p5-URI-Escape-XS>=0:www/p5-URI-Escape-XS
# Wants URI::Escape, ports tree has URI::Escape::XS, seems drop-in replacement
DMIDECODE_RUN_DEPENDS=	dmidecode>=3.2:sysutils/dmidecode
NETDISC_RUN_DEPENDS=	p5-Net-NBName>=0:net/p5-Net-NBName \
			p5-Net-Ping>=2.67:net/p5-Net-Ping \
			p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
			p5-Thread-Queue>=0:devel/p5-Thread-Queue
NETINV_RUN_DEPENDS=	p5-Crypt-DES>=0:security/p5-Crypt-DES \
			p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
			p5-Thread-Queue>=0:devel/p5-Thread-Queue
PCIUTILS_RUN_DEPENDS+=	lspci:sysutils/pciutils
SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=1.14:security/p5-IO-Socket-SSL \
			p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https

Lines 1-3 Link Here

(-)private/p5-FusionInventory-Agent/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519161277	1	TIMESTAMP = 1570541292
2	SHA256 (FusionInventory-Agent-2.4.tar.gz) = 9dc86f1bb4786d7b141824a007a0da1183c2451c33f8e3e9c958c7d6cce89885	2	SHA256 (fusioninventory-FusionInventory-Agent-2.5.1_GH0.tar.gz) = 51dfa056a48bb8d174dcee675b488d6deb3911d512b4d865dd0847bf594d9ecb
3	SIZE (FusionInventory-Agent-2.4.tar.gz) = 2501564	3	SIZE (fusioninventory-FusionInventory-Agent-2.5.1_GH0.tar.gz) = 2681422




- Set LOCALSTATEDIR to /var/run as done in this ports tree
- Install agent.cfg as agent.cfg.sample

--- Makefile.PL.orig	2019-07-01 15:37:06 UTC
+++ Makefile.PL
@@ -162,25 +162,15 @@
 
     # for some reason, initialising variables from the global scope doesn't work
     %variables = (
-        PREFIX               => '/usr/local',
         VERSION              => '',
         COMMENTS             => "Platform  : $Config{myuname},Build date: ".gmtime()." (GMT)",
         RAWCOMMENTS          => '',
-        INSTALLSCRIPT        => '$(PREFIX)/bin',
-        INSTALLSITESCRIPT    => '$(PREFIX)/bin',
-        INSTALLVENDORSCRIPT  => '$(PREFIX)/bin',

     );
 
     # allow variables defined on command line to override defaults
@@ -242,14 +232,11 @@
 	$(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
 	for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \
 	do \
-	  if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
-	    $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
-	    $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
-	    $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
-	  else \
-	    $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config; \
-	    $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \
+	  if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config.sample; then \
+	    $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.sample; \
 	  fi; \
+	  $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.sample; \
+	  $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.sample; \
 	done
 	$(ABSPERLRUN) -pi \
 	    -e "s|=> undef, # SYSCONFDIR.*|=> '$(SYSCONFDIR)',|;" \
 	        $(DESTDIR)$(DATADIR)/lib/FusionInventory/Agent/Config.pm

Lines 5-9 Link Here

(-)private/p5-FusionInventory-Agent/pkg-descr (-1 / +1 lines)
5	linux_agent which was released with OCS 1.01 and prior. It also replaces	5	linux_agent which was released with OCS 1.01 and prior. It also replaces
6	the unofficial Solaris/AIX/BSD agents.	6	the unofficial Solaris/AIX/BSD agents.
7		7
8	WWW: https://metacpan.org/release/FusionInventory-Agent	8	WWW: https://github.com/fusioninventory/fusioninventory-agent
9	WWW: http://fusioninventory.org/	9	WWW: http://fusioninventory.org/




bin/fusioninventory-inventory
%%NETDISC%%bin/fusioninventory-netdiscovery
%%NETINV%%bin/fusioninventory-netinventory
bin/fusioninventory-remoteinventory
%%WOL%%bin/fusioninventory-wakeonlan
etc/fusioninventory/agent.cfg.sample
etc/fusioninventory/inventory-server-plugin.cfg.sample
etc/fusioninventory/server-test-plugin.cfg.sample
%%SSL%%etc/fusioninventory/ssl-server-plugin.cfg.sample
%%PERL5_MAN1%%/fusioninventory-agent.1.gz
%%VMWARE%%%%PERL5_MAN1%%/fusioninventory-esx.1.gz
%%PERL5_MAN1%%/fusioninventory-injector.1.gz
%%PERL5_MAN1%%/fusioninventory-inventory.1.gz
%%NETDISC%%%%PERL5_MAN1%%/fusioninventory-netdiscovery.1.gz
%%NETINV%%%%PERL5_MAN1%%/fusioninventory-netinventory.1.gz
%%PERL5_MAN1%%/fusioninventory-remoteinventory.1.gz
%%WOL%%%%PERL5_MAN1%%/fusioninventory-wakeonlan.1.gz
share/fusioninventory/edid.ids
share/fusioninventory/html/favicon.ico

share/fusioninventory/lib/FusionInventory/Agent.pm
share/fusioninventory/lib/FusionInventory/Agent/Config.pm
share/fusioninventory/lib/FusionInventory/Agent/Daemon.pm
share/fusioninventory/lib/FusionInventory/Agent/Daemon/Win32.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client/Fusion.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client/OCS.pm
%%SSL%%share/fusioninventory/lib/FusionInventory/Agent/HTTP/Protocol/https.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/Inventory.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/Proxy.pm
%%SSL%%share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/SSL.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/SecondaryProxy.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/Test.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Session.pm
share/fusioninventory/lib/FusionInventory/Agent/Inventory.pm
share/fusioninventory/lib/FusionInventory/Agent/Logger.pm
share/fusioninventory/lib/FusionInventory/Agent/Logger/Backend.pm

share/fusioninventory/lib/FusionInventory/Agent/Logger/Syslog.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/Device.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/Device/Components.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/Live.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Brocade.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Digi.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Epson.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/HPNetPeripheral.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/LinuxAppliance.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Mikrotik.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Oki.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Panasas.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/UPS.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Ubnt.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Zebra.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/iLO.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupportTemplate.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/Mock.pm

share/fusioninventory/lib/FusionInventory/Agent/SOAP/VMware/Host.pm
share/fusioninventory/lib/FusionInventory/Agent/Storage.pm
share/fusioninventory/lib/FusionInventory/Agent/Target.pm
share/fusioninventory/lib/FusionInventory/Agent/Target/Listener.pm
share/fusioninventory/lib/FusionInventory/Agent/Target/Local.pm
share/fusioninventory/lib/FusionInventory/Agent/Target/Scheduler.pm
share/fusioninventory/lib/FusionInventory/Agent/Target/Server.pm
share/fusioninventory/lib/FusionInventory/Agent/Task.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Collect.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Collect/Version.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/ActionProcessor.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Cmd.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Copy.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Delete.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Mkdir.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Move.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/DirectoryExists.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/DirectoryMissing.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FileExists.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FileMissing.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FileSHA512.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FileSHA512Mismatch.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FileSizeEquals.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FileSizeGreater.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FileSizeLower.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FreeSpaceGreater.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyEquals.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyExists.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyMissing.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyNotEquals.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueExists.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueMissing.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueType.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Datastore.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Datastore/WorkDir.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/DiskFree.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/File.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Job.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Maintenance.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/P2P.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/UserCheck.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/UserCheck/WTS.pm
%%DEPLOY%%share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Version.pm
%%VMWARE%%share/fusioninventory/lib/FusionInventory/Agent/Task/ESX.pm
%%VMWARE%%share/fusioninventory/lib/FusionInventory/Agent/Task/ESX/Version.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/AIX.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/AIX/CPU.pm

share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/BSD/i386.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Arch.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Batteries.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Batteries/Acpiconf.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Batteries/Upower.pm
%%DMIDECODE%%share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode.pm
%%DMIDECODE%%share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Battery.pm
%%DMIDECODE%%share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Bios.pm
%%DMIDECODE%%share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Memory.pm
%%DMIDECODE%%share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Ports.pm
%%DMIDECODE%%share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Psu.pm
%%DMIDECODE%%share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Slots.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Domains.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Drives.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Drives/ASM.pm

share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Firewall/Ufw.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Hostname.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Ipmi.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Ipmi/Fru.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Ipmi/Lan.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Networks.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Networks/iLO.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/PCI.pm

share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/ARM/CPU.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Alpha.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Alpha/CPU.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Bios.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/NonLSB.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/OSRelease.pm

share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/USB.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Users.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Videos.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Maintenance.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Maintenance/Version.pm
%%NETDISC%%share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery.pm
%%NETDISC%%share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery/Job.pm
%%NETDISC%%share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery/Version.pm
%%NETINV%%share/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory.pm
%%NETINV%%share/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory/Job.pm
%%NETINV%%share/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory/Version.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/WMI.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/WMI/Version.pm
%%WOL%%share/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
%%WOL%%share/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan/Version.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/AIX.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/BSD.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Batteries.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Constants.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Expiration.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Generic.pm

share/fusioninventory/lib/FusionInventory/Agent/Tools/Linux.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/MacOS.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Network.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/PowerSupplies.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/SNMP.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen/Acer.pm

share/fusioninventory/lib/FusionInventory/Agent/Tools/Unix.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Virtualization.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/API.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/Constants.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/LoadIndirectString.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/WTS.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/WideChar.pm
share/fusioninventory/lib/FusionInventory/Agent/Version.pm
share/fusioninventory/lib/FusionInventory/Agent/XML/Query.pm
share/fusioninventory/lib/FusionInventory/Agent/XML/Query/Inventory.pm

Return to bug 241207

Lines 2-11 Link Here

(-)private/p5-FusionInventory-Agent/Makefile (-19 / +17 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= FusionInventory-Agent	4	PORTNAME= FusionInventory-Agent
5	PORTVERSION= 2.4	5	PORTVERSION= 2.5.1
6	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
7	MASTER_SITES= CPAN	7	USE_GITHUB= yes
8	MASTER_SITE_SUBDIR= CPAN:GBOUGARD	8	GH_ACCOUNT= fusioninventory
9	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
10		10
11	MAINTAINER= freebsd@simweb.ch	11	MAINTAINER= freebsd@simweb.ch
Lines 16-28 Link Here
16		16
17	BUILD_DEPENDS= ${RUN_DEPENDS}	17	BUILD_DEPENDS= ${RUN_DEPENDS}
18	RUN_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \	18	RUN_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \
		19	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
19	p5-libwww>=0:www/p5-libwww \	20	p5-libwww>=0:www/p5-libwww \
20	p5-Net-IP>=0:net-mgmt/p5-Net-IP \	21	p5-Net-IP>=0:net-mgmt/p5-Net-IP \
		22	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
		23	p5-Proc-PID-File>=0:devel/p5-Proc-PID-File \
21	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \	24	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
22	p5-Text-Template>=0:textproc/p5-Text-Template \	25	p5-Text-Template>=0:textproc/p5-Text-Template \
23	p5-XML-TreePP>=0:textproc/p5-XML-TreePP	26	p5-XML-TreePP>=0:textproc/p5-XML-TreePP \
		27	p5-XML-XPath>=0:textproc/p5-XML-XPath
24	TEST_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \	28	TEST_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
25	p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
26	p5-HTTP-Proxy>=0:www/p5-HTTP-Proxy \	29	p5-HTTP-Proxy>=0:www/p5-HTTP-Proxy \
27	p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \	30	p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
28	p5-HTTP-Server-Simple-Authen>=0:www/p5-HTTP-Server-Simple-Authen \	31	p5-HTTP-Server-Simple-Authen>=0:www/p5-HTTP-Server-Simple-Authen \
Lines 38-52 Link Here
38	p5-Test-MockObject>=0:devel/p5-Test-MockObject \	41	p5-Test-MockObject>=0:devel/p5-Test-MockObject \
39	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings	42	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
40		43
41	CONFLICTS= p5-FusionInventory-Agent-Task-NetDiscovery-* \	44	OPTIONS_DEFINE= CUPS DMIDECODE DEPLOY NETDISC NETINV PCIUTILS \
42	p5-FusionInventory-Agent-Task-SNMPQuery-*
43
44	OPTIONS_DEFINE= CUPS DAEMON DMIDECODE DEPLOY NETDISC NETINV PCIUTILS \
45	SSL VMWARE WOL ZLIB	45	SSL VMWARE WOL ZLIB
46	OPTIONS_DEFAULT= DMIDECODE PCIUTILS ZLIB	46	OPTIONS_DEFAULT= DMIDECODE PCIUTILS ZLIB
47	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
48		48
49	DAEMON_DESC= Daemon mode, with opt. web interface
50	DEPLOY_DESC= Deployment task	49	DEPLOY_DESC= Deployment task
51	DMIDECODE_DESC= Dmidecode hardware information	50	DMIDECODE_DESC= Dmidecode hardware information
52	NETDISC_DESC= Network discovery task	51	NETDISC_DESC= Network discovery task
Lines 62-84 Link Here
62	USE_RC_SUBR= fusioninventory	61	USE_RC_SUBR= fusioninventory
63		62
64	CUPS_RUN_DEPENDS= p5-Net-CUPS>=0.6:print/p5-Net-CUPS	63	CUPS_RUN_DEPENDS= p5-Net-CUPS>=0.6:print/p5-Net-CUPS
65	DAEMON_RUN_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
66	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
67	p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
68	DEPLOY_RUN_DEPENDS= p5-Archive-Extract>=0:archivers/p5-Archive-Extract \	64	DEPLOY_RUN_DEPENDS= p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
69	p5-SHA>=0:security/p5-SHA \	65	p5-SHA>=0:security/p5-SHA \
70	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \	66	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
71	p5-JSON>=0:converters/p5-JSON \	67	p5-JSON>=0:converters/p5-JSON \
		68	p5-Net-Ping>=2.67:net/p5-Net-Ping \
72	p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \	69	p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
73	p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
74	p5-URI-Escape-XS>=0:www/p5-URI-Escape-XS	70	p5-URI-Escape-XS>=0:www/p5-URI-Escape-XS
75	# Wants URI::Escape, ports tree has URI::Escape::XS, seems drop-in replacement	71	# Wants URI::Escape, ports tree has URI::Escape::XS, seems drop-in replacement
76	DMIDECODE_RUN_DEPENDS= dmidecode:sysutils/dmidecode	72	DMIDECODE_RUN_DEPENDS= dmidecode>=3.2:sysutils/dmidecode
77	NETDISC_RUN_DEPENDS= nmap:security/nmap \	73	NETDISC_RUN_DEPENDS= p5-Net-NBName>=0:net/p5-Net-NBName \
78	p5-Net-NBName>=0:net/p5-Net-NBName \	74	p5-Net-Ping>=2.67:net/p5-Net-Ping \
79	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP	75	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
		76	p5-Thread-Queue>=0:devel/p5-Thread-Queue
80	NETINV_RUN_DEPENDS= p5-Crypt-DES>=0:security/p5-Crypt-DES \	77	NETINV_RUN_DEPENDS= p5-Crypt-DES>=0:security/p5-Crypt-DES \
81	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP	78	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
		79	p5-Thread-Queue>=0:devel/p5-Thread-Queue
82	PCIUTILS_RUN_DEPENDS+= lspci:sysutils/pciutils	80	PCIUTILS_RUN_DEPENDS+= lspci:sysutils/pciutils
83	SSL_RUN_DEPENDS= p5-IO-Socket-SSL>=1.14:security/p5-IO-Socket-SSL \	81	SSL_RUN_DEPENDS= p5-IO-Socket-SSL>=1.14:security/p5-IO-Socket-SSL \
84	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https	82	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https

Lines 4-16 Link Here

(-)private/p5-FusionInventory-Agent/files/patch-Makefile.PL (-13 / +22 lines)
4	- Set LOCALSTATEDIR to /var/run as done in this ports tree	4	- Set LOCALSTATEDIR to /var/run as done in this ports tree
5	- Install agent.cfg as agent.cfg.sample	5	- Install agent.cfg as agent.cfg.sample
6		6
7	--- Makefile.PL.orig 2018-02-22 21:27:09 UTC	7	--- Makefile.PL.orig 2019-07-01 15:37:06 UTC
8	+++ Makefile.PL	8	+++ Makefile.PL
9	@@ -157,22 +157,12 @@ sub constants {	9	@@ -162,25 +162,15 @@
10		10
11	# for some reason, initialising variables from the global scope doesn't work	11	# for some reason, initialising variables from the global scope doesn't work
12	%variables = (	12	%variables = (
13	- PREFIX => '/usr/local',	13	- PREFIX => '/usr/local',
		14	VERSION => '',
		15	COMMENTS => "Platform : $Config{myuname},Build date: ".gmtime()." (GMT)",
		16	RAWCOMMENTS => '',
14	- INSTALLSCRIPT => '$(PREFIX)/bin',	17	- INSTALLSCRIPT => '$(PREFIX)/bin',
15	- INSTALLSITESCRIPT => '$(PREFIX)/bin',	18	- INSTALLSITESCRIPT => '$(PREFIX)/bin',
16	- INSTALLVENDORSCRIPT => '$(PREFIX)/bin',	19	- INSTALLVENDORSCRIPT => '$(PREFIX)/bin',
Lines 30-45 Link Here
30	);	33	);
31		34
32	# allow variables defined on command line to override defaults	35	# allow variables defined on command line to override defaults
33	@@ -220,11 +210,7 @@ sub install {	36	@@ -242,14 +232,11 @@
34		37	$(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
35	config_install :	38	for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \
36	install -d -m 755 $(DESTDIR)$(SYSCONFDIR)	39	do \
37	- if [ -f $(DESTDIR)/$(SYSCONFDIR)/agent.cfg ]; then \	40	- if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
38	- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.new; \	41	- $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
39	- else \	42	- $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
40	- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg; \	43	- $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
41	- fi	44	- else \
42	+ install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.sample	45	- $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config; \
		46	- $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \
		47	+ if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config.sample; then \
		48	+ $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.sample; \
		49	fi; \
		50	+ $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.sample; \
		51	+ $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.sample; \
		52	done
43	$(ABSPERLRUN) -pi \	53	$(ABSPERLRUN) -pi \
44	-e "s\|=> undef, # SYSCONFDIR.*\|=> '$(SYSCONFDIR)',\|;" \	54	-e "s\|=> undef, # SYSCONFDIR.*\|=> '$(SYSCONFDIR)',\|;" \
45	$(DESTDIR)$(DATADIR)/lib/FusionInventory/Agent/Config.pm