summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2010-12-05 20:31:32 +0000
committertron <tron@pkgsrc.org>2010-12-05 20:31:32 +0000
commite264ae63e13d8c9a4820bee8f1cb4c5485156a28 (patch)
tree4006d50aeab0484189ed84556990d42bf56a0ed1
parent79192dcd978ce0c1d72e1f252ff436ecbef6868a (diff)
downloadpkgsrc-e264ae63e13d8c9a4820bee8f1cb4c5485156a28.tar.gz
Pullup ticket #3294 - requested by bouyer
net/ocsinventory-agent: compatibility update Revisions pulled up: - net/ocsinventory-agent/Makefile 1.3 - net/ocsinventory-agent/distinfo 1.2 - net/ocsinventory-agent/patches/patch-ab 1.2 - net/ocsinventory-agent/patches/patch-ac 1.2 - net/ocsinventory-agent/patches/patch-ap 1.1 --- Module Name: pkgsrc Committed By: bouyer Date: Wed Dec 1 21:00:51 UTC 2010 Modified Files: pkgsrc/net/ocsinventory-agent: Makefile distinfo pkgsrc/net/ocsinventory-agent/patches: patch-ab patch-ac Added Files: pkgsrc/net/ocsinventory-agent/patches: patch-ap Log Message: Update to 1.1.2.1. Main motivation is to avoid warnings with perl 5.12. Other changes are mainly improvements in backend to support more OS, more OS variants or versions.
-rw-r--r--net/ocsinventory-agent/Makefile13
-rw-r--r--net/ocsinventory-agent/distinfo13
-rw-r--r--net/ocsinventory-agent/patches/patch-ab22
-rw-r--r--net/ocsinventory-agent/patches/patch-ac26
4 files changed, 37 insertions, 37 deletions
diff --git a/net/ocsinventory-agent/Makefile b/net/ocsinventory-agent/Makefile
index 5c310827861..33633481b24 100644
--- a/net/ocsinventory-agent/Makefile
+++ b/net/ocsinventory-agent/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/08/21 16:35:20 seb Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2010/12/05 20:31:32 tron Exp $
#
-
-DISTNAME= OCSNG_UNIX_AGENT-1.02
-PKGNAME= ocsinventory-agent-1.0.2
-PKGREVISION= 1
+VERS= 1.1.2.1
+DISTNAME= Ocsinventory-Agent-${VERS}
+PKGNAME= ocsinventory-agent-${VERS}
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ocsinventory/}
+MASTER_SITES= http://launchpad.net/ocsinventory-unix-agent/stable-1.1.2/ocsinventory-unix-agent-1.1.2.1/+download/
MAINTAINER= bouyer@NetBSD.org
HOMEPAGE= http://www.ocsinventory-ng.org/
@@ -21,7 +20,7 @@ DEPENDS+= p5-Proc-Daemon-[0-9]*:../../devel/p5-Proc-Daemon
DEPENDS+= dmidecode-[0-9]*:../../sysutils/dmidecode
.endif
-WRKSRC= ${WRKDIR}/Ocsinventory-Agent-1.0.1
+WRKSRC= ${WRKDIR}/Ocsinventory-Agent-${VERS}
BUILD_DEFS+= VARBASE
AUTO_MKDIRS=yes
diff --git a/net/ocsinventory-agent/distinfo b/net/ocsinventory-agent/distinfo
index d93ad4a73ab..79f7d84cd87 100644
--- a/net/ocsinventory-agent/distinfo
+++ b/net/ocsinventory-agent/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/08/16 18:25:53 bouyer Exp $
+$NetBSD: distinfo,v 1.1.1.1.10.1 2010/12/05 20:31:32 tron Exp $
-SHA1 (OCSNG_UNIX_AGENT-1.02.tar.gz) = 92660745140d1526568a3c02b0b4d8c7286f5e3f
-RMD160 (OCSNG_UNIX_AGENT-1.02.tar.gz) = db3ee9df9d94114b7b6ce5dcd2f0e862729d6056
-Size (OCSNG_UNIX_AGENT-1.02.tar.gz) = 1392033 bytes
+SHA1 (Ocsinventory-Agent-1.1.2.1.tar.gz) = ff8395bd281ddfdb9c3f9106b51aa75ac542f169
+RMD160 (Ocsinventory-Agent-1.1.2.1.tar.gz) = 8cd303df6f760d6ec4f64e79792544c4c8119227
+Size (Ocsinventory-Agent-1.1.2.1.tar.gz) = 1401670 bytes
SHA1 (patch-aa) = 5022b8b1f5e98c43f7da562412bd752956320f05
-SHA1 (patch-ab) = 04e70296c005a710f1b2470451c9872c7716ea26
-SHA1 (patch-ac) = 9be5237057924628cc4d24d7620270aa9a8fd459
+SHA1 (patch-ab) = 6eca9c4fb2f9971a10437e05d40cf0c98bbe2371
+SHA1 (patch-ac) = 352825dd73ab8b9f22d60c8c4056999bf8ff3b3f
SHA1 (patch-ad) = 5160c3ac8ae48eee578be50350c7c4ccfe74b045
SHA1 (patch-ae) = b801ad35b3bf13323e27fe6ebf638e295aa7771d
SHA1 (patch-af) = 8d156a6266ca6c2a7f0d8831585c9ce4e0944394
@@ -18,3 +18,4 @@ SHA1 (patch-al) = dd2ffdd4e9470677c5f0c622ae8e3c5a925843ac
SHA1 (patch-am) = 376f95a684729ce32ded34a1a62d8ef300e52529
SHA1 (patch-an) = 4b1e91e7f1719c84782f541cb3abc6e39f6b94e6
SHA1 (patch-ao) = 87c6edc945e90d990d3db28687113189a723852b
+SHA1 (patch-ap) = 1ccc2218c48355039b6af9732063b430607a70e4
diff --git a/net/ocsinventory-agent/patches/patch-ab b/net/ocsinventory-agent/patches/patch-ab
index 64bdc502577..6a2ae4cdcbc 100644
--- a/net/ocsinventory-agent/patches/patch-ab
+++ b/net/ocsinventory-agent/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/08/16 18:25:53 bouyer Exp $
+$NetBSD: patch-ab,v 1.1.1.1.10.1 2010/12/05 20:31:32 tron Exp $
---- lib/Ocsinventory/Agent/Config.pm.orig 2009-03-22 20:11:09.000000000 +0100
-+++ lib/Ocsinventory/Agent/Config.pm 2009-06-25 15:14:11.000000000 +0200
-@@ -8,9 +8,7 @@
+--- lib/Ocsinventory/Agent/Config.pm.orig 2010-10-12 20:02:53.000000000 +0200
++++ lib/Ocsinventory/Agent/Config.pm 2010-12-01 18:21:25.000000000 +0100
+@@ -67,9 +67,7 @@
- @{$config->{etcdir}} = ();
+ $self->{config}{etcdir} = [];
-- push (@{$config->{etcdir}}, '/etc/ocsinventory');
-- push (@{$config->{etcdir}}, '/usr/local/etc/ocsinventory');
-- push (@{$config->{etcdir}}, '/etc/ocsinventory-agent');
-+ push (@{$config->{etcdir}}, '@PKG_SYSCONFDIR@');
- push (@{$config->{etcdir}}, $ENV{HOME}.'/.ocsinventory');
+- push (@{$self->{config}{etcdir}}, '/etc/ocsinventory');
+- push (@{$self->{config}{etcdir}}, '/usr/local/etc/ocsinventory');
+- push (@{$self->{config}{etcdir}}, '/etc/ocsinventory-agent');
++ push (@{$self->{config}{etcdir}}, '@PKG_SYSCONFDIR@');
+ push (@{$self->{config}{etcdir}}, $ENV{HOME}.'/.ocsinventory'); # Should I?
- if (!$file || !-f $file) {
+ my $file;
diff --git a/net/ocsinventory-agent/patches/patch-ac b/net/ocsinventory-agent/patches/patch-ac
index c152cc3434c..1c798b91616 100644
--- a/net/ocsinventory-agent/patches/patch-ac
+++ b/net/ocsinventory-agent/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/08/16 18:25:53 bouyer Exp $
+$NetBSD: patch-ac,v 1.1.1.1.10.1 2010/12/05 20:31:32 tron Exp $
---- Makefile.PL.orig 2009-03-22 20:18:44.000000000 +0100
-+++ Makefile.PL 2009-08-16 17:56:58.000000000 +0200
+--- Makefile.PL.orig 2010-10-12 20:02:52.000000000 +0200
++++ Makefile.PL 2010-12-01 18:23:35.000000000 +0100
@@ -1,21 +1,6 @@
use inc::Module::Install;
@@ -21,24 +21,24 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/08/16 18:25:53 bouyer Exp $
- return $re;
-}
-
+ require 'lib/Ocsinventory/Agent/Config.pm';
use Config;
- name 'Ocsinventory-Agent';
-@@ -34,7 +19,7 @@
- recommends 'Proc::PID::File' => undef;
+@@ -42,6 +27,8 @@
install_script 'ocsinventory-agent';
--
+
+installdirs 'vendor';
++
# We want a release bundled with the needed dependency to be able to
- # prepare a standealone binay with PAR::Packer
-@@ -47,14 +32,6 @@
+ # prepare a standalone binary with PAR::Packer
+@@ -54,14 +41,6 @@
-if (defined ($ENV{PERL_AUTOINSTALL}) || defined ($ENV{PERL_AUTOINSTALL})) {
-- unlink 'run-postinst';
+- unlink 'run-postinst';
-} else {
- open POSTINST, '>run-postinst' or die $!;
- close POSTINST;
@@ -46,9 +46,9 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/08/16 18:25:53 bouyer Exp $
-
-
if (!can_use('Compress::Zlib')) {
- print "Please install Compress::Zlib if you use an OCS server prior 1.02.\n";
+ print "Please install Compress::Zlib if you use an OCS server prior 1.02.\n";
}
-@@ -77,7 +54,7 @@
+@@ -99,7 +78,7 @@
$archname = $t[0];
};
if ($^O =~ /(linux|bsd)/i && (!$archname ||$archname =~ /(i[3456x]86|x86_64|amd64)/i)) {
@@ -56,4 +56,4 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/08/16 18:25:53 bouyer Exp $
+ foreach (qw/dmidecode pcictl/) {
if (!can_run($_)) {
print "\n";
- print "[WARNING] $_ is needed if you want a complet inventory on x86 and AMD64/x86_64.\n";
+ print "[WARNING] $_ is needed if you want a complete inventory on x86 and AMD64/x86_64.\n";