From owner-svn-ports-all@FreeBSD.ORG Tue Jun 18 20:01:33 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4558EF5B; Tue, 18 Jun 2013 20:01:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 37801107E; Tue, 18 Jun 2013 20:01:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IK1XaW093095; Tue, 18 Jun 2013 20:01:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5IK1Xk3093094; Tue, 18 Jun 2013 20:01:33 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201306182001.r5IK1Xk3093094@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 18 Jun 2013 20:01:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321219 - head/ports-mgmt/pkg/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 20:01:33 -0000 Author: bapt Date: Tue Jun 18 20:01:32 2013 New Revision: 321219 URL: http://svnweb.freebsd.org/changeset/ports/321219 Log: Actually push the right patch Modified: head/ports-mgmt/pkg/files/patch-fix-register-update Modified: head/ports-mgmt/pkg/files/patch-fix-register-update ============================================================================== --- head/ports-mgmt/pkg/files/patch-fix-register-update Tue Jun 18 19:57:51 2013 (r321218) +++ head/ports-mgmt/pkg/files/patch-fix-register-update Tue Jun 18 20:01:32 2013 (r321219) @@ -1,16 +1,16 @@ diff --git libpkg/fetch.c libpkg/fetch.c -index c2e5919..8e902ae 100644 +index c2e5919..c094e33 100644 --- libpkg/fetch.c +++ libpkg/fetch.c -@@ -145,7 +145,7 @@ pkg_fetch_file_to_fd(const char *url, int dest, time_t t) - retry = max_retry; - - u = fetchParseURL(url); -- if (t != 0) -+ if (t != 0 && st.mtime != 0) - u->ims_time = t; - - doc = u->doc; +@@ -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