Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2013 00:38:39 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330466 - head/Mk
Message-ID:  <201310160038.r9G0cd7k026369@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Wed Oct 16 00:38:38 2013
New Revision: 330466
URL: http://svnweb.freebsd.org/changeset/ports/330466

Log:
  - Properly reference pkg(8) for conflcts instead of pkg_delete(1)
  
  Reported by:	Julian H. Stacey, gjb
  With hat:	portmgr

Modified:
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Wed Oct 16 00:31:43 2013	(r330465)
+++ head/Mk/bsd.pkgng.mk	Wed Oct 16 00:38:38 2013	(r330466)
@@ -189,7 +189,7 @@ check-install-conflicts:
 			${ECHO_MSG} "      $${entry}"; \
 		done; \
 		${ECHO_MSG}; \
-		${ECHO_MSG} "      Please remove them first with pkg_delete(1)."; \
+		${ECHO_MSG} "      Please remove them first with pkg delete."; \
 		exit 1; \
 	fi
 .else
@@ -208,7 +208,7 @@ check-install-conflicts:
 		done; \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "      They install files into the same place."; \
-		${ECHO_MSG} "      Please remove them first with pkg_delete(1)."; \
+		${ECHO_MSG} "      Please remove them first with pkg delete."; \
 		exit 1; \
 	fi
 .endif # defined(DEFER_CONFLICTS_CHECK)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310160038.r9G0cd7k026369>