CVS commit: pkgsrc/sysutils/coreutils

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Nov 11 13:42:55 UTC 2025

Modified Files:
        pkgsrc/sysutils/coreutils: Makefile

Log Message:
sysutils/coreutils: fix previous commit

Correct conflicting package name to ganglia-monitor-core.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/sysutils/coreutils/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/coreutils/Makefile
diff -u pkgsrc/sysutils/coreutils/Makefile:1.89 pkgsrc/sysutils/coreutils/Makefile:1.90
--- pkgsrc/sysutils/coreutils/Makefile:1.89     Tue Nov 11 13:39:49 2025
+++ pkgsrc/sysutils/coreutils/Makefile  Tue Nov 11 13:42:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2025/11/11 13:39:49 taca Exp $
+# $NetBSD: Makefile,v 1.90 2025/11/11 13:42:54 taca Exp $
 
 .include "../../sysutils/coreutils/Makefile.common"
 
@@ -10,9 +10,8 @@ CONFLICTS=    fileutils-[0-9]* gnuls-[0-9]*
 CONFLICTS+=            id-utils-[0-9]* gnome-utils<1.4.1.2nb2
 CONFLICTS+=            geneweb-[0-9]*
 CONFLICTS+=            graphviz<1.12
-# sysutils/coreutils installs a 'gstat' program, so conflict with it
-CONFLICTS+=            ganglia-[0-9]*
-
+# parallel/ganglia-monitor-core also installs a 'gstat' program
+CONFLICTS+=            ganglia-monitor-core-[0-9]*
 INFO_FILES=            yes
 
 # Exclude programs from PLIST which aren't built on a platform.