[pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 82 to the pkgsrc-2004Q2 branch, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b0972c881b0
branches:  pkgsrc-2004Q2
changeset: 476752:2b0972c881b0
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Jul 30 15:47:47 2004 +0000

description:
Pullup ticket 82 to the pkgsrc-2004Q2 branch, requested by Grant Beattie

build fixes for aide and aide06

        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Sun Jun 27 13:23:40 UTC 2004

        Modified Files:
                pkgsrc/security/aide06: Makefile

        Log Message:
        this needs flex and bison to build. fixes build on Solaris.

        XXX this could be handled better by the tools stuff.

and

        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Sun Jun 27 13:24:49 UTC 2004

        Modified Files:
                pkgsrc/security/aide: Makefile

        Log Message:
        this needs flex and bison to build. fixes build on Solaris.

        XXX this could be handled better by the tools stuff.

diffstat:

 doc/CHANGES-pkgsrc-2004Q2 |   4 +++-
 security/aide/Makefile    |   8 ++++----
 security/aide06/Makefile  |  11 ++++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (69 lines):

diff -r ffe9792896a9 -r 2b0972c881b0 doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Thu Jul 29 21:57:45 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Fri Jul 30 15:47:47 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.45 2004/07/29 21:57:45 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.46 2004/07/30 15:47:47 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -86,4 +86,6 @@
        Solaris fixes for cfs
 Pullup ticket 81, requested by Grant Beattie [agc 2004-07-29]
        Solaris and Linux fixes for apg
+Pullup ticket 82, requested by Grant Beattie [agc 2004-07-30]
+       build fixes for aide and aide06
 
diff -r ffe9792896a9 -r 2b0972c881b0 security/aide/Makefile
--- a/security/aide/Makefile    Thu Jul 29 21:57:45 2004 +0000
+++ b/security/aide/Makefile    Fri Jul 30 15:47:47 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/25 02:59:29 snj Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2004/07/30 15:47:47 agc Exp $
 #
 
 DISTNAME=       aide-0.9
@@ -10,14 +10,14 @@
 HOMEPAGE=      http://www.cs.tut.fi/~rammer/aide.html
 COMMENT=       Free intrusion detection system for checking file integrity
 
-BUILD_DEPENDS+=        bison-[0-9]*:../../devel/bison
 BUILDLINK_DEPENDS.mhash?=      mhash>=0.8.17
 
 USE_BUILDLINK3= yes
 
 GNU_CONFIGURE= yes
-#don't set YACC so configure can correctly find bison
-YACC=
+USE_GNU_TOOLS+=        lex yacc
 
 .include "../../security/mhash/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+#don't set YACC so configure can correctly find bison
+YACC=
diff -r ffe9792896a9 -r 2b0972c881b0 security/aide06/Makefile
--- a/security/aide06/Makefile  Thu Jul 29 21:57:45 2004 +0000
+++ b/security/aide06/Makefile  Fri Jul 30 15:47:47 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/04/26 04:24:43 snj Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2004/07/30 15:47:47 agc Exp $
 #
 
 DISTNAME=       aide-0.6
@@ -9,11 +9,12 @@
 HOMEPAGE=      http://www.cs.tut.fi/~rammer/aide.html
 COMMENT=       Older intrusion detection system for checking file integrity
 
-BUILD_DEPENDS+=        bison-[0-9]*:../../devel/bison
+#BUILD_DEPENDS+=       bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE= yes
+USE_BUILDLINK3=        yes
+USE_GNU_TOOLS+=        yacc lex
+
+.include "../../mk/bsd.pkg.mk"
 #don't set YACC so configure can correctly find bison
 YACC=
-USE_BUILDLINK3=        yes
-
-.include "../../mk/bsd.pkg.mk"