2 files changed, 48 insertions, 79 deletions

diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile
index 91a1449476d6..9bd388cc6854 100644
--- a/net-mgmt/p5-FusionInventory-Agent/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent/Makefile
@@ -41,87 +41,16 @@ PCIUTILS_DESC=	Pciutils hardware information
 USES=		gmake perl5
 USE_PERL5=	configure
 
-MAN1=		fusioninventory-agent.1 \
-		fusioninventory-injector.1
-MAN3=		FusionInventory::Agent.3 \
-		FusionInventory::Agent::Config.3 \
-		FusionInventory::Agent::HTTP::Client.3 \
-		FusionInventory::Agent::HTTP::Client::Fusion.3 \
-		FusionInventory::Agent::HTTP::Client::OCS.3 \
-		FusionInventory::Agent::HTTP::Protocol::https.3 \
-		FusionInventory::Agent::HTTP::Server.3 \
-		FusionInventory::Agent::Logger.3 \
-		FusionInventory::Agent::Logger::Backend.3 \
-		FusionInventory::Agent::Logger::File.3 \
-		FusionInventory::Agent::Logger::Stderr.3 \
-		FusionInventory::Agent::Logger::Syslog.3 \
-		FusionInventory::Agent::Scheduler.3 \
-		FusionInventory::Agent::Storage.3 \
-		FusionInventory::Agent::Target.3 \
-		FusionInventory::Agent::Target::Local.3 \
-		FusionInventory::Agent::Target::Server.3 \
-		FusionInventory::Agent::Target::Stdout.3 \
-		FusionInventory::Agent::Task.3 \
-		FusionInventory::Agent::Task::Inventory.3 \
-		FusionInventory::Agent::Task::Inventory::Inventory.3 \
-		FusionInventory::Agent::Task::WakeOnLan.3 \
-		FusionInventory::Agent::Tools.3 \
-		FusionInventory::Agent::Tools::AIX.3 \
-		FusionInventory::Agent::Tools::Generic.3 \
-		FusionInventory::Agent::Tools::HPUX.3 \
-		FusionInventory::Agent::Tools::Hostname.3 \
-		FusionInventory::Agent::Tools::Linux.3 \
-		FusionInventory::Agent::Tools::MacOS.3 \
-		FusionInventory::Agent::Tools::Network.3 \
-		FusionInventory::Agent::Tools::Screen.3 \
-		FusionInventory::Agent::Tools::Solaris.3 \
-		FusionInventory::Agent::Tools::Unix.3 \
-		FusionInventory::Agent::Tools::Win32.3 \
-		FusionInventory::Agent::XML::Query.3 \
-		FusionInventory::Agent::XML::Query::Inventory.3 \
-		FusionInventory::Agent::XML::Query::Prolog.3 \
-		FusionInventory::Agent::XML::Response.3
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCUPS}
-RUN_DEPENDS+=		p5-Net-CUPS>=0.6:${PORTSDIR}/print/p5-Net-CUPS
-.endif
-
-.if ${PORT_OPTIONS:MHTTP}
-RUN_DEPENDS+=		p5-HTTP-Daemon>=0:${PORTSDIR}/www/p5-HTTP-Daemon
-.endif
-
-.if ${PORT_OPTIONS:MZLIB}
-RUN_DEPENDS+=		p5-Compress-Raw-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib
-.endif
-
-.if ${PORT_OPTIONS:MSSL}
-RUN_DEPENDS+=		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
+CUPS_RUN_DEPENDS=	p5-Net-CUPS>=0.6:${PORTSDIR}/print/p5-Net-CUPS
+HTTP_RUN_DEPENDS=	p5-HTTP-Daemon>=0:${PORTSDIR}/www/p5-HTTP-Daemon
+ZLIB_RUN_DEPENDS=	p5-Compress-Raw-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib
+SSL_RUN_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
 			p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https
-.endif
+DMIDECODE_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode
+PCIUTILS_RUN_DEPENDS+=	lspci:${PORTSDIR}/sysutils/pciutils
+MMAP_RUN_DEPENDS+=	nmap:${PORTSDIR}/security/nmap
 
-.if ${PORT_OPTIONS:MDMIDECODE}
-RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
-.endif
-
-.if ${PORT_OPTIONS:MPCIUTILS}
-RUN_DEPENDS+=	lspci:${PORTSDIR}/sysutils/pciutils
-.endif
-
-.if ${PORT_OPTIONS:MNMAP}
-RUN_DEPENDS+=	nmap:${PORTSDIR}/security/nmap
-.endif
-
-post-patch-script:
-	@${ECHO_MSG} -n ">> Removing unneeded patched files..."
+post-patch:
 	@${FIND} ${WRKSRC} -type f \( -name '*.orig' \) -delete
-	@${ECHO_MSG} " [ DONE ]"
-
-post-install:
-	@if [ ! -f ${PREFIX}/etc/fusioninventory/agent.cfg ]; then \
-		${CP} -p ${PREFIX}/etc/fusioninventory/agent.cfg.sample ${PREFIX}/etc/fusioninventory/agent.cfg ; \
-	fi
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-FusionInventory-Agent/pkg-plist b/net-mgmt/p5-FusionInventory-Agent/pkg-plist
index 1c0605d58d7c..44621c1df2ba 100644
--- a/net-mgmt/p5-FusionInventory-Agent/pkg-plist
+++ b/net-mgmt/p5-FusionInventory-Agent/pkg-plist
@@ -3,6 +3,46 @@ bin/fusioninventory-injector
 @unexec if cmp -s %D/etc/fusioninventory/agent.cfg.sample %D/etc/fusioninventory/agent.cfg; then rm -f %D/etc/fusioninventory/agent.cfg; fi
 etc/fusioninventory/agent.cfg.sample
 @exec if [ ! -f %D/etc/fusioninventory/agent.cfg ] ; then cp -p %D/etc/fusioninventory/agent.cfg.sample %D/etc/fusioninventory/agent.cfg; fi
+%%PERL5_MAN3%%/FusionInventory::Agent.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Config.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::HTTP::Client.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::HTTP::Client::Fusion.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::HTTP::Client::OCS.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::HTTP::Protocol::https.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::HTTP::Server.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Logger.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Logger::Backend.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Logger::File.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Logger::Stderr.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Logger::Syslog.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Scheduler.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Storage.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Target.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Target::Local.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Target::Server.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Target::Stdout.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Task.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Task::Inventory.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Task::Inventory::Inventory.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Task::WakeOnLan.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::AIX.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::Generic.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::HPUX.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::Hostname.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::Linux.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::MacOS.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::Network.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::Screen.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::Solaris.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::Unix.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Tools::Win32.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::XML::Query.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::XML::Query::Inventory.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::XML::Query::Prolog.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::XML::Response.3.gz
+man/man1/fusioninventory-agent.1.gz
+man/man1/fusioninventory-injector.1.gz
 share/fusioninventory/lib/FusionInventory/Agent.pm
 share/fusioninventory/lib/FusionInventory/Agent/Config.pm
 share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client.pm