update Sat Nov 7 12:37:00 PST 2009
[pkgsrc.git] / security / prelude-correlator / patches / patch-aa
index 30d5f24..5c820ea 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2009/10/02 10:15:10 hasso Exp $
+$NetBSD: patch-aa,v 1.4 2009/11/07 18:30:29 hasso Exp $
 
 --- setup.py.orig      2009-07-09 18:55:53 +0300
 +++ setup.py   2009-09-30 09:58:19 +0300
@@ -6,9 +6,9 @@ $NetBSD: patch-aa,v 1.3 2009/10/02 10:15:10 hasso Exp $
  
                  root = self.root or ""
                  for dir, files in data_files:
--                        dir = os.path.abspath(os.path.join(root, prefix, dir))
+-                        dir = os.path.abspath(root + os.sep + os.path.join(prefix, dir))
 +                        if dir != "@PRELUDE_HOME@":
-+                                dir = os.path.abspath(os.path.join(root, prefix, dir))
++                                dir = os.path.abspath(root + os.sep + os.path.join(prefix, dir))
  
                          self.mkpath(dir)
                          for f in files:
@@ -26,8 +26,8 @@ $NetBSD: patch-aa,v 1.3 2009/10/02 10:15:10 hasso Exp $
  else:
          package_data = {}
 -        data_files = [ ("etc/prelude-correlator", ["prelude-correlator.conf"]),
--                       ("var/lib/prelude-correlator", ["PreludeCorrelator/plugins/dshield.dat"]) ]
-+        data_files = [ ("@PRELUDE_HOME@", ["PreludeCorrelator/plugins/dshield.dat"]) ]
+-                       ("var/lib/prelude-correlator", ["PreludeCorrelator/plugins/dshield.dat", "PreludeCorrelator/plugins/spamhaus_drop.dat"]) ]
++        data_files = [ ("@PRELUDE_HOME@", ["PreludeCorrelator/plugins/dshield.dat", "PreludeCorrelator/plugins/spamhaus_drop.dat"]) ]
  
  setup(
          name="prelude-correlator",