mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-04 11:23:46 +00:00
Code Issues Releases Activity

- Properly reference pkg(8) for conflcts instead of pkg_delete(1)

Browse Source 
Reported by:	Julian H. Stacey, gjb
With hat:	portmgr
This commit is contained in:
Bryan Drewery 2013-10-16 00:38:38 +00:00
parent 6e7cb4e0c2
commit 6059af56b7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=330466
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mk/bsd.pkgng.mk
View File

@ -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)