CVS commit: pkgsrc

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Wed Jan  1 16:30:37 UTC 2020

Modified Files:
        pkgsrc/emulators/vice: options.mk
        pkgsrc/mk/defaults: options.description

Log Message:
Rename options for vice to have a "vice-" prefix (x64, cpuhistory).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/vice/options.mk
cvs rdiff -u -r1.602 -r1.603 pkgsrc/mk/defaults/options.description

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

Modified files:

Index: pkgsrc/emulators/vice/options.mk
diff -u pkgsrc/emulators/vice/options.mk:1.11 pkgsrc/emulators/vice/options.mk:1.12
--- pkgsrc/emulators/vice/options.mk:1.11       Tue Dec 31 14:42:22 2019
+++ pkgsrc/emulators/vice/options.mk    Wed Jan  1 16:30:37 2020
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.11 2019/12/31 14:42:22 rhialto Exp $
+# $NetBSD: options.mk,v 1.12 2020/01/01 16:30:37 rhialto Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS=         ffmpeg x64 cpuhistory
+PKG_SUPPORTED_OPTIONS=         ffmpeg vice-x64 vice-cpuhistory
 PKG_OPTIONS_REQUIRED_GROUPS=   gui
 PKG_OPTIONS_GROUP.gui=         gtk3 sdl sdl2
 PKG_SUGGESTED_OPTIONS=         gtk3 ffmpeg
@@ -39,11 +39,11 @@ CONFIGURE_ARGS+=    --enable-external-ffmpe
 .endif
 
 # Building x64 is deprecated, in favour of x64sc (but that is slower).
-.if !empty(PKG_OPTIONS:Mx64)
+.if !empty(PKG_OPTIONS:Mvice-x64)
 CONFIGURE_ARGS+=       --enable-x64
 PLIST.x64=             yes
 .endif
 
-.if !empty(PKG_OPTIONS:Mcpuhistory)
+.if !empty(PKG_OPTIONS:Mvice-cpuhistory)
 CONFIGURE_ARGS+=       --enable-cpuhistory
 .endif

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.602 pkgsrc/mk/defaults/options.description:1.603
--- pkgsrc/mk/defaults/options.description:1.602        Tue Dec 31 14:30:09 2019
+++ pkgsrc/mk/defaults/options.description      Wed Jan  1 16:30:37 2020
@@ -109,7 +109,7 @@ courier-esmtp               ESMTP mail delivery.
 courier-gnutls         Support using GNU TLS instead of OpenSSL.
 courier-local          Local mail delivery.
 courier-uucp           UUCP mail delivery.
-cpuhistory             Enable the 65xx cpu history feature.
+vice-cpuhistory                Enable the 65xx cpu history feature.
 cups                   Enable cups (Common UNIX Printing System) support.
 curl                   Enable curl support.
 curses                 Enable curses support.
@@ -856,7 +856,7 @@ wxwidgets           Enable wxWidgets support.
 x11                    Enable X11 support.
 x264                   Enable x264 support.
 x265                   Enable x265 support.
-x64                    Enable building of the old x64 emulator.
+vice-x64               Enable building of the old x64 emulator.
 xapian-flint-backend   Enable "Flint" format Xapian database support.
 xapian-quartz-backend  Enable "Quartz" format Xapian database support.
 xatracker              Enable XA X Acceleration API support.