pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel libnet1*: remove bogus conflict with libnet



details:   https://anonhg.NetBSD.org/pkgsrc/rev/14cecbb51ada
branches:  trunk
changeset: 453339:14cecbb51ada
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri May 28 14:21:26 2021 +0000

description:
libnet1*: remove bogus conflict with libnet

They do not install in the same location.

diffstat:

 devel/libnet10/Makefile |  5 +----
 devel/libnet11/Makefile |  4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r 7a4ce6c6cec0 -r 14cecbb51ada devel/libnet10/Makefile
--- a/devel/libnet10/Makefile   Fri May 28 10:32:47 2021 +0000
+++ b/devel/libnet10/Makefile   Fri May 28 14:21:26 2021 +0000
@@ -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 @@
 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 -r 7a4ce6c6cec0 -r 14cecbb51ada devel/libnet11/Makefile
--- a/devel/libnet11/Makefile   Fri May 28 10:32:47 2021 +0000
+++ b/devel/libnet11/Makefile   Fri May 28 14:21:26 2021 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index