3 files changed, 44 insertions, 24 deletions

diff --git a/net-mgmt/ocsinventory-agent/Makefile b/net-mgmt/ocsinventory-agent/Makefile
index 8c7d5dff1c50..99b4a379b377 100644
--- a/net-mgmt/ocsinventory-agent/Makefile
+++ b/net-mgmt/ocsinventory-agent/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	Ocsinventory
-PORTVERSION=	0.0.9.2
-PORTREVISION=	1
+PORTVERSION=	1.02
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://nana.rulezlan.org/~goneri/ocsinventory-agent/
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	ocsinventory
 PKGNAMESUFFIX=	-Agent
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+DISTNAME=	OCSNG_UNIX_AGENT-${PORTVERSION}
 
-MAINTAINER=	freebsd@rootxs.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Keep track of the computers configuration and software
 
 BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
@@ -26,6 +26,7 @@ BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 USE_PERL5=	yes
 PERL_CONFIGURE=	yes
 IS_INTERACTIVE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-1.0.1
 
 MAN1=		ocsinventory-agent.1
 
diff --git a/net-mgmt/ocsinventory-agent/distinfo b/net-mgmt/ocsinventory-agent/distinfo
index 553b1156acbd..2dff375e0140 100644
--- a/net-mgmt/ocsinventory-agent/distinfo
+++ b/net-mgmt/ocsinventory-agent/distinfo
@@ -1,3 +1,3 @@
-MD5 (Ocsinventory-Agent-0.0.9.2.tar.gz) = 9d2461e1e15845e4dee3cb1be2d0f518
-SHA256 (Ocsinventory-Agent-0.0.9.2.tar.gz) = d9b7214e22b6a5983b0fa9b419501f8951c1b7dc93621f5af5bde4d900818518
-SIZE (Ocsinventory-Agent-0.0.9.2.tar.gz) = 758368
+MD5 (OCSNG_UNIX_AGENT-1.02.tar.gz) = 749501586e0c634680c13000b3b2851e
+SHA256 (OCSNG_UNIX_AGENT-1.02.tar.gz) = f430264a46c523d5f27ef83ec6c214df4f2354b0191edbf18951c1474dd5ab2b
+SIZE (OCSNG_UNIX_AGENT-1.02.tar.gz) = 1392033
diff --git a/net-mgmt/ocsinventory-agent/pkg-plist b/net-mgmt/ocsinventory-agent/pkg-plist
index fd595144068f..c6a1fd1590fb 100644
--- a/net-mgmt/ocsinventory-agent/pkg-plist
+++ b/net-mgmt/ocsinventory-agent/pkg-plist
@@ -42,11 +42,10 @@ bin/ocsinventory-agent
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode/Bios.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode/Memory.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode/Memory.pm.orig
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode/Memory.pm.rej
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode/Ports.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode/Slots.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Hostname.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Ipmi.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Lspci.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Lspci/Controllers.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Lspci/Modems.pm
@@ -63,17 +62,6 @@ bin/ocsinventory-agent
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs/PowerPC.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/CPU.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Controllers.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Debian.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Fedora.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Gentoo.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Knoppix.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Mandrake.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Mandriva.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Redhat.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Slackware.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/SuSE.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Trustix.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/Ubuntu.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Domains.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Drives.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Mem.pm
@@ -81,10 +69,38 @@ bin/ocsinventory-agent
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Network/Networks.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Sounds.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages.pm
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages.pm.orig
-%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages.pm.rej
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Sys.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Uptime.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages/3ware.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages/Adaptec.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages/HP.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages/Lsilogic.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages/ServeRaid.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Debian.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Fedora.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Gentoo.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Knoppix.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Mandrake.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Mandriva.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Redhat.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Slackware.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/SuSE.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Trustix.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Ubuntu.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/LSB.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Bios.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/CPU.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Domains.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Drives.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/IPv4.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Mem.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Networks.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Packages.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Printers.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Sound.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Uptime.pm
+%%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS/Video.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Solaris.pm
 %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Solaris/Bios.pm
@@ -123,9 +139,12 @@ bin/ocsinventory-agent
 @dirrm %%SITE_PERL%%/Ocsinventory/Agent/Option
 @dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Solaris
 @dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Network
-@dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro
 @dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Archs
+@dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB
+@dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Distro
+@dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux/Storages
 @dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Linux
+@dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/MacOS
 @dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Packaging
 @dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Lspci
 @dirrm %%SITE_PERL%%/Ocsinventory/Agent/Backend/OS/Generic/Dmidecode