From 62ccbd5e2dea425f86771e178a434e8d599e0eee Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 28 May 2021 14:21:26 +0000 Subject: [PATCH] libnet1*: remove bogus conflict with libnet They do not install in the same location. --- devel/libnet10/Makefile | 5 +---- devel/libnet11/Makefile | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/devel/libnet10/Makefile b/devel/libnet10/Makefile index dc7485d1c553..ff33bf28a444 100644 --- a/devel/libnet10/Makefile +++ b/devel/libnet10/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/05/23 19:22:58 rillig Exp $ -# +# $NetBSD: Makefile,v 1.10 2021/05/28 14:21:26 wiz Exp $ DISTNAME= libnet-1.0.2a PKGNAME= ${DISTNAME:S/libnet/libnet10/} @@ -12,8 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= C library for portable packet creation and injection LICENSE= 2-clause-bsd -CONFLICTS= libnet-[0-9]* - WRKSRC= ${WRKDIR}/${DISTNAME:C/l/L/} USE_LIBTOOL= yes diff --git a/devel/libnet11/Makefile b/devel/libnet11/Makefile index af8b84aebe1c..843bda941621 100644 --- a/devel/libnet11/Makefile +++ b/devel/libnet11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/11/03 10:39:18 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2021/05/28 14:21:26 wiz Exp $ DISTNAME= libnet-1.1.2.1 PKGNAME= ${DISTNAME:S/libnet/libnet11/} @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= C library for portable packet creation and injection LICENSE= 2-clause-bsd -CONFLICTS= libnet-[0-9]* - USE_LIBTOOL= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/libnet