pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/libnids - Add support for building with libnet 1.1...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4e6b898bfd4c
branches: trunk
changeset: 492179:4e6b898bfd4c
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Tue Apr 05 22:13:29 2005 +0000
description:
- Add support for building with libnet 1.1.x branch using options.mk
- Issue highlighted by diro%nixsys.bz@localhost in PR# 29814
diffstat:
net/libnids/Makefile | 7 ++++---
net/libnids/options.mk | 32 ++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 3 deletions(-)
diffs (57 lines):
diff -r b9c4f5d824b3 -r 4e6b898bfd4c net/libnids/Makefile
--- a/net/libnids/Makefile Tue Apr 05 22:02:10 2005 +0000
+++ b/net/libnids/Makefile Tue Apr 05 22:13:29 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/03/23 17:06:33 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/04/05 22:13:29 adrianp Exp $
#
DISTNAME= libnids-1.20
@@ -14,8 +14,9 @@
BUILDLINK_DEPMETHOD.libnet= build
BUILDLINK_DEPMETHOD.libpcap= build
-BUILDLINK_DEPENDS.libnet+= libnet-1.0.*
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
.include "../../net/libpcap/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b9c4f5d824b3 -r 4e6b898bfd4c net/libnids/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libnids/options.mk Tue Apr 05 22:13:29 2005 +0000
@@ -0,0 +1,32 @@
+# $NetBSD: options.mk,v 1.1 2005/04/05 22:13:29 adrianp Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.libnids
+PKG_SUPPORTED_OPTIONS= libnet10 libnet11
+
+.if !defined(PKG_OPTIONS.libnids)
+PKG_DEFAULT_OPTIONS+= libnet10
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Can't support both versions of libnet
+###
+.if !empty(PKG_OPTIONS:Mlibnet10) && !empty(PKG_OPTIONS:Mlibnet11)
+PKG_FAIL_REASON+= "libnet-1.0.x and libnet-1.1.x cannot both be selected." \
+ "This is due to the packages conflicting."
+.endif
+
+###
+### libnet 1.0.x branch support
+###
+.if !empty(PKG_OPTIONS:Mlibnet10)
+. include "../../devel/libnet/buildlink3.mk"
+.endif
+
+###
+### libnet 1.1.x branch support
+###
+.if !empty(PKG_OPTIONS:Mlibnet11)
+. include "../../devel/libnet11/buildlink3.mk"
+.endif
Home |
Main Index |
Thread Index |
Old Index