From owner-freebsd-hackers@FreeBSD.ORG Fri Jul 9 15:11:35 2010 Return-Path: Delivered-To: hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38376106566C; Fri, 9 Jul 2010 15:11:35 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id D28ED8FC19; Fri, 9 Jul 2010 15:11:34 +0000 (UTC) Received: by gwb15 with SMTP id 15so1198784gwb.13 for ; Fri, 09 Jul 2010 08:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:cc:content-type; bh=B4PujO+lee/WW158m8cGjNSnjxKMQwuc89/xCCvcPLk=; b=RAxUs6TK0E+fbBhazpjlUXpqHsAaIQmS+7odP8u7qWZjbA4vt6FxhmPyOYwh8VHWPL mhPZ1yxHAQvUfvbVrkpv7NWZ762s6PcppH0HKJbMGcHxvLTmkmK4zsAhIyM7uvvmjn8w eqVqxxDVoMASoS+ozy/e9PRjAP6FcBKAgHloU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=ONsHgfDqvAY+nHnYoIPA7MgUHkCLpBAm+9JKd577eGkmJ1ycscrAnZV935fiLliunC TqM6Qz8x8jQxnpXGvxOpw4CBW0GwMPIrGFKHz4n0CB2P1IQSVU2XDi0VArZHyRjykKaL kHXaYXnuDbqw4P/3DtSXFfiOoeVQ1R746wv/U= MIME-Version: 1.0 Received: by 10.151.6.5 with SMTP id j5mr2212065ybi.20.1278688291086; Fri, 09 Jul 2010 08:11:31 -0700 (PDT) Received: by 10.231.214.145 with HTTP; Fri, 9 Jul 2010 08:11:31 -0700 (PDT) Date: Fri, 9 Jul 2010 08:11:31 -0700 Message-ID: From: Garrett Cooper To: hackers@freebsd.org Content-Type: multipart/mixed; boundary=000e0cd519865e63e6048af5d1be X-Mailman-Approved-At: Mon, 12 Jul 2010 11:07:36 +0000 Cc: portmgr@freebsd.org Subject: [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: Fri, 09 Jul 2010 15:11:35 -0000 --000e0cd519865e63e6048af5d1be Content-Type: text/plain; charset=ISO-8859-1 This is a change I made locally that I figured would be helpful because it: a. Fixes typos. b. Improves branch flow in a few spots. c. Doesn't assume that all strings that come back from pkg_install are empty (this is what's assumed today). Thanks, -Garrett --- /usr/ports/Mk/bsd.port.mk 2010-06-04 01:09:17.000000000 -0700 +++ bsd.port.mk 2010-07-09 08:01:08.000000000 -0700 @@ -20,7 +20,7 @@ # # DO NOT COMMIT CHANGES TO THIS FILE BY YOURSELF, EVEN IF YOU DID NOT GET # A RESPONSE FROM THE MAINTAINER(S) WITHIN A REASONABLE TIMEFRAME! ALL -# UNAUTHORISED CHANGES WILL BE UNCONDITIONALLY REVERTED! +# UNAUTHORIZED CHANGES WILL BE UNCONDITIONALLY REVERTED! FreeBSD_MAINTAINER= portmgr@FreeBSD.org @@ -3968,7 +3968,7 @@ prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \ if [ "x${PREFIX}" = "x$${prfx}" ]; then \ df=`${PKG_INFO} -q -f $${p} 2> /dev/null | ${GREP} -v "^@" | ${COMM} -12 - ${TMPPLIST}`; \ - if [ -n "$${df}" ]; then \ + if [ -n "$${df:-}" ]; then \ found_package=$${p}; \ break; \ fi; \ @@ -4551,7 +4551,7 @@ check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \ if [ "$${check_name}" = "${PKGBASE}" ]; then \ prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \ - if [ "x${PREFIX}" = "x$${prfx}" ]; then \ + if [ "x${PREFIX}" = "x$${prfx:-}" ]; then \ ${ECHO_MSG} "===> Deinstalling $${p}"; \ ${PKG_DELETE} -f $${p}; \ else \ @@ -4583,7 +4583,7 @@ for oldpkgorigin in $$(${GREP} "|${PKGORIGIN}|" ${PORTSDIR}/MOVED | ${CUT} -f 1 -d '|' | ${SORT} -u); do \ deinstall_names="$${deinstall_names} $$(${PKG_INFO} -q -O $${oldpkgorigin})"; \ done; \ - if [ -n "$${deinstall_names}" ]; then \ + if [ -n "$${deinstall_names:-}" ]; then \ for d in $${deinstall_names}; do \ ${ECHO_MSG} "===> Deinstalling $${d}"; \ ${PKG_DELETE} -f $${d}; \ @@ -5129,7 +5129,7 @@ -e 's/<=/=gt=/; s/=/=lt=/; s/>/=le=/' \ -e 's/=gt=/>/; s/=ge=/>=/; s/=lt=/ Found $$pkg_info, but you need to upgrade to $$prog."; \ exit 1; \ fi; \ @@ -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 \ --000e0cd519865e63e6048af5d1be Content-Type: application/octet-stream; name="bsd_dot_port_dot_mk-fix-typos-and-minor-improvements.diff" Content-Disposition: attachment; filename="bsd_dot_port_dot_mk-fix-typos-and-minor-improvements.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gbf5w0600 LS0tIC91c3IvcG9ydHMvTWsvYnNkLnBvcnQubWsJMjAxMC0wNi0wNCAwMTowOToxNy4wMDAwMDAw MDAgLTA3MDAKKysrIGJzZC5wb3J0Lm1rCTIwMTAtMDctMDkgMDg6MDE6MDguMDAwMDAwMDAwIC0w NzAwCkBAIC0yMCw3ICsyMCw3IEBACiAjCiAjIERPIE5PVCBDT01NSVQgQ0hBTkdFUyBUTyBUSElT IEZJTEUgQlkgWU9VUlNFTEYsIEVWRU4gSUYgWU9VIERJRCBOT1QgR0VUCiAjIEEgUkVTUE9OU0Ug RlJPTSBUSEUgTUFJTlRBSU5FUihTKSBXSVRISU4gQSBSRUFTT05BQkxFIFRJTUVGUkFNRSEgQUxM Ci0jIFVOQVVUSE9SSVNFRCBDSEFOR0VTIFdJTEwgQkUgVU5DT05ESVRJT05BTExZIFJFVkVSVEVE IQorIyBVTkFVVEhPUklaRUQgQ0hBTkdFUyBXSUxMIEJFIFVOQ09ORElUSU9OQUxMWSBSRVZFUlRF RCEKIAogRnJlZUJTRF9NQUlOVEFJTkVSPQlwb3J0bWdyQEZyZWVCU0Qub3JnCiAKQEAgLTM5Njgs NyArMzk2OCw3IEBACiAJCQkJCQlwcmZ4PWAke1BLR19JTkZPfSAtcSAtcCAkJHtwfSAyPiAvZGV2 L251bGwgfCAke1NFRH0gLW5lICcxc3xeQGN3ZCB8fHAnYDsgXAogCQkJCQkJaWYgWyAieCR7UFJF RklYfSIgPSAieCQke3ByZnh9IiBdOyB0aGVuIFwKIAkJCQkJCQkJZGY9YCR7UEtHX0lORk99IC1x IC1mICQke3B9IDI+IC9kZXYvbnVsbCB8ICR7R1JFUH0gLXYgIl5AIiB8ICR7Q09NTX0gLTEyIC0g JHtUTVBQTElTVH1gOyBcCi0JCQkJCQkJCWlmIFsgLW4gIiQke2RmfSIgXTsgdGhlbiBcCisJCQkJ CQkJCWlmIFsgLW4gIiQke2RmOi19IiBdOyB0aGVuIFwKIAkJCQkJCQkJCQlmb3VuZF9wYWNrYWdl PSQke3B9OyBcCiAJCQkJCQkJCQkJYnJlYWs7IFwKIAkJCQkJCQkJZmk7IFwKQEAgLTQ1NTEsNyAr NDU1MSw3IEBACiAJCQljaGVja19uYW1lPWAke0VDSE9fQ01EfSAkJHtwfSB8ICR7U0VEfSAtZSAn cy8tW14tXSokJC8vJ2A7IFwKIAkJCWlmIFsgIiQke2NoZWNrX25hbWV9IiA9ICIke1BLR0JBU0V9 IiBdOyB0aGVuIFwKIAkJCQkJcHJmeD1gJHtQS0dfSU5GT30gLXEgLXAgJCR7cH0gMj4gL2Rldi9u dWxsIHwgJHtTRUR9IC1uZSAnMXN8XkBjd2QgfHxwJ2A7IFwKLQkJCQkJaWYgWyAieCR7UFJFRklY fSIgPSAieCQke3ByZnh9IiBdOyB0aGVuIFwKKwkJCQkJaWYgWyAieCR7UFJFRklYfSIgPSAieCQk e3ByZng6LX0iIF07IHRoZW4gXAogCQkJCQkJCSR7RUNIT19NU0d9ICI9PT0+ICAgRGVpbnN0YWxs aW5nICQke3B9IjsgXAogCQkJCQkJCSR7UEtHX0RFTEVURX0gLWYgJCR7cH07IFwKIAkJCQkJZWxz ZSBcCkBAIC00NTgzLDcgKzQ1ODMsNyBAQAogCWZvciBvbGRwa2dvcmlnaW4gaW4gJCQoJHtHUkVQ fSAifCR7UEtHT1JJR0lOfXwiICR7UE9SVFNESVJ9L01PVkVEIHwgJHtDVVR9IC1mIDEgLWQgJ3wn IHwgJHtTT1JUfSAtdSk7IGRvIFwKIAkJZGVpbnN0YWxsX25hbWVzPSIkJHtkZWluc3RhbGxfbmFt ZXN9ICQkKCR7UEtHX0lORk99IC1xIC1PICQke29sZHBrZ29yaWdpbn0pIjsgXAogCWRvbmU7IFwK LQlpZiBbIC1uICIkJHtkZWluc3RhbGxfbmFtZXN9IiBdOyB0aGVuIFwKKwlpZiBbIC1uICIkJHtk ZWluc3RhbGxfbmFtZXM6LX0iIF07IHRoZW4gXAogCQlmb3IgZCBpbiAkJHtkZWluc3RhbGxfbmFt ZXN9OyBkbyBcCiAJCQkke0VDSE9fTVNHfSAiPT09PiAgIERlaW5zdGFsbGluZyAkJHtkfSI7IFwK IAkJCSR7UEtHX0RFTEVURX0gLWYgJCR7ZH07IFwKQEAgLTUxMjksNyArNTEyOSw3IEBACiAJCQkJ CQktZSAncy88PS89Z3Q9Lzsgcy88Lz1nZT0vOyBzLz49Lz1sdD0vOyBzLz4vPWxlPS8nIFwKIAkJ CQkJCS1lICdzLz1ndD0vPi87IHMvPWdlPS8+PS87IHMvPWx0PS88Lzsgcy89bGU9Lzw9LydgOyBc CiAJCQkJCXBrZ19pbmZvPWAke1BLR19JTkZPfSAtRSAiJCRpbnZlcnNlX2RlcCIgfHwgJHtUUlVF fWA7IFwKLQkJCQkJaWYgWyAiJCRwa2dfaW5mbyIgIT0gIiIgXTsgdGhlbiBcCisJCQkJCWlmIFsg IiQke3BrZ19pbmZvOi19IiAhPSAiIiBdOyB0aGVuIFwKIAkJCQkJCSR7RUNIT19NU0d9ICI9PT0+ ICAgRm91bmQgJCRwa2dfaW5mbywgYnV0IHlvdSBuZWVkIHRvIHVwZ3JhZGUgdG8gJCRwcm9nLiI7 IFwKIAkJCQkJCWV4aXQgMTsgXAogCQkJCQlmaTsgXApAQCAtNTQ2NSwxMCArNTQ2NSw5IEBACiAJ aWYgWyAiJHtDSElMRF9ERVBFTkRTfSIgXTsgdGhlbiBcCiAJCWluc3RhbGxlZD0kJCgke1BLR19J TkZPfSAtcU8gJHtQS0dPUklHSU59IDI+L2Rldi9udWxsIHx8IFwKIAkJCSR7VFJVRX0pOyBcCi0J CWlmIFsgIiQkaW5zdGFsbGVkIiBdOyB0aGVuIFwKKwkJaWYgWyAtbiAiJCR7aW5zdGFsbGVkOi19 IiBdOyB0aGVuIFwKIAkJCWJyZWFrOyBcCi0JCWZpOyBcCi0JCWlmIFsgLXogIiQkaW5zdGFsbGVk IiBdOyB0aGVuIFwKKwkJZWxzZSBcCiAJCQlpbnN0YWxsZWQ9IiR7UEtHTkFNRX0iOyBcCiAJCWZp OyBcCiAJCWZvciBwa2duYW1lIGluICQkaW5zdGFsbGVkOyBkbyBcCkBAIC01NTExLDE2ICs1NTEw LDE1IEBACiAJCQl3aGlsZSBbICQkXCMgLWd0IDEgXTsgZG8gXAogCQkJCWlmIFsgISAtZCAiJHtQ T1JUU0RJUn0vJCQyIiBdOyB0aGVuIFwKIAkJCQkJc2hpZnQ7IFwKLQkJCQkJY29udGludWU7IFwK LQkJCQlmaTsgXAotCQkJCWlmIFsgIiQkZGlyIiA9ICIkJDIiIF07IHRoZW4gXAorCQkJCWVsaWYg WyAiJCRkaXIiID0gIiQkMiIgXTsgdGhlbiBcCiAJCQkJCSR7RUNIT19DTUR9ICQkMTokJGRpcjsg XAogCQkJCQlpZiBbIC1lICR7UEtHX0RCRElSfS8kJDEvK0NPTlRFTlRTIC1hIC16ICIke0VYUExJ Q0lUX1BBQ0tBR0VfREVQRU5EU30iIF07IHRoZW4gXAogCQkJCQkJcGFja2FnZWxpc3Q9IiQkcGFj a2FnZWxpc3QgJHtQS0dfREJESVJ9LyQkMS8rQ09OVEVOVFMiOyBcCiAJCQkJCWZpOyBcCiAJCQkJ CWJyZWFrOyBcCisJCQkJZWxzZSBcCisJCQkJICAgIHNoaWZ0IDI7IFwKIAkJCQlmaTsgXAotCQkJ CXNoaWZ0IDI7IFwKIAkJCWRvbmU7IFwKIAkJZG9uZTsgXAogCQlbIC16ICIkJHBhY2thZ2VsaXN0 IiBdIHx8ICR7QVdLfSAtRiAnKCB8OiknICdCRUdJTiB7IHBrZ25hbWU9ImJyb2tlbl9jb250ZW50 cyIgfSAvQHBrZ2RlcCAvIHsgcGtnbmFtZT0kJDIgfSAvQGNvbW1lbnQgREVQT1JJR0lOOi8geyBw cmludGYgIiVzOiVzXG4iLCBwa2duYW1lLCAkJDM7IHBrZ25hbWU9ImJyb2tlbl9jb250ZW50cyIg fScgJCRwYWNrYWdlbGlzdDsgXApAQCAtNTU0MSw3ICs1NTM5LDcgQEAKIAkJKGNkICQkZGlyOyAk e01BS0V9IHBhY2thZ2Utbm9pbnN0YWxsKTsgXAogCWRvbmUKIAotIyBTaG93IG1pc3NpbmcgZGVw ZW5kaWVuY2llcworIyBTaG93IG1pc3NpbmcgZGVwZW5kZW5jaWVzCiBtaXNzaW5nOgogCUBfb3Jp Z2lucz0kJCgke1BLR19JTkZPfSAtYW9xKTsgXAogCWZvciBkaXIgaW4gJCQoJHtBTEwtREVQRU5E Uy1MSVNUfSk7IGRvIFwK --000e0cd519865e63e6048af5d1be--