From owner-svn-ports-all@FreeBSD.ORG  Fri Sep 19 00:50:38 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8C27C490;
 Fri, 19 Sep 2014 00:50:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 77624D68;
 Fri, 19 Sep 2014 00:50:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8J0oc2b072401;
 Fri, 19 Sep 2014 00:50:38 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8J0ocDJ072400;
 Fri, 19 Sep 2014 00:50:38 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201409190050.s8J0ocDJ072400@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 19 Sep 2014 00:50:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368535 - head/Mk
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Sep 2014 00:50:38 -0000

Author: bdrewery
Date: Fri Sep 19 00:50:37 2014
New Revision: 368535
URL: http://svnweb.freebsd.org/changeset/ports/368535
QAT: https://qat.redports.org/buildarchive/r368535/

Log:
  - Fix minimum pkg version check when using pkg from git. Strip out everything
    after '-' as it is a hash. It is not strictly newer than the implicit 0.
  - Reword msg [1]
  
  Submitted by:	adamw [1]
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Sep 18 22:16:11 2014	(r368534)
+++ head/Mk/bsd.port.mk	Fri Sep 19 00:50:37 2014	(r368535)
@@ -1223,9 +1223,9 @@ WITH_NEW_XORG?=	yes
 .if !defined(_PKG_VERSION)
 _PKG_VERSION!=	${PKG_BIN} -v
 .endif
-_PKG_STATUS!=	${PKG_BIN} version -t ${_PKG_VERSION:S/-/\./g} ${MINIMAL_PKG_VERSION}
+_PKG_STATUS!=	${PKG_BIN} version -t ${_PKG_VERSION:C/-.*//g} ${MINIMAL_PKG_VERSION}
 .if ${_PKG_STATUS} == "<"
-IGNORE=		You need pkg(8) at least version ${MINIMAL_PKG_VERSION} and you have ${_PKG_VERSION} please consider upgrading pkg(8) first
+IGNORE=		pkg(8) must be version ${MINIMAL_PKG_VERSION} or greater, but you have ${_PKG_VERSION}. You must upgrade pkg(8) first
 .endif
 .endif