summaryrefslogtreecommitdiff
path: root/net/ocsinventory-agent/patches/patch-ac
blob: b4ccb987f2f7406afd08422e5f29a7710599630b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
$NetBSD: patch-ac,v 1.2 2010/12/01 21:00:51 bouyer Exp $

--- 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;
 
-# Hack to be able to run a post install script
-sub MY::postamble
-{
-
-	my $re;
-
-	$re = '
-install :: all pure_install doc_install
-	$(NOECHO) $(NOOP)';
-
-	$re .= "\n\t[ ! -f run-postinst ] || $^X postinst.pl\n";
-
-    return $re;
-}
-
 require 'lib/Ocsinventory/Agent/Config.pm';
 use Config;
 
@@ -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 standalone binary with PAR::Packer 
@@ -54,14 +41,6 @@
 
 
 
-if (defined ($ENV{PERL_AUTOINSTALL}) || defined ($ENV{PERL_AUTOINSTALL})) {
-    unlink 'run-postinst';
-} else {
-    open POSTINST, '>run-postinst' or die $!;
-    close POSTINST;
-}
-
-
 if (!can_use('Compress::Zlib')) {
     print "Please install Compress::Zlib if you use an OCS server prior 1.02.\n";
 }
@@ -99,7 +78,7 @@
     $archname = $t[0];
 };
 if ($^O =~ /(linux|bsd)/i && (!$archname ||$archname =~ /(i[3456x]86|x86_64|amd64)/i)) {
-    foreach (qw/dmidecode lspci/) {
+    foreach (qw/dmidecode pcictl/) {
         if (!can_run($_)) {
             print "\n";
             print "[WARNING] $_ is needed if you want a complete inventory on x86 and AMD64/x86_64.\n";