 @@ -597,27 +597,27 @@ func (ck *MkAssignChecker) checkMiscRedu
 	switch {
 	case pkg == nil,
 		varname != "INSTALLATION_DIRS",
 		!matches(pkg.vars.LastValue("AUTO_MKDIRS"), `^[Yy][Ee][Ss]$`):
 		return
+	}
 	for _, dir := range mkline.ValueFields(mkline.Value()) {
 		if NewPath(dir).IsAbs() {
 			continue
+		}
 		rel := NewRelPathString(dir)
-		if pkg.Plist.Dirs[rel] != nil {
+		if pkg.Plist.UnconditionalDirs[rel] != nil {
 			mkline.Notef("The directory %q is redundant in %s.", rel, varname)
 			mkline.Explain(
 				"This package defines AUTO_MKDIR, and the directory is contained in the PLIST.",
 				"Therefore it will be created anyway.")
+		}
+	}
+}
 // checkRightVaruse checks that in a variable assignment,
 // each variable used on the right-hand side of the assignment operator
 // has the correct data type and quoting.
 func (ck *MkAssignChecker) checkRightVaruse() {
 	if trace.Tracing {

 @@ -527,27 +527,29 @@ func (pkg *Package) loadPlistDirs(plistF
 	ck := PlistChecker{
 		pkg,
 		make(map[RelPath]*PlistLine),
 		make(map[RelPath]*PlistLine),
 		"",
 		Once{},
 		false}
 	plistLines := ck.Load(lines)
 	for filename, pline := range ck.allFiles {
 		pkg.Plist.Files[filename] = pline
+	}
 	for dirname, pline := range ck.allDirs {
-		pkg.Plist.Dirs[dirname] = pline
+		if len(pline.conditions) == 0 {
 			pkg.Plist.UnconditionalDirs[dirname] = pline
+		}
+	}
 	for _, plistLine := range plistLines {
 		if plistLine.HasPath() {
 			rank := NewPlistRank(plistLine.Line.Basename)
 			pkg.PlistLines.Add(plistLine, rank)
+		}
 		for _, cond := range plistLine.conditions {
 			pkg.Plist.Conditions[strings.TrimPrefix(cond, "PLIST.")] = true
+		}
+	}
+}
 func (pkg *Package) check(filenames []CurrPath, mklines, allLines *MkLines) {
 @@ -1777,29 +1779,29 @@ func (pkg *Package) FixAddInclude(includ
 	mklines.SaveAutofixChanges()
+}
 // PlistContent lists the directories and files that appear in the
 // package's PLIST files. It serves two purposes:
 //
 // 1. Decide whether AUTO_MKDIRS can be used instead of listing
 // the INSTALLATION_DIRS redundantly.
 //
 // 2. Ensure that the entries mentioned in the ALTERNATIVES file
 // also appear in the PLIST files.
 type PlistContent struct {
-	Dirs       map[RelPath]*PlistLine
+	UnconditionalDirs map[RelPath]*PlistLine
-	Files      map[RelPath]*PlistLine
+	Files             map[RelPath]*PlistLine
-	Conditions map[string]bool // each ${PLIST.id} sets ["id"] = true.
+	Conditions        map[string]bool // each ${PLIST.id} sets ["id"] = true.
+}
 func NewPlistContent() PlistContent {
 	return PlistContent{
 		make(map[RelPath]*PlistLine),
 		make(map[RelPath]*PlistLine),
 		make(map[string]bool)}
+}
 // matchPkgname tests whether the string has the form of a package name that
 // does not contain any variable expressions.
 func matchPkgname(s string) (m bool, base string, version string) {
 	// TODO: Allow a hyphen in the middle of a version number.

 @@ -1255,55 +1255,61 @@ func (s *Suite) Test_Package_collectSeen
 // Just ensure that pkglint doesn't crash.
 func (s *Suite) Test_Package_loadPlistDirs__empty(c *check.C) {
 	t := s.Init(c)
 	t.SetUpPackage("category/package")
 	t.CreateFileLines("category/package/PLIST.common",
 		nil...)
 	t.FinishSetUp()
 	pkg := NewPackage(t.File("category/package"))
 	pkg.load()
 	var dirs []RelPath
-	for dir := range pkg.Plist.Dirs {
+	for dir := range pkg.Plist.UnconditionalDirs {
 		dirs = append(dirs, dir)
+	}
 	sort.Slice(dirs, func(i, j int) bool { return dirs[i] < dirs[j] })
-	t.CheckDeepEquals(dirs, []RelPath{"bin"})
+	t.CheckDeepEquals(dirs, []RelPath{"bin"}) // see t.SetUpPackage
+}
 func (s *Suite) Test_Package_loadPlistDirs(c *check.C) {
 	t := s.Init(c)
 	t.SetUpPackage("category/package")
 	t.CreateFileLines("category/package/PLIST.common",
 		PlistCvsID,
 		"@exec echo hello",
 		"${PLIST.condition}dir/subdir/file",
 		"${PLIST.condition}mixed/conditional-file",
 		"mixed/unconditional-file",
 		"@unexec echo bye")
 	t.FinishSetUp()
 	pkg := NewPackage(t.File("category/package"))
 	pkg.load()
 	var dirs []RelPath
-	for dir := range pkg.Plist.Dirs {
+	for dir := range pkg.Plist.UnconditionalDirs {
 		dirs = append(dirs, dir)
+	}
 	sort.Slice(dirs, func(i, j int) bool { return dirs[i] < dirs[j] })
-	t.CheckDeepEquals(dirs, []RelPath{"bin", "dir", "dir/subdir"})
+	t.CheckDeepEquals(dirs, []RelPath{
 		"bin", // from t.SetUpPackage
 		// dir is not listed because it is conditional.
 		// dir/subdir is not listed because it is conditional.
 		"mixed"})
+}
 func (s *Suite) Test_Package_check__files_Makefile(c *check.C) {
 	t := s.Init(c)
 	t.SetUpPackage("category/package")
 	t.CreateFileLines("category/package/files/Makefile",
 		"This file may contain anything.")
 	t.Main("category/package/files/Makefile")
 	// Since there is nothing to check in files/*, pkglint could
 	// as well report this as a usage error.

 @@ -389,34 +389,30 @@ func (ck *PlistChecker) checkPathMan(pli
 	if !m {
 		// maybe: line.Warnf("Invalid filename %q for manual page.", text)
 		return
+	}
 	if !matches(section, `^[0-9ln]$`) {
 		pline.Warnf("Unknown section %q for manual page.", section)
+	}
 	if catOrMan == "cat" && ck.allFiles[NewRelPathString("man/man"+section+"/"+manpage+"."+section)] == nil {
 		pline.Warnf("Preformatted manual page without unformatted one.")
+	}
-	if catOrMan == "cat" {
+	if catOrMan == "man" && !hasPrefix(ext, section) {
-		if ext != "0" {
+		pline.Warnf("Mismatch between the section (%s) "+
-			pline.Warnf("Preformatted manual pages should end in \".0\".")
+			"and extension (%s) of the manual page.",
 			section, ext)
 	} else {
 		if !hasPrefix(ext, section) {
 			pline.Warnf("Mismatch between the section (%s) and extension (%s) of the manual page.", section, ext)
+	}
 	if gz != "" {
 		fix := pline.Autofix()
 		fix.Notef("The .gz extension is unnecessary for manual pages.")
 		fix.Explain(
 			"Whether the manual pages are installed in compressed form or not is",
 			"configured by the pkgsrc user.",
 			"Compression and decompression takes place automatically,",
 			"no matter if the .gz extension is mentioned in the PLIST or not.")
 		fix.ReplaceAt(0, len(pline.Line.Text)-len(".gz"), ".gz", "")
 		fix.Apply()
+	}

 @@ -29,27 +29,26 @@ func (s *Suite) Test_CheckLinesPlist(c *
 	CheckLinesPlist(pkg, lines)
 	t.CheckOutputLines(
 		"ERROR: PLIST:1: Expected \"@comment $"+"NetBSD$\".",
 		"WARN: PLIST:1: The bin/ directory should not have subdirectories.",
 		"ERROR: PLIST:3: Configuration files must not be registered in the PLIST.",
 		"ERROR: PLIST:4: RCD_SCRIPTS must not be registered in the PLIST.",
 		"ERROR: PLIST:6: \"info/dir\" must not be listed. Use install-info to add/remove an entry.",
 		"WARN: PLIST:8: Redundant library found. The libtool library is in line 9.",
 		"WARN: PLIST:9: \"lib/libc.la\" should be sorted before \"lib/libc.so.6\".",
 		"WARN: PLIST:9: Packages that install libtool libraries should define USE_LIBTOOL.",
 		"WARN: PLIST:10: Preformatted manual page without unformatted one.",
 		"WARN: PLIST:10: Preformatted manual pages should end in \".0\".",
 		"WARN: PLIST:11: IMAKE_MANNEWSUFFIX is not meant to appear in PLISTs.",
 		"WARN: PLIST:12: Please remove this line. It is no longer necessary.",
 		"ERROR: PLIST:14: The package Makefile must include \"../../graphics/gnome-icon-theme/buildlink3.mk\".",
 		"WARN: PLIST:14: Packages that install icon theme files should set ICON_THEMES.",
 		"ERROR: PLIST:15: Packages that install hicolor icons "+
 			"must include \"../../graphics/hicolor-icon-theme/buildlink3.mk\" in the Makefile.",
 		"ERROR: PLIST:18: Duplicate filename \"share/tzinfo\", already appeared in line 17.",
 		"ERROR: PLIST:19: Invalid line type: /absolute")
+}
 func (s *Suite) Test_CheckLinesPlist__single_file_no_comment(c *check.C) {
 	t := s.Init(c)

 @@ -267,27 +267,27 @@ func (scc *SimpleCommandChecker) checkAu
 		m, dirname := match1(arg, `^(?:\$\{DESTDIR\})?\$\{PREFIX(?:|:Q)\}/+([^/]\S*)$`)
 		if !m {
 			continue
+		}
 		prefixRel := NewRelPathString(dirname).Clean()
 		if prefixRel == "." {
 			continue
+		}
 		autoMkdirs := false
 		if scc.mklines.pkg != nil {
-			plistLine := scc.mklines.pkg.Plist.Dirs[prefixRel]
+			plistLine := scc.mklines.pkg.Plist.UnconditionalDirs[prefixRel]
 			if plistLine != nil && !containsVarUse(plistLine.Line.Text) {
 				autoMkdirs = true
+			}
+		}
 		if autoMkdirs {
 			scc.Notef("You can use AUTO_MKDIRS=yes or \"INSTALLATION_DIRS+= %s\" instead of %q.",
 				prefixRel.String(), cmdname)
 			scc.Explain(
 				"Many packages include a list of all needed directories in their",
 				"PLIST file.",
 				"In such a case, you can just set AUTO_MKDIRS=yes and be done.",
 				"The pkgsrc infrastructure will then create all directories in advance.",

 @@ -381,27 +381,27 @@ func (s *Suite) Test_SimpleCommandChecke
 		t.CheckOutput(diagnostics)
+	}
 	// AUTO_MKDIRS applies only when installing directories.
 	test("${RUN} ${INSTALL} -c ${WRKSRC}/file ${PREFIX}/bin/",
 		nil...)
 	// TODO: Warn that ${INSTALL} -d can only handle a single directory.
 	test("${RUN} ${INSTALL} -m 0755 -d ${PREFIX}/first ${PREFIX}/second",
 		"NOTE: filename.mk:1: You can use \"INSTALLATION_DIRS+= first\" instead of \"${INSTALL} -d\".",
 		"NOTE: filename.mk:1: You can use \"INSTALLATION_DIRS+= second\" instead of \"${INSTALL} -d\".")
 	pkg = NewPackage(t.File("category/pkgbase"))
-	pkg.Plist.Dirs["share/pkgbase"] = &PlistLine{
+	pkg.Plist.UnconditionalDirs["share/pkgbase"] = &PlistLine{
 		t.NewLine("PLIST", 123, "share/pkgbase/file"),
 		nil,
 		"share/pkgbase/file"}
 	// A directory that is found in the PLIST.
 	// TODO: Add a test for using this command inside a conditional;
 	//  the note should not appear then.
 	test("${RUN} ${INSTALL_DATA_DIR} share/pkgbase ${PREFIX}/share/pkgbase",
 		"NOTE: filename.mk:1: You can use AUTO_MKDIRS=yes or \"INSTALLATION_DIRS+= share/pkgbase\" "+
 			"instead of \"${INSTALL_DATA_DIR}\".",
 		"WARN: filename.mk:1: The INSTALL_*_DIR commands can only handle one directory at a time.")
 	// Directories from .for loops are too dynamic to be replaced with AUTO_MKDIRS.
 @@ -968,27 +968,27 @@ func (s *Suite) Test_ShellLineChecker_Ch
 		"done",
 		nil...)
 	test("@cp from to",
 		"WARN: filename.mk:1: The shell command \"cp\" should not be hidden.")
 	test("-cp from to",
 		"WARN: filename.mk:1: Using a leading \"-\" to suppress errors is deprecated.")
 	test("-${MKDIR} deeply/nested/subdir",
 		"WARN: filename.mk:1: Using a leading \"-\" to suppress errors is deprecated.")
 	pkg = NewPackage(t.File("category/pkgbase"))
-	pkg.Plist.Dirs["share/pkgbase"] = &PlistLine{
+	pkg.Plist.UnconditionalDirs["share/pkgbase"] = &PlistLine{
 		t.NewLine("PLIST", 123, "share/pkgbase/file"),
 		nil,
 		"share/pkgbase/file"}
 	// A directory that is found in the PLIST.
 	// TODO: Add a test for using this command inside a conditional;
 	//  the note should not appear then.
 	test("${RUN} ${INSTALL_DATA_DIR} share/pkgbase ${PREFIX}/share/pkgbase",
 		"NOTE: filename.mk:1: You can use AUTO_MKDIRS=yes or \"INSTALLATION_DIRS+= share/pkgbase\" "+
 			"instead of \"${INSTALL_DATA_DIR}\".",
 		"WARN: filename.mk:1: The INSTALL_*_DIR commands can only handle one directory at a time.")
 	// A directory that is not found in the PLIST.

 @@ -1179,28 +1179,28 @@ func (cv *VartypeCheck) PrefixPathname()
 		cv.Errorf("The pathname %q in %s must be relative to ${PREFIX}.",
 			cv.Value, cv.Varname)
 		return
+	}
 	cv.MkLine.ForEachUsedText(cv.Value, VucRunTime, func(varUse *MkVarUse, time VucTime) {
 		varname := varUse.varname
 		if varname == "PKG_SYSCONFDIR" || varname == "VARBASE" {
 			cv.Errorf("%s must not be used in %s since it is not relative to PREFIX.",
 				varname, cv.Varname)
+		}
 	})
-	if m, manSubdir := match1(cv.Value, `^man/(.+)`); m {
+	if hasPrefix(cv.Value, "man/") && cv.Varname != "INSTALLATION_DIRS" {
-		from := "${PKGMANDIR}/" + manSubdir
+		from := "${PKGMANDIR}/" + cv.Value[4:]
 		fix := cv.Autofix()
 		fix.Warnf("Please use %q instead of %q.", from, cv.Value)
 		fix.Replace(cv.Value, from)
 		fix.Apply()
+	}
+}
 func (cv *VartypeCheck) PythonDependency() {
 	if cv.Value != cv.ValueNoVar {
 		cv.Warnf("Python dependencies should not contain variables.")
 	} else if !matches(cv.ValueNoVar, `^[+\-.0-9A-Z_a-z]+(?:|:link|:build|:test|:tool)$`) {
 		cv.Warnf("Invalid Python dependency %q.", cv.Value)
 		cv.Explain(

 @@ -1813,26 +1813,33 @@ func (s *Suite) Test_VartypeCheck_Prefix
 			"Please use \"${PKGMANDIR}/man1\" instead of \"man/man1\".",
 		"ERROR: filename.mk:3: The pathname \"/absolute\" in PKGMANDIR "+
 			"must be relative to ${PREFIX}.")
 	vt.Varname("INSTALLATION_DIRS")
 	vt.Values(
 		"bin ${PKG_SYSCONFDIR} ${VARBASE}")
 	vt.Output(
 		"ERROR: filename.mk:11: PKG_SYSCONFDIR must not be used in INSTALLATION_DIRS "+
 			"since it is not relative to PREFIX.",
 		"ERROR: filename.mk:11: VARBASE must not be used in INSTALLATION_DIRS "+
 			"since it is not relative to PREFIX.")
 	// INSTALLATION_DIRS automatically replaces "man" with "${PKGMANDIR}".
 	vt.Varname("INSTALLATION_DIRS")
 	vt.Values(
 		"man/man1")
 	vt.OutputEmpty()
+}
 func (s *Suite) Test_VartypeCheck_PythonDependency(c *check.C) {
 	vt := NewVartypeCheckTester(s.Init(c), BtPythonDependency)
 	vt.Varname("PYTHON_VERSIONED_DEPENDENCIES")
 	vt.Values(
 		"cairo",
 		"${PYDEP}",
 		"cairo,X")
 	vt.Output(
 		"WARN: filename.mk:2: Python dependencies should not contain variables.",