git: 35c4572d6a6f - main - Mk/bsd.port.mk: fix couple of minor annoyances

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=35c4572d6a6ffb1435d8932eeb5134053bc26bee

commit 35c4572d6a6ffb1435d8932eeb5134053bc26bee
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-07-22 10:22:20 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-07-22 10:22:39 +0000

    Mk/bsd.port.mk: fix couple of minor annoyances
    
    - Improve the text (fix typos) in another .warning message
    - And an extra newline after "backward compatibility for users"
      .if/.endif block for better readability, kill EOL whitespace
    - Replace UTF-8 non-breaking space (C2 A0) with normal ASCII one
---
 Mk/bsd.port.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 3c4acf11ebd3..76011a6e5f09 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -503,7 +503,7 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 #				- Similiar to INSTALL_PROGRAM and INSTALL_DATA commands but
 #				  working on whole trees of directories, takes 3 arguments,
 #				  last one is find(1) arguments and optional.
-#				  Example use: 
+#				  Example use:
 #				  cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR} "! -name *\.bak"
 #
 #				  Installs all directories and files from ${WRKSRC}/doc
@@ -2246,7 +2246,7 @@ PKG_COMPRESSION_FORMAT?=	${PKG_SUFX:S/.//}
 .else
 .if defined(PKG_SUFX)
 PKG_COMPRESSION_FORMAT?=	${PKG_SUFX:S/.//}
-.warning PKG_SUFX is defined, if should be replace with PKG_COMPRESSION_FORMAT
+.warning PKG_SUFX is defined, it should be replaced with PKG_COMPRESSION_FORMAT
 .endif
 PKG_SUFX=	.pkg
 .endif
@@ -2259,6 +2259,7 @@ PKG_COMPRESSION_FORMAT?=	tar
 PKG_COMPRESSION_FORMAT?=	txz
 #.endif
 .endif
+
 # where pkg(8) stores its data
 PKG_DBDIR?=		/var/db/pkg
 
@@ -3371,7 +3372,7 @@ identify-install-conflicts:
 
 .if !target(check-install-conflicts)
 check-install-conflicts:
-.if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) || ( defined(CONFLICTS_BUILD) && defined(DEFER_CONFLICTS_CHECK) ) ) && !defined(DISABLE_CONFLICTS) 
+.if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) || ( defined(CONFLICTS_BUILD) && defined(DEFER_CONFLICTS_CHECK) ) ) && !defined(DISABLE_CONFLICTS)
 .if defined(DEFER_CONFLICTS_CHECK)
 	@conflicts_with=$$( \
 	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \
@@ -3651,7 +3652,7 @@ security-check: ${TMPPLIST}
 #   4.  startup scripts, in conjunction with 2.
 #   5.  world-writable files/dirs
 #
-#  The ${NONEXISTENT} argument of ${READELF} is there so that there are always
+#  The ${NONEXISTENT} argument of ${READELF} is there so that there are always
 #  at least two file arguments, and forces it to always output the "File: foo"
 #  header lines.
 #
@@ -4131,7 +4132,7 @@ MISSING-DEPENDS-LIST=		${DEPENDS-LIST} -m ${_UNIFIED_DEPENDS:Q}
 BUILD-DEPENDS-LIST=			${DEPENDS-LIST} "${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}"
 RUN-DEPENDS-LIST=			${DEPENDS-LIST} "${LIB_DEPENDS} ${RUN_DEPENDS}"
 TEST-DEPENDS-LIST=			${DEPENDS-LIST} ${TEST_DEPENDS:Q}
-CLEAN-DEPENDS-LIST=			${DEPENDS-LIST} -wr ${_UNIFIED_DEPENDS:Q} 
+CLEAN-DEPENDS-LIST=			${DEPENDS-LIST} -wr ${_UNIFIED_DEPENDS:Q}
 CLEAN-DEPENDS-LIMITED-LIST=	${DEPENDS-LIST} -w ${_UNIFIED_DEPENDS:Q}
 
 .if !target(clean-depends)