aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt/pkg/files
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2013-11-27 18:26:48 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2013-11-27 18:26:48 +0000
commita00c8be88c01e089bea6800d7fed1d2938cbe644 (patch)
treec2188642870ca36b90219c50c07e2555d9519509 /ports-mgmt/pkg/files
parent2f1f506aa7fcb8582867b561c41e75af2a675c48 (diff)
downloadports-a00c8be88c01e089bea6800d7fed1d2938cbe644.tar.gz
ports-a00c8be88c01e089bea6800d7fed1d2938cbe644.zip
Release pkg 1.2.1
Changes: - Fix pkg rquery always printing index like lines - Fix pkg -vv suggestion so it print something actually usable - Fix shlib's -P and -R options were swapped round. - Replace broken pkg_repos_count() by pkg_repos_total_count() and pkg_repos_activated_count() - Fix parsing of options (in manifest) - pkg add http:// now fetch to a temporary location and cleanup after itself - Fix generation of the manifest digest - Properly calculate how many packages where removed - Fix support for dependencies with the same name (grrrr Fix you port if they have package name collision !!!!) - Fix pkg info -R in case multiple dependencies has the same name
Notes
Notes: svn path=/head/; revision=335041
Diffstat (limited to 'ports-mgmt/pkg/files')
-rw-r--r--ports-mgmt/pkg/files/patch-errata162
1 files changed, 0 insertions, 62 deletions
diff --git a/ports-mgmt/pkg/files/patch-errata1 b/ports-mgmt/pkg/files/patch-errata1
deleted file mode 100644
index 8189fd13a4b4..000000000000
--- a/ports-mgmt/pkg/files/patch-errata1
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git COPYING COPYING
-index a8adb39..d6bd4e1 100644
---- COPYING
-+++ COPYING
-@@ -1,6 +1,6 @@
- See the AUTHORS file to get the list of authors
-
--Copyright (c) 2010-2012 <author(s)>
-+Copyright (c) 2010-2013 <author(s)>
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
-diff --git pkg/main.c pkg/main.c
-index c562ac8..ec382c5 100644
---- pkg/main.c
-+++ pkg/main.c
-@@ -442,17 +442,23 @@ show_repository_info(void)
- break;
- }
-
-- printf(" %s: { \n %-16s: %s,\n %-16s: %s,\n %-16s: %s,\n"
-- " %-16s: %s,\n %-16s: %s,\n %-16s: %s\n } \n",
-+ printf(" %s: { \n %-16s: \"%s\",\n %-16s: %s",
- pkg_repo_ident(repo),
- "url", pkg_repo_url(repo),
-- "signature_type", sig,
-- "pubkey", pkg_repo_key(repo) == NULL ?
-- "" : pkg_repo_key(repo),
-- "fingerprints", pkg_repo_fingerprints(repo) == NULL ?
-- "" : pkg_repo_fingerprints(repo),
-- "enabled", pkg_repo_enabled(repo) ? "yes" : "no",
-- "mirror_type", mirror);
-+ "enabled", pkg_repo_enabled(repo) ? "yes" : "no");
-+ if (pkg_repo_mirror_type(repo) != NOMIRROR)
-+ printf(",\n %-16s: \"%s\"",
-+ "mirror_type", mirror);
-+ if (pkg_repo_signature_type(repo) != SIG_NONE)
-+ printf(",\n %-16s: \"%s\"",
-+ "signature_type", sig);
-+ if (pkg_repo_fingerprints(repo) != NULL)
-+ printf(",\n %-16s: \"%s\"",
-+ "fingerprints", pkg_repo_fingerprints(repo));
-+ if (pkg_repo_key(repo) != NULL)
-+ printf(",\n %-16s: \"%s\"",
-+ "pubkey", pkg_repo_key(repo));
-+ printf("\n }\n");
- }
- }
-
-diff --git pkg/rquery.c pkg/rquery.c
-index d4c3868..e97ece5 100644
---- pkg/rquery.c
-+++ pkg/rquery.c
-@@ -110,7 +110,7 @@ exec_rquery(int argc, char **argv)
- bool auto_update;
- bool onematched = false;
- bool old_quiet;
-- bool index_output = true;
-+ bool index_output = false;
-
- pkg_config_bool(PKG_CONFIG_REPO_AUTOUPDATE, &auto_update);
-