diff options
author | wiz <wiz@pkgsrc.org> | 2017-09-29 12:40:26 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-09-29 12:40:26 +0000 |
commit | 548c8706069f4f17137e473312973c78cf1cc3f6 (patch) | |
tree | f3226dbe3c37cf25f13ef6bde1a5a7152ab4f88c /pkgtools | |
parent | 8cce79e62cf7f4eb28ab34aaaf44d5f142e40027 (diff) | |
download | pkgsrc-548c8706069f4f17137e473312973c78cf1cc3f6.tar.gz |
emacs22*, emacs23*, emacs24*: remove unmaintained emacs versions
As announced in
https://mail-index.netbsd.org/pkgsrc-users/2017/09/11/msg025563.html
This still leaves emacs20, emacs21, and the current version, emacs25.
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/pkglint/files/vardefs.go | 6 | ||||
-rw-r--r-- | pkgtools/pkglint4/files/makevars.map | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkglint/files/vardefs.go b/pkgtools/pkglint/files/vardefs.go index 083cc4199db..fe1996a957a 100644 --- a/pkgtools/pkglint/files/vardefs.go +++ b/pkgtools/pkglint/files/vardefs.go @@ -177,7 +177,7 @@ func (gd *GlobalData) InitVartypes() { usr("DIALER_GROUP", lkNone, BtUserGroupName) usr("DT_LAYOUT", lkNone, enum("US FI FR GER DV")) usr("ELK_GUI", lkShell, enum("none xaw motif")) - usr("EMACS_TYPE", lkNone, enum("emacs25 emacs25nox emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs214 xemacs215")) + usr("EMACS_TYPE", lkNone, enum("emacs25 emacs25nox emacs21 emacs21nox emacs20 xemacs214 xemacs215")) usr("EXIM_GROUP", lkNone, BtUserGroupName) usr("EXIM_USER", lkNone, BtUserGroupName) usr("FLUXBOX_USE_XINERAMA", lkNone, enum("YES NO")) @@ -512,10 +512,10 @@ func (gd *GlobalData) InitVartypes() { sys("EMACS_PKGNAME_PREFIX", lkNone, BtIdentifier) // Or the empty string. sys("EMACS_TYPE", lkNone, enum("emacs xemacs")) acl("EMACS_USE_LEIM", lkNone, BtYes, "") - acl("EMACS_VERSIONS_ACCEPTED", lkShell, enum("emacs25 emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox"), "Makefile: set") + acl("EMACS_VERSIONS_ACCEPTED", lkShell, enum("emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox"), "Makefile: set") sys("EMACS_VERSION_MAJOR", lkNone, BtInteger) sys("EMACS_VERSION_MINOR", lkNone, BtInteger) - acl("EMACS_VERSION_REQD", lkShell, enum("emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs214"), "Makefile: set, append") + acl("EMACS_VERSION_REQD", lkShell, enum("emacs25 emacs25nox emacs21 emacs21nox emacs20 xemacs215 xemacs214"), "Makefile: set, append") sys("EMULDIR", lkNone, BtPathname) sys("EMULSUBDIR", lkNone, BtPathname) sys("OPSYS_EMULDIR", lkNone, BtPathname) diff --git a/pkgtools/pkglint4/files/makevars.map b/pkgtools/pkglint4/files/makevars.map index 9bc4033bc8c..3f13199e81c 100644 --- a/pkgtools/pkglint4/files/makevars.map +++ b/pkgtools/pkglint4/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.6 2017/09/06 16:49:28 wiz Exp $ +# $NetBSD: makevars.map,v 1.7 2017/09/29 12:40:28 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -311,10 +311,10 @@ EMACS_PKGNAME_PREFIX Identifier [$system] # ^^ or the empty string. EMACS_TYPE { emacs xemacs } [$system] EMACS_USE_LEIM Yes -EMACS_VERSIONS_ACCEPTED List of { emacs25 emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox} [m:s] +EMACS_VERSIONS_ACCEPTED List of { emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox} [m:s] EMACS_VERSION_MAJOR Integer [$system] EMACS_VERSION_MINOR Integer [$system] -EMACS_VERSION_REQD List of { emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs214 } [m:as] +EMACS_VERSION_REQD List of { emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs214 } [m:as] EMULDIR Pathname [$system] EMULSUBDIR Pathname [$system] OPSYS_EMULDIR Pathname [$system] |