Received: by mail.netbsd.org (Postfix, from userid 605)
	id E5EFD84D41; Fri, 28 May 2021 14:21:27 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 20BE684D40
	for <pkgsrc-changes@NetBSD.org>; Fri, 28 May 2021 14:21:27 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id SQdKTzCXS0zY for <pkgsrc-changes@netbsd.org>;
	Fri, 28 May 2021 14:21:26 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 72C6B84CFC
	for <pkgsrc-changes@NetBSD.org>; Fri, 28 May 2021 14:21:26 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 6C2C0FA95; Fri, 28 May 2021 14:21:26 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1622211686249390"
MIME-Version: 1.0
Date: Fri, 28 May 2021 14:21:26 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
X-Mailer: log_accum
Message-Id: <20210528142126.6C2C0FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1622211686249390
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri May 28 14:21:26 UTC 2021

Modified Files:
	pkgsrc/devel/libnet10: Makefile
	pkgsrc/devel/libnet11: Makefile

Log Message:
libnet1*: remove bogus conflict with libnet

They do not install in the same location.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libnet10/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/libnet11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1622211686249390
Content-Disposition: inline
Content-Length: 1376
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/libnet10/Makefile
diff -u pkgsrc/devel/libnet10/Makefile:1.9 pkgsrc/devel/libnet10/Makefile:1.10
--- pkgsrc/devel/libnet10/Makefile:1.9	Thu May 23 19:22:58 2019
+++ pkgsrc/devel/libnet10/Makefile	Fri May 28 14:21:26 2021
@@ -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

Index: pkgsrc/devel/libnet11/Makefile
diff -u pkgsrc/devel/libnet11/Makefile:1.13 pkgsrc/devel/libnet11/Makefile:1.14
--- pkgsrc/devel/libnet11/Makefile:1.13	Sun Nov  3 10:39:18 2019
+++ pkgsrc/devel/libnet11/Makefile	Fri May 28 14:21:26 2021
@@ -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


--_----------=_1622211686249390--