diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2018-01-06 23:50:22 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2018-01-06 23:50:22 +0000 |
| commit | 39150e2743acd19672e4e0f6ad65375fca3c8fb6 (patch) | |
| tree | caae745fdc112f79423b6481452a61d729b9394b /ports-mgmt | |
| parent | ed2b8cb729af92bb59858bc46ebdedef9ae28e67 (diff) | |
| download | ports-39150e2743acd19672e4e0f6ad65375fca3c8fb6.tar.gz ports-39150e2743acd19672e4e0f6ad65375fca3c8fb6.zip | |
Update to 1.10.4
- Fix progression display
- Parse FreeBSD OS version and forbid to install too new packages
Notes
Notes:
svn path=/head/; revision=458302
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/pkg/distinfo | 6 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-src_version.c | 28 |
3 files changed, 4 insertions, 33 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 9e2fcbf910d9..89c71ac4f4e6 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.10.3 -PORTREVISION= 1 +DISTVERSION= 1.10.4 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 54cbaafe96b9..882f570fe7d6 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512423062 -SHA256 (pkg-1.10.3.tar.xz) = a5db61522eccc91538b0ac19da56ddbe8eaf8c3bd94868a1753c37c8bade7715 -SIZE (pkg-1.10.3.tar.xz) = 2188196 +TIMESTAMP = 1515282421 +SHA256 (pkg-1.10.4.tar.xz) = 10f767ba6b2e257fef6f1553f74b8602b6fba9de382ee8f2bb6966bcc03696fa +SIZE (pkg-1.10.4.tar.xz) = 2184588 diff --git a/ports-mgmt/pkg/files/patch-src_version.c b/ports-mgmt/pkg/files/patch-src_version.c deleted file mode 100644 index 714e66a63917..000000000000 --- a/ports-mgmt/pkg/files/patch-src_version.c +++ /dev/null @@ -1,28 +0,0 @@ -diff --git src/version.c src/version.c -index d265776b..92c18060 100644 ---- src/version.c -+++ src/version.c -@@ -601,6 +601,8 @@ exec_buf(UT_string *res, char **argv) { - if (errno != EINTR) - return (-1); - } -+ if (WEXITSTATUS(pstat) != 0) -+ return (-1); - - return (utstring_len(res)); - } -@@ -716,11 +718,13 @@ port_version(UT_string *cmd, const char *portsdir, const char *origin, - argv[3] = "flavors-package-names"; - argv[4] = NULL; - -- if (exec_buf(cmd, argv) != 0) { -+ if (exec_buf(cmd, argv) > 0) { - output = utstring_body(cmd); - while ((walk = strsep(&output, "\n")) != NULL) { - name = walk; - walk = strrchr(walk, '-'); -+ if (walk == NULL) -+ continue; - walk[0] = '\0'; - walk++; - if (strcmp(name, pkgname) == 0) { |