Bump PKGREVISION: honour PKG_SYSCONFDIR for real. (i thought i fixed this

                  before but apparently i did not :/)

7 files changed, 18 insertions, 11 deletions

diff --git a/net/snort-mysql/Makefile b/net/snort-mysql/Makefile
index 7e8fce52a33..a1583b5b500 100644
--- a/net/snort-mysql/Makefile
+++ b/net/snort-mysql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/03/30 23:15:45 jmc Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/16 15:51:24 salo Exp $
 #
 
 .include "../../net/snort/Makefile.common"
 
 PKGNAME=        ${DISTNAME:S/-/-mysql-/}
+PKGREVISION=	1
 
 COMMENT=        Libpcap-based packet sniffer/logger using a MySQL database
 
diff --git a/net/snort-pgsql/Makefile b/net/snort-pgsql/Makefile
index 3243c1c1921..2c9ec2ec604 100644
--- a/net/snort-pgsql/Makefile
+++ b/net/snort-pgsql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2003/03/30 23:22:21 jmc Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/16 15:51:24 salo Exp $
 #
 
 .include "../../net/snort/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-pgsql-/}
+PKGREVISION=	1
 
 COMMENT=	Libpcap-based packet sniffer/logger using a PostgreSQL database
 
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 486d9b4351c..4e092fe81d9 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2002/11/09 13:44:43 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2003/04/16 15:51:22 salo Exp $
 #
+
 .include "Makefile.common"
+
+PKGREVISION=	1
+
 COMMENT=	Libpcap-based packet sniffer/logger
 
 USE_BUILDLINK2=	YES
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index 858d2790380..d5d15207c98 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2003/04/16 06:37:19 salo Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/04/16 15:51:22 salo Exp $
 #
 
 DISTNAME=	snort-2.0.0
@@ -13,6 +13,7 @@ HOMEPAGE=	http://www.snort.org/
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-libpcap-includes=${BUILDLINK_PREFIX.libpcap}/include
 CONFIGURE_ARGS+=	--with-libpcap-libraries=${BUILDLINK_PREFIX.libpcap}/lib
 
diff --git a/net/snort/distinfo b/net/snort/distinfo
index bd415f70140..5a84884413d 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2003/04/16 06:37:19 salo Exp $
+$NetBSD: distinfo,v 1.16 2003/04/16 15:51:23 salo Exp $
 
 SHA1 (snort-2.0.0.tar.gz) = 1fdb5656b7a84439da0cd9118f5a977098f0652b
 Size (snort-2.0.0.tar.gz) = 1556540 bytes
-SHA1 (patch-aa) = 8cb1b83611eb6cf82197c9b27b91d967bfd4fcd7
+SHA1 (patch-aa) = 33a0a8014ce8458f99da8eefb68127ef02d8628c
 SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
 SHA1 (patch-ac) = 6cdf26fcaeb8dad9cd9562b77377bd56b49c9f38
-SHA1 (patch-ad) = 6853a0e7105e97089bbee8a8abb535cef9f905f1
+SHA1 (patch-ad) = 983317cb82d13de66ac88127d3eea7d3b3186da4
 SHA1 (patch-ae) = 5a5123c5352e87650a4ce91123a196c576f37ea8
diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa
index 24f19f28302..b7aeee1bae1 100644
--- a/net/snort/patches/patch-aa
+++ b/net/snort/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2003/04/16 06:37:20 salo Exp $
+$NetBSD: patch-aa,v 1.10 2003/04/16 15:51:23 salo Exp $
 
 --- src/snort.c.orig	2003-04-03 23:10:52.000000000 +0200
 +++ src/snort.c	2003-04-16 08:03:06.000000000 +0200
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.9 2003/04/16 06:37:20 salo Exp $
      struct stat st;
      int i;
 -    char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL};
-+    char *conf_files[]={ PREFIX "/etc/snort.conf", "./snort.conf", NULL};
++    char *conf_files[]={ PKG_SYSCONFDIR "/snort.conf", "./snort.conf", NULL};
      char *fname = NULL;
      char *home_dir = NULL;
      char *rval = NULL;
diff --git a/net/snort/patches/patch-ad b/net/snort/patches/patch-ad
index e4220a21f69..2c6c8472ea1 100644
--- a/net/snort/patches/patch-ad
+++ b/net/snort/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2003/04/16 06:37:20 salo Exp $
+$NetBSD: patch-ad,v 1.3 2003/04/16 15:51:24 salo Exp $
 
 --- src/Makefile.in.orig	2003-04-09 18:01:40.000000000 +0200
 +++ src/Makefile.in	2003-04-16 08:07:17.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 2003/04/16 06:37:20 salo Exp $
  AMTAR = @AMTAR@
  AWK = @AWK@
 -CC = @CC@
-+CC = @CC@ -DPREFIX=\"@prefix@\"
++CC = @CC@ -DPKG_SYSCONFDIR=\"@sysconfdir@\"
  DEPDIR = @DEPDIR@
  
  INCLUDES = @INCLUDES@