aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ports-mgmt/pkg-devel/Makefile3
-rw-r--r--ports-mgmt/pkg-devel/distinfo4
-rw-r--r--ports-mgmt/pkg-devel/files/patch-errata162
-rw-r--r--ports-mgmt/pkg/Makefile3
-rw-r--r--ports-mgmt/pkg/distinfo4
-rw-r--r--ports-mgmt/pkg/files/patch-errata162
6 files changed, 6 insertions, 132 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 11aed0063ccb..e69e93819304 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/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-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index be8270884a97..f9e02431c85f 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/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-devel/files/patch-errata1 b/ports-mgmt/pkg-devel/files/patch-errata1
deleted file mode 100644
index 8189fd13a4b4..000000000000
--- a/ports-mgmt/pkg-devel/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);
-
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);
-
generated by cgit (git 2.34.1) at 2024-12-14 02:22:01 +0800