- Update to 1.3.2.

- Add LICENSE.
- Now the mandatory Apache version starts on 2.0+.

Requested by:	Mariusz Stankiewicz <mariusz.stankiewicz@dfm.com.pl>
		Raynaud Alexandre <service.info@ville-sallanches.fr>
		James Chang <james.technew@gmail.com>

3 files changed, 11 insertions, 25 deletions

diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index 72aec1ef8246..4e77506c911a 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -5,24 +5,24 @@
 # $FreeBSD$
 
 PORTNAME=	ocsinventory-ng
-PORTVERSION=	1.02.1
+PORTVERSION=	1.3.2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/ocsinventory/OCS%20Inventory%20NG/1.02
+MASTER_SITES=	http://launchpad.net/ocsinventory-server/stable-${PORTVERSION:R}/${PORTVERSION}/+download/
 DISTNAME=	OCSNG_UNIX_SERVER-${PORTVERSION}
 
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Open Computer and Software Inventory Next Generation
 
-RUN_DEPENDS=	${PORTSDIR}/www/mod_perl \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
+RUN_DEPENDS=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
-		${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
 		${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
 		${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
 
-USE_APACHE=	1.3+
+FETCH_ARGS=
+LICENSE=	GPLv2
+USE_APACHE=	2.0+
 USE_MYSQL=	yes
 WANT_PHP_WEB=	yes
 DEFAULT_PHP_VER=	5
diff --git a/net-mgmt/ocsinventory-ng/distinfo b/net-mgmt/ocsinventory-ng/distinfo
index 37a935113561..6129c13cb07b 100644
--- a/net-mgmt/ocsinventory-ng/distinfo
+++ b/net-mgmt/ocsinventory-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (OCSNG_UNIX_SERVER-1.02.1.tar.gz) = 8242146491fbaf84df02ebdfab93fe28
-SHA256 (OCSNG_UNIX_SERVER-1.02.1.tar.gz) = 4fcea18ff0955b57064dfd9cfe3333ee7876c08bd0221381509c7c2aaa9c5699
-SIZE (OCSNG_UNIX_SERVER-1.02.1.tar.gz) = 1488981
+MD5 (OCSNG_UNIX_SERVER-1.3.2.tar.gz) = aa933f6d9f2bc6071dc3f9f0e669ab33
+SHA256 (OCSNG_UNIX_SERVER-1.3.2.tar.gz) = cf75c3120a529c275463a76dbe787d391757487ac38f057e0ff8c7a88714761a
+SIZE (OCSNG_UNIX_SERVER-1.3.2.tar.gz) = 1513372
diff --git a/net-mgmt/ocsinventory-ng/pkg-plist b/net-mgmt/ocsinventory-ng/pkg-plist
index 382eca631935..02f991e91518 100644
--- a/net-mgmt/ocsinventory-ng/pkg-plist
+++ b/net-mgmt/ocsinventory-ng/pkg-plist
@@ -13,6 +13,7 @@
 %%DATADIR%%/Apache/Ocsinventory/Interface/Internals.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Inventory.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Ipdiscover.pm
+%%DATADIR%%/Apache/Ocsinventory/Interface/Updates.pm
 %%DATADIR%%/Apache/Ocsinventory/Map.pm
 %%DATADIR%%/Apache/Ocsinventory/SOAP.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Download.pm
@@ -41,18 +42,6 @@
 %%DATADIR%%/Apache/Ocsinventory/Server/Modperl2.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/System.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/System/Config.pm
-%%DATADIR%%/Apache/binutils/ipdiscover-util.README
-%%DATADIR%%/Apache/binutils/ipdiscover-util.pl
-%%DATADIR%%/Apache/binutils/ocs-errors
-%%DATADIR%%/Apache/binutils/ocsinventory-injector.README
-%%DATADIR%%/Apache/binutils/ocsinventory-injector.pl
-%%DATADIR%%/Apache/binutils/ocsinventory-log.README
-%%DATADIR%%/Apache/binutils/ocsinventory-log.pl
-%%DATADIR%%/Apache/binutils/soap-client.README
-%%DATADIR%%/Apache/binutils/soap-client.pl
-%%DATADIR%%/Apache/etc/logrotate.d/ocsinventory-server
-%%DATADIR%%/Apache/etc/ocsinventory/ocsinventory-reports.conf
-%%DATADIR%%/Apache/etc/ocsinventory/ocsinventory-server.conf
 %%DATADIR%%/dtd/Interface/get_computers_V1-request.dtd
 %%DATADIR%%/dtd/file_request.dtd
 %%DATADIR%%/dtd/inventory_reply.dtd
@@ -294,6 +283,7 @@
 %%DATADIR%%/ocsreports/require/function_table_html.php
 %%DATADIR%%/ocsreports/resultats.php
 %%DATADIR%%/ocsreports/rules_redistrib.php
+%%DATADIR%%/ocsreports/security.php
 %%DATADIR%%/ocsreports/server_redistrib.php
 %%DATADIR%%/ocsreports/tele_activate.php
 %%DATADIR%%/ocsreports/tele_actives.php
@@ -315,10 +305,6 @@
 @dirrm %%DATADIR%%/ocsreports
 @dirrm %%DATADIR%%/dtd/Interface
 @dirrm %%DATADIR%%/dtd
-@dirrm %%DATADIR%%/Apache/etc/ocsinventory
-@dirrm %%DATADIR%%/Apache/etc/logrotate.d
-@dirrm %%DATADIR%%/Apache/etc
-@dirrm %%DATADIR%%/Apache/binutils
 @dirrm %%DATADIR%%/Apache/Ocsinventory/Server/System
 @dirrm %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Update
 @dirrm %%DATADIR%%/Apache/Ocsinventory/Server/Inventory