CVS commit: pkgsrc

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Sun Apr 16 22:10:40 UTC 2017

Modified Files:
        pkgsrc/mk/defaults: mk.conf
        pkgsrc/pkgtools/pkglint/files: vardefs.go

Log Message:
Remove references to WINDOWMAKER_{OPTIONS,THEMES}

>From what I can tell, this is no longer in use.


To generate a diff of this commit:
cvs rdiff -u -r1.273 -r1.274 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.23 -r1.24 pkgsrc/pkgtools/pkglint/files/vardefs.go

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

Modified files:

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.273 pkgsrc/mk/defaults/mk.conf:1.274
--- pkgsrc/mk/defaults/mk.conf:1.273    Sun Apr  9 20:44:41 2017
+++ pkgsrc/mk/defaults/mk.conf  Sun Apr 16 22:10:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.273 2017/04/09 20:44:41 joerg Exp $
+# $NetBSD: mk.conf,v 1.274 2017/04/16 22:10:40 khorben Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1732,18 +1732,6 @@ UUCP_USER?=      uucp
 # Possible: any space-separated list of window managers
 # Default: not defined
 
-WINDOWMAKER_OPTIONS?= gnome kde openlook
-# Options for building windowmaker package. Used to add support for
-# GNOME, KDE or OPEN LOOK(tm) and to avoid redundancies with KDE.
-# Possible: gnome, kde, openlook, lite
-# Default: gnome kde openlook
-
-WINDOWMAKER_THEMES?= freebsdtheme-0.52 netbsddrinkingteam-0.60.0 netbsd_-0.52
-# Used in the wmthemes package to specify the themes which will be
-# installed.
-# Possible: see http://wm.themes.org/
-# Default: freebsdtheme-0.52 netbsddrinkingteam-0.60.0 netbsd_-0.52
-
 #X10_PORT=
 # The serial device for misc/bottlerocket to use to communicate
 # to the X10 adaptor.

Index: pkgsrc/pkgtools/pkglint/files/vardefs.go
diff -u pkgsrc/pkgtools/pkglint/files/vardefs.go:1.23 pkgsrc/pkgtools/pkglint/files/vardefs.go:1.24
--- pkgsrc/pkgtools/pkglint/files/vardefs.go:1.23       Wed Apr  5 19:17:19 2017
+++ pkgsrc/pkgtools/pkglint/files/vardefs.go    Sun Apr 16 22:10:40 2017
@@ -323,8 +323,6 @@ func (gd *GlobalData) InitVartypes() {
                usr("WCALC_CGIDIR", lkNone, BtPrefixPathname)
                usr("WCALC_CGIPATH", lkNone, BtPathname) // URL path
                usr("WDM_MANAGERS", lkShell, BtIdentifier)
-               usr("WINDOWMAKER_OPTIONS", lkShell, enum("gnome kde openlook lite"))
-               usr("WINDOWMAKER_THEMES", lkShell, BtPkgName)
                usr("X10_PORT", lkNone, BtPathname)
                usr("XAW_TYPE", lkNone, enum("standard 3d xpm neXtaw"))
                usr("XLOCK_DEFAULT_MODE", lkNone, BtIdentifier)