[pkgsrc/trunk]: pkgsrc/security/prelude-pflogger Correct test for existing co...

[shannonjr <shannonjr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba012aa15586
branches:  trunk
changeset: 532886:ba012aa15586
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Mon Sep 03 14:44:25 2007 +0000

description:
Correct test for existing configuration file

diffstat:

 security/prelude-pflogger/Makefile         |   3 ++-
 security/prelude-pflogger/distinfo         |   4 ++--
 security/prelude-pflogger/patches/patch-aa |  10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r 1f8330109e03 -r ba012aa15586 security/prelude-pflogger/Makefile
--- a/security/prelude-pflogger/Makefile        Mon Sep 03 13:56:37 2007 +0000
+++ b/security/prelude-pflogger/Makefile        Mon Sep 03 14:44:25 2007 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/03 13:50:49 shannonjr Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/03 14:44:25 shannonjr Exp $
 #
 
 DISTNAME=      prelude-pflogger-0.9.0-rc2
 PKGNAME=       prelude-pflogger-0.9.0
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  http://prelude-ids.org/download/releases/
 
diff -r 1f8330109e03 -r ba012aa15586 security/prelude-pflogger/distinfo
--- a/security/prelude-pflogger/distinfo        Mon Sep 03 13:56:37 2007 +0000
+++ b/security/prelude-pflogger/distinfo        Mon Sep 03 14:44:25 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/09/03 13:50:49 shannonjr Exp $
+$NetBSD: distinfo,v 1.2 2007/09/03 14:44:25 shannonjr Exp $
 
 SHA1 (prelude-pflogger-0.9.0-rc2.tar.gz) = ae354809dae5f04392a1c93a88be4cf9993c3b43
 RMD160 (prelude-pflogger-0.9.0-rc2.tar.gz) = 7c5808b0ca515c8080c64b52aa0aae166831e4d4
 Size (prelude-pflogger-0.9.0-rc2.tar.gz) = 303763 bytes
-SHA1 (patch-aa) = ad1e951a74b045a22e577baf2cd19b47478d88a1
+SHA1 (patch-aa) = 054d2cf740993ed66c7b7845ef7365996e537118
 SHA1 (patch-ab) = 75a78b3d50067b07448aff9fde565f8bd5ab1b54
diff -r 1f8330109e03 -r ba012aa15586 security/prelude-pflogger/patches/patch-aa
--- a/security/prelude-pflogger/patches/patch-aa        Mon Sep 03 13:56:37 2007 +0000
+++ b/security/prelude-pflogger/patches/patch-aa        Mon Sep 03 14:44:25 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/09/03 13:50:49 shannonjr Exp $
+$NetBSD: patch-aa,v 1.2 2007/09/03 14:44:25 shannonjr Exp $
 
 --- Makefile.am.orig   2005-09-18 08:30:01.000000000 -0600
 +++ Makefile.am
@@ -17,10 +17,10 @@
 -        else                                                                                                  \
 -              $(INSTALL) -d -m 700 $(DESTDIR)$(configdir);                                                    \
 -                $(INSTALL) -m 600 $(top_srcdir)/prelude-pflogger.conf $(DESTDIR)$(configdir)/;                  \
-+      $(INSTALL) -m 644 $(top_srcdir)/prelude-pflogger.conf @EGDIR@/;                 \
-+      @if ! test -f $(configdir)/prelude-pflogger.conf; then                          \
-+              $(INSTALL) -d -m 755 $(configdir);                                      \
-+                $(INSTALL) -m 644 $(top_srcdir)/prelude-pflogger.conf $(configdir)/;  \
++      $(INSTALL) -m 644 $(top_srcdir)/prelude-pflogger.conf /usr/pkg/share/examples/prelude-pflogger/;
++      @if test \! -f $(DESTDIR)$(configdir)/prelude-pflogger.conf; then                       \
++              $(INSTALL) -d -m 755 $(configdir);                                              \
++                $(INSTALL) -m 644 $(top_srcdir)/prelude-pflogger.conf $(DESTDIR)$(configdir)/;        \
          fi
  
  uninstall-local: