Tue Feb 28 22:55:40 2023 UTC ()
ncdu*: both have same PKGBASE, so no CONFLICTS necessary

They conflict automatically


(wiz)
diff -r1.18 -r1.19 pkgsrc/sysutils/ncdu/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/ncdu2/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/ncdu/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/ncdu/Makefile 2023/02/28 21:10:28 1.18
+++ pkgsrc/sysutils/ncdu/Makefile 2023/02/28 22:55:40 1.19
@@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
1# $NetBSD: Makefile,v 1.18 2023/02/28 21:10:28 nikita Exp $ 1# $NetBSD: Makefile,v 1.19 2023/02/28 22:55:40 wiz Exp $
2 2
3DISTNAME= ncdu-1.18.1 3DISTNAME= ncdu-1.18.1
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= https://dev.yorhel.nl/download/ 5MASTER_SITES= https://dev.yorhel.nl/download/
6 6
7MAINTAINER= slitvinov@gmail.com 7MAINTAINER= slitvinov@gmail.com
8HOMEPAGE= https://dev.yorhel.nl/ncdu 8HOMEPAGE= https://dev.yorhel.nl/ncdu
9COMMENT= Disk usage visualization tool 9COMMENT= Disk usage visualization tool
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12CONFLICTS+= ncdu-2.* 
13 
14GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
15FAKE_NCURSES= yes 13FAKE_NCURSES= yes
16USE_CURSES= vw_printw 14USE_CURSES= vw_printw
17 15
18.include "../../mk/curses.buildlink3.mk" 16.include "../../mk/curses.buildlink3.mk"
19.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/ncdu2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/ncdu2/Makefile 2023/02/28 21:07:43 1.1
+++ pkgsrc/sysutils/ncdu2/Makefile 2023/02/28 22:55:40 1.2
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: Makefile,v 1.1 2023/02/28 21:07:43 nikita Exp $ 1# $NetBSD: Makefile,v 1.2 2023/02/28 22:55:40 wiz Exp $
2 2
3DISTNAME= ncdu-2.2.2 3DISTNAME= ncdu-2.2.2
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= https://dev.yorhel.nl/download/ 5MASTER_SITES= https://dev.yorhel.nl/download/
6 6
7COMMENT= Disk usage visualization tool 7COMMENT= Disk usage visualization tool
8MAINTAINER= nikita@NetBSD.org 8MAINTAINER= nikita@NetBSD.org
9HOMEPAGE= https://dev.yorhel.nl/ncdu 9HOMEPAGE= https://dev.yorhel.nl/ncdu
10LICENSE= mit 10LICENSE= mit
11 11
12USE_TOOLS+= pkg-config 12USE_TOOLS+= pkg-config
13CONFLICTS+= ncdu-1.* 
14 13
15# \todo: There is currently an issue building zig packages as RELRO. 14# \todo: There is currently an issue building zig packages as RELRO.
16RELRO_SUPPORTED= no 15RELRO_SUPPORTED= no
17 16
18# TODO: fix "make doc" or patch zig.build to install docs 17# TODO: fix "make doc" or patch zig.build to install docs
19post-build: 18post-build:
20 mkdir ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 19 mkdir ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
21 ${INSTALL_DATA} ${WRKSRC}/ncdu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 20 ${INSTALL_DATA} ${WRKSRC}/ncdu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
22 21
23.include "../../devel/ncursesw/buildlink3.mk" 22.include "../../devel/ncursesw/buildlink3.mk"
24.include "../../lang/zig/application.mk" 23.include "../../lang/zig/application.mk"
25.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"