diff options
| author | wiz <wiz@pkgsrc.org> | 2018-01-01 10:23:04 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2018-01-01 10:23:04 +0000 |
| commit | a7b2991a70462027a07c1a54e70c4b0d71a96e64 (patch) | |
| tree | 4b9cfb6ebbff12d053d6ac66278474cd927d27b5 /pkgtools | |
| parent | 5f4d7e0463f64504640f1cb9b52f33503db06065 (diff) | |
| download | pkgsrc-a7b2991a70462027a07c1a54e70c4b0d71a96e64.tar.gz | |
apache22: remove, it was eol'd in June 2017
Remove packages that only work with apache22.
Remove apache22 references.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/vardefs.go | 6 | ||||
| -rw-r--r-- | pkgtools/pkglint4/files/makevars.map | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/pkglint/files/vardefs.go b/pkgtools/pkglint/files/vardefs.go index 05b306d6ded..df1a23af4c1 100644 --- a/pkgtools/pkglint/files/vardefs.go +++ b/pkgtools/pkglint/files/vardefs.go @@ -780,9 +780,9 @@ func (gd *GlobalData) InitVartypes() { sys("PKGVERSION", lkNone, BtVersion) sys("PKGWILDCARD", lkNone, BtFilemask) sys("PKG_ADMIN", lkNone, BtShellCommand) - sys("PKG_APACHE", lkNone, enum("apache22 apache24")) - pkg("PKG_APACHE_ACCEPTED", lkShell, enum("apache22 apache24")) - usr("PKG_APACHE_DEFAULT", lkNone, enum("apache22 apache24")) + sys("PKG_APACHE", lkNone, enum("apache24")) + pkg("PKG_APACHE_ACCEPTED", lkShell, enum("apache24")) + usr("PKG_APACHE_DEFAULT", lkNone, enum("apache24")) usr("PKG_CONFIG", lkNone, BtYes) // ^^ No, this is not the popular command from GNOME, but the setting // whether the pkgsrc user wants configuration files automatically diff --git a/pkgtools/pkglint4/files/makevars.map b/pkgtools/pkglint4/files/makevars.map index 3f13199e81c..1b170789b1b 100644 --- a/pkgtools/pkglint4/files/makevars.map +++ b/pkgtools/pkglint4/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.7 2017/09/29 12:40:28 wiz Exp $ +# $NetBSD: makevars.map,v 1.8 2018/01/01 10:23:04 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -568,9 +568,9 @@ PKGTOOLS_ENV List of ShellWord PKGVERSION Version [$system] PKGWILDCARD Filemask [$system] PKG_ADMIN ShellCommand [$system] -PKG_APACHE { apache22 apache24 } [$system] -PKG_APACHE_ACCEPTED List of { apache22 apache24 } [$package] -PKG_APACHE_DEFAULT { apache22 apache24 } [$user] +PKG_APACHE { apache24 } [$system] +PKG_APACHE_ACCEPTED List of { apache24 } [$package] +PKG_APACHE_DEFAULT { apache24 } [$user] PKG_CONFIG Yes [$user] # ^^ No, this is not the popular command from GNOME, but the setting # whether the pkgsrc user wants configuration files automatically |