CVS commit: pkgsrc/devel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

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.

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@localhost
 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@localhost
 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