CVS commit: pkgsrc/sysutils/mc

["Aleksey Cheusov" <cheusov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cheusov
Date:           Sat Jun 15 20:48:03 UTC 2024

Modified Files:
        pkgsrc/sysutils/mc: PLIST options.mk
Removed Files:
        pkgsrc/sysutils/mc: PLIST.charset

Log Message:
Fix build failure when option mc-charset is disabled


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/mc/PLIST
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/mc/PLIST.charset
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/mc/options.mk

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

Modified files:

Index: pkgsrc/sysutils/mc/PLIST
diff -u pkgsrc/sysutils/mc/PLIST:1.23 pkgsrc/sysutils/mc/PLIST:1.24
--- pkgsrc/sysutils/mc/PLIST:1.23       Tue Apr 12 15:29:04 2022
+++ pkgsrc/sysutils/mc/PLIST    Sat Jun 15 20:48:03 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2022/04/12 15:29:04 nia Exp $
+@comment $NetBSD: PLIST,v 1.24 2024/06/15 20:48:03 cheusov Exp $
 bin/mc
 bin/mcdiff
 bin/mcedit
@@ -204,8 +204,8 @@ share/mc/hints/mc.hint.uk
 share/mc/hints/mc.hint.zh
 share/mc/hints/mc.hint.zh_CN
 share/mc/hints/mc.hint.zh_TW
-share/mc/mc.charsets
 share/mc/mc.lib
+${PLIST.mc-charset}share/mc/mc.charsets
 share/mc/skins/dark.ini
 share/mc/skins/darkfar.ini
 share/mc/skins/default.ini

Index: pkgsrc/sysutils/mc/options.mk
diff -u pkgsrc/sysutils/mc/options.mk:1.20 pkgsrc/sysutils/mc/options.mk:1.21
--- pkgsrc/sysutils/mc/options.mk:1.20  Mon May  6 08:33:53 2024
+++ pkgsrc/sysutils/mc/options.mk       Sat Jun 15 20:48:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2024/05/06 08:33:53 jperkin Exp $
+# $NetBSD: options.mk,v 1.21 2024/06/15 20:48:03 cheusov Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mc
 PKG_OPTIONS_REQUIRED_GROUPS=   screen
@@ -10,9 +10,10 @@ PKG_SUGGESTED_OPTIONS=               mc-charset slang
 
 ### The charset option enables input/display support for various 8-bit
 ### codepages, chooseable at runtime.
+PLIST_VARS+=           mc-charset
 .if !empty(PKG_OPTIONS:Mmc-charset)
 CONFIGURE_ARGS+=       --enable-charset
-PLIST_SRC+=            ${PKGDIR}/PLIST.charset
+PLIST.mc-charset=      yes
 .include "../../converters/libiconv/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-charset