[PATCH] Fix typos in bsd.port.mk and minor logic improvements

[Garrett Cooper]

On Tue, Jul 13, 2010 at 2:35 PM, b. f. <bf1783 at googlemail.com> wrote:
>>So I'm taking it that the only change of benefit is the attached patch.
>
> While you are there, you might also:
>
> line 150: s/supercede/supersede/
> line 764: s/dependancies/dependencies/
> line 2982: s/everthing/everything/
> line 6142: s/servicable/serviceable/

Thanks for the extra eyes on the typos :) .. found a few easy
grammatical / spelling errors (eg -> e.g., ie. -> i.e.). I don't want
to go much further because I've spotted a number of grammatically
incorrect IGNORE error messages, etc.

--- /usr/ports/Mk/bsd.port.mk	2010-06-04 01:09:17.000000000 -0700
+++ bsd.port.mk	2010-07-13 22:03:17.000000000 -0700
@@ -147,7 +147,7 @@
 #				- If set, only use ${MASTER_SITE_BACKUP} for
 #				  MASTER_SITES.
 # CD_MOUNTPTS	- List of CDROM mountpoints to look for distfiles under.
-#				  This variable supercedes CD_MOUNTPT, which is
+#				  This variable supersedes CD_MOUNTPT, which is
 #				  obsolete.
 #
 # Set these if your port should not be built under certain circumstances.
@@ -761,7 +761,7 @@
 # deinstall-all	- Remove all installations with the same PKGORIGIN.
 # package		- Create a package from an _installed_ port.
 # package-recursive
-#				- Create a package for a port and _all_ of its dependancies.
+#				- Create a package for a port and _all_ of its dependencies.
 # describe		- Try to generate a one-line description for each port for
 #				  use in INDEX files and the like.
 # checkpatch	- Do a "patch -C" instead of a "patch".  Note that it may
@@ -988,7 +988,7 @@
 #				  described below except that any line beginning with @comment
 #				  is deleted.
 # SUB_LIST		- List of "variable=value" pair for substitution in ${SUB_FILES}
-#				  Some pairs are added by default: eg. PREFIX=${PREFIX}
+#				  Some pairs are added by default, e.g. PREFIX=${PREFIX}
 #
 # INSTALLS_SHLIB
 #				- If set, bsd.port.mk will automatically run ldconfig commands
@@ -1055,7 +1055,7 @@
 #				  "Name" "Comment" "Icon" "Exec" "Categories" StartupNotify
 #				  Rules:
 #					* Only add desktop entries for applications which do not
-#					  require a terminal (ie. X applications).
+#					  require a terminal, i.e. X applications.
 #					* If the upstream distribution already installs .desktop
 #					  files, you do not need to use this.
 #					* If you require a more elaborate .desktop file than this
@@ -2979,7 +2979,7 @@
 PKGFILE?=		${.CURDIR}/${PKGNAME}${PKG_SUFX}
 .endif

-# The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
+# The "latest version" link -- ${PKGNAME} minus everything after the last '-'
 PKGLATESTREPOSITORY?=	${PACKAGES}/Latest
 PKGBASE?=			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 LATEST_LINK?=		${PKGBASE}
@@ -5465,10 +5465,9 @@
 	if [ "${CHILD_DEPENDS}" ]; then \
 		installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \
 			${TRUE}); \
-		if [ "$$installed" ]; then \
+		if [ -n "$$installed" ]; then \
 			break; \
-		fi; \
-		if [ -z "$$installed" ]; then \
+		else \
 			installed="${PKGNAME}"; \
 		fi; \
 		for pkgname in $$installed; do \
@@ -5511,16 +5510,15 @@
 			while [ $$\# -gt 1 ]; do \
 				if [ ! -d "${PORTSDIR}/$$2" ]; then \
 					shift; \
-					continue; \
-				fi; \
-				if [ "$$dir" = "$$2" ]; then \
+				elif [ "$$dir" = "$$2" ]; then \
 					${ECHO_CMD} $$1:$$dir; \
 					if [ -e ${PKG_DBDIR}/$$1/+CONTENTS -a -z
"${EXPLICIT_PACKAGE_DEPENDS}" ]; then \
 						packagelist="$$packagelist ${PKG_DBDIR}/$$1/+CONTENTS"; \
 					fi; \
 					break; \
+				else \
+					shift 2; \
 				fi; \
-				shift 2; \
 			done; \
 		done; \
 		[ -z "$$packagelist" ] || ${AWK} -F '( |:)' 'BEGIN {
pkgname="broken_contents" } /@pkgdep / { pkgname=$$2 } /@comment
DEPORIGIN:/ { printf "%s:%s\n", pkgname, $$3;
pkgname="broken_contents" }' $$packagelist; \
@@ -5541,7 +5539,7 @@
 		(cd $$dir; ${MAKE} package-noinstall); \
 	done

-# Show missing dependiencies
+# Show missing dependencies
 missing:
 	@_origins=$$(${PKG_INFO} -aoq); \
 	for dir in $$(${ALL-DEPENDS-LIST}); do \
@@ -6139,7 +6137,7 @@
 	TMPOPTIONSFILE=$$(mktemp -t portoptions); \
 	trap "${RM} -f $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \
 	${ECHO_CMD} "# This file is auto-generated by 'make config'." >
$${TMPOPTIONSFILE}; \
-	${ECHO_CMD} "# No user-servicable parts inside!" >> $${TMPOPTIONSFILE}; \
+	${ECHO_CMD} "# No user-serviceable parts inside!" >> $${TMPOPTIONSFILE}; \
 	${ECHO_CMD} "# Options for ${PKGNAME}" >> $${TMPOPTIONSFILE}; \
 	${ECHO_CMD} "_OPTIONS_READ=${PKGNAME}" >> $${TMPOPTIONSFILE}; \
 	for i in $${OPTIONSLIST}; do \