CVS commit: pkgsrc/sysutils

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 28 22:55:40 UTC 2023

Modified Files:
        pkgsrc/sysutils/ncdu: Makefile
        pkgsrc/sysutils/ncdu2: Makefile

Log Message:
ncdu*: both have same PKGBASE, so no CONFLICTS necessary

They conflict automatically


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/ncdu/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/ncdu2/Makefile

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

Modified files:

Index: pkgsrc/sysutils/ncdu/Makefile
diff -u pkgsrc/sysutils/ncdu/Makefile:1.18 pkgsrc/sysutils/ncdu/Makefile:1.19
--- pkgsrc/sysutils/ncdu/Makefile:1.18  Tue Feb 28 21:10:28 2023
+++ pkgsrc/sysutils/ncdu/Makefile       Tue Feb 28 22:55:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/02/28 21:10:28 nikita Exp $
+# $NetBSD: Makefile,v 1.19 2023/02/28 22:55:40 wiz Exp $
 
 DISTNAME=      ncdu-1.18.1
 CATEGORIES=    sysutils
@@ -9,8 +9,6 @@ HOMEPAGE=       https://dev.yorhel.nl/ncdu
 COMMENT=       Disk usage visualization tool
 LICENSE=       modified-bsd
 
-CONFLICTS+=    ncdu-2.*
-
 GNU_CONFIGURE= yes
 FAKE_NCURSES=  yes
 USE_CURSES=    vw_printw

Index: pkgsrc/sysutils/ncdu2/Makefile
diff -u pkgsrc/sysutils/ncdu2/Makefile:1.1 pkgsrc/sysutils/ncdu2/Makefile:1.2
--- pkgsrc/sysutils/ncdu2/Makefile:1.1  Tue Feb 28 21:07:43 2023
+++ pkgsrc/sysutils/ncdu2/Makefile      Tue Feb 28 22:55:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/02/28 21:07:43 nikita Exp $
+# $NetBSD: Makefile,v 1.2 2023/02/28 22:55:40 wiz Exp $
 
 DISTNAME=      ncdu-2.2.2
 CATEGORIES=    sysutils
@@ -10,7 +10,6 @@ HOMEPAGE=     https://dev.yorhel.nl/ncdu
 LICENSE=       mit
 
 USE_TOOLS+=    pkg-config
-CONFLICTS+=    ncdu-1.*
 
 # \todo: There is currently an issue building zig packages as RELRO.
 RELRO_SUPPORTED=       no