2 files changed, 26 insertions, 6 deletions
diff --git a/net/libpcap/buildlink2.mk b/net/libpcap/buildlink2.mk
index 2d72563273f..f4947ac123d 100644
--- a/net/libpcap/buildlink2.mk
+++ b/net/libpcap/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/02/12 02:35:07 jlam Exp $
 
 .if !defined(LIBPCAP_BUILDLINK2_MK)
 LIBPCAP_BUILDLINK2_MK=	# defined
@@ -20,8 +20,18 @@ _NEED_LIBPCAP=	NO
 _NEED_LIBPCAP=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mlibpcap)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_LIBPCAP} == "YES"
+_NEED_LIBPCAP=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_LIBPCAP=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mlibpcap) && \
+    ${_BUILTIN_LIBPCAP} == "YES"
+_NEED_LIBPCAP=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mlibpcap)
 _NEED_LIBPCAP=	YES
 .endif
 
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index 3a00ea7ece8..d0a036491d9 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPCAP_BUILDLINK3_MK:=	${LIBPCAP_BUILDLINK3_MK}+
@@ -26,8 +26,18 @@ BUILDLINK_USE_BUILTIN.libpcap=	YES
 BUILDLINK_USE_BUILTIN.libpcap=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mlibpcap)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.libpcap=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.libpcap=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mlibpcap) && \
+    !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.libpcap=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mlibpcap)
 BUILDLINK_USE_BUILTIN.libpcap=	NO
 .endif