diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-11-27 18:26:48 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-11-27 18:26:48 +0000 |
| commit | a00c8be88c01e089bea6800d7fed1d2938cbe644 (patch) | |
| tree | c2188642870ca36b90219c50c07e2555d9519509 /ports-mgmt/pkg | |
| parent | 2f1f506aa7fcb8582867b561c41e75af2a675c48 (diff) | |
| download | ports-a00c8be88c01e089bea6800d7fed1d2938cbe644.tar.gz ports-a00c8be88c01e089bea6800d7fed1d2938cbe644.zip | |
Notes
Diffstat (limited to 'ports-mgmt/pkg')
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/pkg/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-errata1 | 62 |
3 files changed, 3 insertions, 66 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 03d8a2661db3..d6c45151ce02 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.2 -PORTREVISION= 1 +DISTVERSION= 1.2.1 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index be8270884a97..f9e02431c85f 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.2.tar.xz) = 1e353780a9f78ab4b962108c8fa245406823467eb81e762cb682c6fb72c60a38 -SIZE (pkg-1.2.tar.xz) = 1802740 +SHA256 (pkg-1.2.1.tar.xz) = 829100ff78ea930d1cb9e5af7907a17fa1e1063ab6b25b8aea7e1d04280c93ab +SIZE (pkg-1.2.1.tar.xz) = 1802908 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); - |