diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-06-19 21:45:43 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-06-19 21:45:43 +0000 |
| commit | 70fe959214eab0c4b5dce26f2a56e6cd8df456db (patch) | |
| tree | 9167f741c734c017f5aa705bdbe2f6ca227b311b /ports-mgmt | |
| parent | 68fdbeba167f9b6d51a322db0d70e042138178ce (diff) | |
| download | ports-70fe959214eab0c4b5dce26f2a56e6cd8df456db.tar.gz ports-70fe959214eab0c4b5dce26f2a56e6cd8df456db.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/pkg/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-fix-register-update | 39 |
3 files changed, 3 insertions, 43 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index d2c6f7ad7824..83900c1e5665 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.0.13 -PORTREVISION= 1 +DISTVERSION= 1.0.14 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/portmgr \ http://files.etoilebsd.net/pkg/ \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 12d3ae77dbcb..ad2302ca4484 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.0.13.tar.xz) = 29d2f477f30aff8dd394ffbcdc9e75f3b88ba43d99da71b2a5ad9e171241271b -SIZE (pkg-1.0.13.tar.xz) = 1458576 +SHA256 (pkg-1.0.14.tar.xz) = ded2c91b0e13fb34da36868328e9b5f3700c634c1fa4962ce3910f20d66a0a53 +SIZE (pkg-1.0.14.tar.xz) = 1458472 diff --git a/ports-mgmt/pkg/files/patch-fix-register-update b/ports-mgmt/pkg/files/patch-fix-register-update deleted file mode 100644 index 5a686fbdb163..000000000000 --- a/ports-mgmt/pkg/files/patch-fix-register-update +++ /dev/null @@ -1,39 +0,0 @@ -diff --git libpkg/fetch.c libpkg/fetch.c -index c2e5919..c094e33 100644 ---- libpkg/fetch.c -+++ libpkg/fetch.c -@@ -212,7 +212,7 @@ pkg_fetch_file_to_fd(const char *url, int dest, time_t t) - } - } - } -- if (t != 0) { -+ if (t != 0 && st.mtime != 0) { - if (st.mtime <= t) { - retcode = EPKG_UPTODATE; - goto cleanup; -diff --git newvers.sh newvers.sh -index 207aab0..651231f 100755 ---- newvers.sh -+++ newvers.sh -@@ -41,7 +41,7 @@ - : ${PKG_MINOR_VERSION="0"} - : ${PKG_PATCH_LEVEL="13"} - --: ${PORTREVISION:=""} -+: ${PORTREVISION:="1"} - : ${PORTEPOCH:=} - - # ------------------------------------------------------------------ -diff --git pkg/register.c pkg/register.c -index 385f8a2..ce29612 100644 ---- pkg/register.c -+++ pkg/register.c -@@ -119,7 +119,7 @@ exec_register(int argc, char **argv) - err(1, "cannot allocate memory"); - break; - case 'd': -- pkg_set(pkg, PKG_AUTOMATIC, true); -+ pkg_set(pkg, PKG_AUTOMATIC, (int64_t)true); - break; - case 'i': - if ((input_path = strdup(optarg)) == NULL) |