Attachment #211807 for bug #244263

View | Details | Raw Unified | Return to bug 244263
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= FusionInventory-Agent	4	PORTNAME= FusionInventory-Agent
5	PORTVERSION= 2.4	5	PORTVERSION= 2.5.2
6	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
7	MASTER_SITES= CPAN	7	MASTER_SITES= CPAN
8	MASTER_SITE_SUBDIR= CPAN:GBOUGARD	8	MASTER_SITE_SUBDIR= CPAN:GBOUGARD

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519161277	1	TIMESTAMP = 1582315000
2	SHA256 (FusionInventory-Agent-2.4.tar.gz) = 9dc86f1bb4786d7b141824a007a0da1183c2451c33f8e3e9c958c7d6cce89885	2	SHA256 (FusionInventory-Agent-2.5.2.tar.gz) = 37ee3b83600b99b0f552d3c41be0e9c3fb04faf57c5e709aa8c58750810df0cc
3	SIZE (FusionInventory-Agent-2.4.tar.gz) = 2501564	3	SIZE (FusionInventory-Agent-2.5.2.tar.gz) = 2700174




--- Makefile.PL.orig	2020-02-21 21:14:44.416901000 +0100
+++ Makefile.PL	2020-02-21 21:15:41.844326000 +0100
@@ -163,25 +163,15 @@
- Set LOCALSTATEDIR to /var/run as done in this ports tree
- Install agent.cfg as agent.cfg.sample

--- Makefile.PL.orig	2018-02-22 21:27:09 UTC
+++ Makefile.PL
@@ -157,22 +157,12 @@ sub constants {
 
     # 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
@@ -243,14 +233,9 @@
 	$(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
 	for config in agent.cfg $(shell cd etc; echo *-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; \
-	  fi; \
 	done
 	$(ABSPERLRUN) -pi \
 	    -e "s|=> undef, # SYSCONFDIR.*|=> '$(SYSCONFDIR)',|;" \
 	        $(DESTDIR)$(DATADIR)/lib/FusionInventory/Agent/Config.pm




bin/fusioninventory-agent
bin/fusioninventory-esx
bin/fusioninventory-injector
bin/fusioninventory-inventory
bin/fusioninventory-netdiscovery
bin/fusioninventory-netinventory
bin/fusioninventory-remoteinventory
bin/fusioninventory-wakeonlan
etc/fusioninventory/agent.cfg.new
etc/fusioninventory/inventory-server-plugin.cfg.new
etc/fusioninventory/proxy-server-plugin.cfg.new
etc/fusioninventory/proxy2-server-plugin.cfg.new
etc/fusioninventory/server-test-plugin.cfg.new
etc/fusioninventory/ssl-server-plugin.cfg.new
%%PERL5_MAN1%%/fusioninventory-agent.1.gz
%%PERL5_MAN1%%/fusioninventory-esx.1.gz
%%PERL5_MAN1%%/fusioninventory-injector.1.gz
%%PERL5_MAN1%%/fusioninventory-inventory.1.gz
%%PERL5_MAN1%%/fusioninventory-netdiscovery.1.gz
%%PERL5_MAN1%%/fusioninventory-netinventory.1.gz
%%PERL5_MAN1%%/fusioninventory-remoteinventory.1.gz
%%PERL5_MAN1%%/fusioninventory-wakeonlan.1.gz
share/fusioninventory/edid.ids
share/fusioninventory/html/favicon.ico
share/fusioninventory/html/index.tpl

share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client/OCS.pm
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
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/EatonEpdu.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Epson.pm
share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/FreeBSD.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/Ricoh.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/Deploy/DiskFree.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/File.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Job.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Maintenance.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/P2P.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/UserCheck.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/UserCheck/WTS.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
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Battery.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Bios.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Memory.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Ports.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Psu.pm
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/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/Generic/Printers.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Processes.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Remote_Mgmt.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Remote_Mgmt/LiteManager.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Remote_Mgmt/TeamViewer.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Rudder.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/SSH.pm

share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Pacman.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/RPM.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Slackware.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Snap.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Storages.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Storages/3ware.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Storages/HP.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/Linux/MIPS/CPU.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Memory.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Networks/DockerMacvlan.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Networks/FibreChannel.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/PowerPC.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/PowerPC/Bios.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
share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery/Job.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery/Version.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory.pm
share/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory/Job.pm
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

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/HPUX.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Apc.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Brocade.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Qlogic.pm
share/fusioninventory/lib/FusionInventory/Agent/Tools/Hostname.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/NetAdapter.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 244263

Lines 1-16 Link Here

(-)files/patch-Makefile.PL (-20 / +19 lines)
1	Fix some locations specific to the ports tree i.e.	1	--- Makefile.PL.orig 2020-02-21 21:14:44.416901000 +0100
2		2	+++ Makefile.PL 2020-02-21 21:15:41.844326000 +0100
3	- Fixes location of manpages resulting to be in site_perl	3	@@ -163,25 +163,15 @@
4	- Set LOCALSTATEDIR to /var/run as done in this ports tree
5	- Install agent.cfg as agent.cfg.sample
6
7	--- Makefile.PL.orig 2018-02-22 21:27:09 UTC
8	+++ Makefile.PL
9	@@ -157,22 +157,12 @@ sub constants {
10		4
11	# for some reason, initialising variables from the global scope doesn't work	5	# for some reason, initialising variables from the global scope doesn't work
12	%variables = (	6	%variables = (
13	- PREFIX => '/usr/local',	7	- PREFIX => '/usr/local',
		8	VERSION => '',
		9	COMMENTS => "Platform : $Config{myuname},Build date: ".gmtime()." (GMT)",
		10	RAWCOMMENTS => '',
14	- INSTALLSCRIPT => '$(PREFIX)/bin',	11	- INSTALLSCRIPT => '$(PREFIX)/bin',
15	- INSTALLSITESCRIPT => '$(PREFIX)/bin',	12	- INSTALLSITESCRIPT => '$(PREFIX)/bin',
16	- INSTALLVENDORSCRIPT => '$(PREFIX)/bin',	13	- INSTALLVENDORSCRIPT => '$(PREFIX)/bin',
Lines 30-45 Link Here
30	);	27	);
31		28
32	# allow variables defined on command line to override defaults	29	# allow variables defined on command line to override defaults
33	@@ -220,11 +210,7 @@ sub install {	30	@@ -243,14 +233,9 @@
34		31	$(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
35	config_install :	32	for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \
36	install -d -m 755 $(DESTDIR)$(SYSCONFDIR)	33	do \
37	- if [ -f $(DESTDIR)/$(SYSCONFDIR)/agent.cfg ]; then \	34	- if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \
38	- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.new; \	35	$(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
39	- else \	36	$(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
40	- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg; \	37	$(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
41	- fi	38	- else \
42	+ install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.sample	39	- $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config; \
		40	- $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \
		41	- fi; \
		42	done
43	$(ABSPERLRUN) -pi \	43	$(ABSPERLRUN) -pi \
44	-e "s\|=> undef, # SYSCONFDIR.*\|=> '$(SYSCONFDIR)',\|;" \	44	-e "s\|=> undef, # SYSCONFDIR.*\|=> '$(SYSCONFDIR)',\|;" \
45	$(DESTDIR)$(DATADIR)/lib/FusionInventory/Agent/Config.pm