New configuration schemas changes, round 3.

struct xbps_handle::conffile has been renamed to confdir, and it now
expects the path to a directory, where the configuration files are
stored.

Change xbps-bin(8) and xbps-repo(8) along with its manpages to mention
that -C expects a directory.

bin/xbps-bin/main.c

@@ -185,12 +185,12 @@ main(int argc, char **argv)
 	struct xferstat xfer;
 	struct list_pkgver_cb lpc;
 	struct sigaction sa;
-	const char *rootdir, *cachedir, *conffile;
+	const char *rootdir, *cachedir, *confdir;
 	int i , c, flags, rv;
 	bool yes, purge, debug, force_rm_with_deps, recursive_rm;
 	bool install_auto, install_manual, show_download_pkglist_url;
 
-	rootdir = cachedir = conffile = NULL;
+	rootdir = cachedir = confdir = NULL;
 	flags = rv = 0;
 	yes = purge = force_rm_with_deps = recursive_rm = debug = false;
 	install_auto = install_manual = show_download_pkglist_url = false;
@@ -201,7 +201,7 @@ main(int argc, char **argv)
 			install_auto = true;
 			break;
 		case 'C':
-			conffile = optarg;
+			confdir = optarg;
 			break;
 		case 'c':
 			cachedir = optarg;
@@ -290,8 +290,8 @@ main(int argc, char **argv)
 		xhp->rootdir = prop_string_create_cstring(rootdir);
 	if (cachedir)
 		xhp->cachedir = prop_string_create_cstring(cachedir);
-	if (conffile)
-		xhp->conffile = prop_string_create_cstring(conffile);
+	if (confdir)
+		xhp->confdir = prop_string_create_cstring(confdir);
 
 	xhp->flags = flags;
 	xhp->install_reason_manual = install_manual;

bin/xbps-bin/xbps-bin.8

@@ -1,4 +1,4 @@
-.TH "XBPS\-BIN" "8" "07/28/2011" "\ \&" "\ \&"
+.TH "XBPS\-BIN" "8" "17/10/2011" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -28,9 +28,10 @@ Use of this option takes effect in the \fIautoupdate\fR, \fIinstall\fR and
 matched.
 .RE
 .PP
-\fB\-C\fR \fIconffile\fR
+\fB\-C\fR \fIconfdir\fR
 .RS 4
-Full path to the \fIxbps-conf.plist\fR plist configuration file.
+Full path to the XBPS configuration directory where the configuration files are available\&.
+By default it\(cqs set to \fIETCDIR/xbps\fR\&.
 .RE
 .PP
 \fB\-c\fR \fIcachedir\fR
@@ -287,6 +288,7 @@ The package is fully installed, that means it was unpacked and configured correc
 .RE
 .PP
 \fBhalf\-unpacked\fR
+.RS 4
 The package was being unpacked but didn't finish properly for unknown reasons.
 .RE
 .PP
@@ -302,11 +304,16 @@ The package has been removed but configuration files and its metadata directory
 .PP
 .SH "FILES"
 .PP
-\fB/etc/xbps-conf.plist\fR
+\fB/etc/xbps/conf.plist\fR
 .RS 4
 Default XBPS configuration file\&.
 .RE
 .PP
+\fB/etc/xbps/repositories.plist\fR
+.RS 4
+Defaults XBPS repositories configuration file\&.
+.RE
+.PP
 \fB/var/db/xbps\fR
 .RS 4
 xbps global metadata directory\&.

bin/xbps-repo/main.c

@@ -90,16 +90,16 @@ main(int argc, char **argv)
 	struct xbps_handle *xhp;
 	struct xferstat xfer;
 	prop_dictionary_t pkgd;
-	const char *rootdir, *cachedir, *conffile;
+	const char *rootdir, *cachedir, *confdir;
 	int c, rv = 0;
 	bool debug = false;
 
-	rootdir = cachedir = conffile = NULL;
+	rootdir = cachedir = confdir = NULL;
 
 	while ((c = getopt(argc, argv, "C:c:dr:V")) != -1) {
 		switch (c) {
 		case 'C':
-			conffile = optarg;
+			confdir = optarg;
 			break;
 		case 'c':
 			cachedir = optarg;
@@ -143,8 +143,8 @@ main(int argc, char **argv)
 		xhp->rootdir = prop_string_create_cstring(rootdir);
 	if (cachedir)
 		xhp->cachedir = prop_string_create_cstring(cachedir);
-	if (conffile)
-		xhp->conffile = prop_string_create_cstring(conffile);
+	if (confdir)
+		xhp->confdir = prop_string_create_cstring(confdir);
 
 	if ((rv = xbps_init(xhp)) != 0) {
 		xbps_error_printf("xbps-repo: couldn't initialize library: %s\n",

bin/xbps-repo/xbps-repo.8

@@ -1,4 +1,4 @@
-.TH "XBPS\-REPO" "8" "07/23/2011" "\ \&" "\ \&"
+.TH "XBPS\-REPO" "8" "17/10/2011" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -19,9 +19,10 @@ xbps-repo \- XBPS command for binary package repositories
 The xbps\-repo(8) command is used to handle local or remote binary package repositories in the \fBXBPS binary package system\fR\&. You can use it to create a package index for a local repository, list repositories, search for packages and show information about a binary package in repository pool\&.
 .SH "OPTIONS"
 .PP
-\fB\-C\fR \fIconffile\fR
+\fB\-C\fR \fIconfdir\fR
 .RS 4
-Full path to the \fIxbps-conf.plist\fR plist configuration file.
+Full path to the XBPS configuration directory where the configuration files are available\&. 
+By default it\(cqs set to \fIETCDIR/xbps\fR\&.
 .RE
 .PP
 \fB\-c\fR \fIcachedir\fR
@@ -123,11 +124,16 @@ Syncs the package index file for all registered remote repositories\&. The new f
 .RE
 .SH "FILES"
 .PP
-\fB/etc/xbps-conf.plist\fR
+\fB/etc/xbps/conf.plist\fR
 .RS 4
 Default XBPS configuration file\&.
 .RE
 .PP
+\fB/etc/xbps/repositories.plist\fR
+.RS 4
+Default XBPS repositories configuration file\&.
+.RE
+.PP
 \fB/var/db/xbps/<remoterepodir>/pkg\-index\&.plist\fR
 .RS 4
 Remote repository package index file\&.

bin/xbps-uhelper/main.c

@@ -113,7 +113,7 @@ main(int argc, char **argv)
 	struct xbps_handle *xhp;
 	struct xferstat xfer;
 	prop_dictionary_t dict;
-	const char *version, *rootdir = NULL, *conffile = NULL;
+	const char *version, *rootdir = NULL, *confdir = NULL;
 	char *plist, *pkgname, *pkgver, *in_chroot_env, *hash;
 	bool debug = false, in_chroot = false;
 	int i, c, rv = 0;
@@ -121,7 +121,7 @@ main(int argc, char **argv)
 	while ((c = getopt(argc, argv, "C:dr:V")) != -1) {
 		switch (c) {
 		case 'C':
-			conffile = optarg;
+			confdir = optarg;
 			break;
 		case 'r':
 			/* To specify the root directory */
@@ -158,8 +158,8 @@ main(int argc, char **argv)
 	xhp->xfcd->cookie = &xfer;
 	if (rootdir)
 		xhp->rootdir = prop_string_create_cstring(rootdir);
-	if (conffile)
-		xhp->conffile = prop_string_create_cstring(conffile);
+	if (confdir)
+		xhp->confdir = prop_string_create_cstring(confdir);
 
 	if ((rv = xbps_init(xhp)) != 0) {
 		xbps_error_printf("xbps-uhelper: failed to "