From owner-freebsd-hackers@FreeBSD.ORG Wed Jul 14 05:06:03 2010 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD35D1065675 for ; Wed, 14 Jul 2010 05:06:03 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 957B18FC1A for ; Wed, 14 Jul 2010 05:06:03 +0000 (UTC) Received: by iwn35 with SMTP id 35so8204121iwn.13 for ; Tue, 13 Jul 2010 22:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=IrCmYi490qJPFAJRWs0oyw3449DL1I0NNNPs0cRRKGU=; b=Z1zsAWOkzB0sgxyIbdDCJMw5jTX36zy1JtngdmxStmYsck/6G5bc+UgaNaBrcGChGr LXSorzMqBwIjEoeO3o82ZBDZspEBDpWYUjCFndclAyYaaYSrj0lJY+qjoolLXlYLkK7E yMRPVQXqoYi8WB43ZckZTIEGIZZDfD0s0d6gM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=tmfUFBpDPRbTPg2AENeYAFi8YFFKpQcdL6LuTWIvSja/vUsF9Fj0x0mxUK0+aPCU8F z0RI2c+WLTx5ooQpo2tANZPml/r5H9lz60gjXiUQoHx6Wf6A9hzltGtxjDXd3mgPwWtA O7G+WaxeFQrh99y6Imsm4a78FicCwmsDdgnmA= MIME-Version: 1.0 Received: by 10.231.36.134 with SMTP id t6mr16927885ibd.128.1279083962644; Tue, 13 Jul 2010 22:06:02 -0700 (PDT) Received: by 10.231.169.18 with HTTP; Tue, 13 Jul 2010 22:06:02 -0700 (PDT) In-Reply-To: References: Date: Tue, 13 Jul 2010 22:06:02 -0700 Message-ID: From: Garrett Cooper To: bf1783@gmail.com Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-hackers@freebsd.org Subject: Re: [PATCH] Fix typos in bsd.port.mk and minor logic improvements X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2010 05:06:03 -0000 On Tue, Jul 13, 2010 at 2:35 PM, b. f. 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 \