013f320 Partially revert 06cd326e and change pkg.conf.5 to reference /etc/pkg. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Partially revert 06cd326e and change pkg.conf.5 to reference /etc/pkg.

Bryan Drewery committed 12 years ago

commit 013f320cbe50f15979ebf2b12cb86f041038bd00
parent bde3ed3

2 files changed +1 -4

modified libpkg/pkg_config.c

@@ -911,9 +911,6 @@ load_repositories(const char *repodir)

 		return;
 	}
 	if (access("/etc/pkg/repos", F_OK) == 0)
 		load_repo_files("/etc/pkg/repos");
 	v = NULL;
 	while (pkg_config_list(PKG_CONFIG_REPOS_DIR, &v) == EPKG_OK)
 		load_repo_files(pkg_config_value(v));

modified pkg/pkg.conf.5

@@ -213,7 +213,7 @@ To use multiple repositories, specify the primary repository as shown above.

 Further repositores can be configured using repository files.
 .Pp
 Repository files reside in
 .Pa /etc/pkg/repos/
 .Pa /etc/pkg/
 and
 .Pa /usr/local/etc/pkg/repos/ .
 .Pp