From fa6f57152e48277156f4a2e2cfdd2b260e49a8df Mon Sep 17 00:00:00 2001 From: adrianp Date: Sun, 18 Feb 2007 18:53:10 +0000 Subject: buildlink updates to handle the new libnet package structure bump PKGREVISION --- net/libnids/Makefile | 9 +++++++-- net/libnids/options.mk | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/net/libnids/Makefile b/net/libnids/Makefile index 16d73ee371e..d3e03a30e2f 100644 --- a/net/libnids/Makefile +++ b/net/libnids/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:49 tv Exp $ +# $NetBSD: Makefile,v 1.21 2007/02/18 18:53:10 adrianp Exp $ # DISTNAME= libnids-1.20 +PKGREVISION= 1 CATEGORIES= net security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libnids/} @@ -11,9 +12,13 @@ COMMENT= Network monitoring library with TCP/IP reassembly GNU_CONFIGURE= yes -BUILDLINK_DEPMETHOD.libnet= build BUILDLINK_DEPMETHOD.libpcap= build +SUBST_CLASSES+= conf +SUBST_STAGE.conf= pre-configure +SUBST_FILES.conf= configure +SUBST_MESSAGE.conf= Fixing configuration script. + .include "../../mk/bsd.prefs.mk" .include "options.mk" diff --git a/net/libnids/options.mk b/net/libnids/options.mk index e645dd09548..55c648d6816 100644 --- a/net/libnids/options.mk +++ b/net/libnids/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2007/02/18 18:53:10 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libnids PKG_SUPPORTED_OPTIONS= libnet10 libnet11 @@ -18,7 +18,9 @@ PKG_FAIL_REASON+= "libnet-1.0.x and libnet-1.1.x cannot both be selected." \ ### libnet 1.0.x branch support ### .if !empty(PKG_OPTIONS:Mlibnet10) -. include "../../devel/libnet/buildlink3.mk" +. include "../../devel/libnet10/buildlink3.mk" +BUILDLINK_DEPMETHOD.libnet10= build +SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" .endif ### @@ -26,4 +28,6 @@ PKG_FAIL_REASON+= "libnet-1.0.x and libnet-1.1.x cannot both be selected." \ ### .if !empty(PKG_OPTIONS:Mlibnet11) . include "../../devel/libnet11/buildlink3.mk" +BUILDLINK_DEPMETHOD.libnet11= build +SUBST_SED.conf= -e "s|libnet-config|libnet11-config|g" .endif -- cgit v1.2.3