summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2005-06-22 13:14:50 +0000
committermarkd <markd@pkgsrc.org>2005-06-22 13:14:50 +0000
commit501cddcf5a2e42e4a6f402a26396dec9c38fea92 (patch)
treeb5fc3889e64f6f092ba453c949a545c035551190
parent66b3a2a2121d74933b9d44b5cc52b67569c77140 (diff)
downloadpkgsrc-501cddcf5a2e42e4a6f402a26396dec9c38fea92.tar.gz
Fix finding perl in the Configure for the new tools infrastructure.
Also change dependencies from build to run as needed while in use. oked during "deep freeze" by Alistair Crooks.
-rw-r--r--net/argus/Makefile16
-rw-r--r--net/argus/options.mk6
2 files changed, 12 insertions, 10 deletions
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 554e14fd0b7..ca4369d694d 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/08 14:48:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/22 13:14:50 markd Exp $
#
DISTNAME= argus-3.3
@@ -11,14 +11,15 @@ MAINTAINER= argus@tcp4me.com
HOMEPAGE= http://argus.tcp4me.com/
COMMENT= System and Network Monitoring Application
-BUILD_DEPENDS+= fping>=2.4b2:../../net/fping
-BUILD_DEPENDS+= p5-GD>=2.11:../../graphics/p5-GD
-BUILD_DEPENDS+= p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
-BUILD_DEPENDS+= p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
-BUILD_DEPENDS+= p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
-BUILD_DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
+DEPENDS+= fping>=2.4b2:../../net/fping
+DEPENDS+= p5-GD>=2.11:../../graphics/p5-GD
+DEPENDS+= p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
+DEPENDS+= p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
+DEPENDS+= p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
+DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
USE_TOOLS+= perl
+TOOLS_DEPMETHOD.perl= DEPENDS
USE_PKGINSTALL= yes
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ${WRKSRC}/Configure
@@ -27,6 +28,7 @@ CONFIGURE_ARGS+= --bin_dir ${PREFIX}/bin
CONFIGURE_ARGS+= --sbin_dir ${PREFIX}/sbin
CONFIGURE_ARGS+= --lib_dir ${PREFIX}/lib/argus
CONFIGURE_ARGS+= --data_dir ${VARBASE}/argus
+CONFIGURE_ENV+= PERL=${TOOLS_PERL5:Q}
RCD_SCRIPTS= argusd
diff --git a/net/argus/options.mk b/net/argus/options.mk
index a3036042dc3..155b8859ef8 100644
--- a/net/argus/options.mk
+++ b/net/argus/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/06/08 14:48:13 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/06/22 13:14:50 markd Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.argus
PKG_SUPPORTED_OPTIONS= inet6
@@ -6,6 +6,6 @@ PKG_SUPPORTED_OPTIONS= inet6
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Minet6)
-BUILD_DEPENDS+= fping6-[0-9]*:../../net/fping6
-BUILD_DEPENDS+= p5-Socket6>=0.12:../../net/p5-Socket6
+DEPENDS+= fping6-[0-9]*:../../net/fping6
+DEPENDS+= p5-Socket6>=0.12:../../net/p5-Socket6
.endif