On Mon, Jul 12, 2010 at 12:09 PM, Doug Barton <do...@freebsd.org> wrote:
> On 07/09/10 08:11, Garrett Cooper wrote:
>> -# UNAUTHORISED CHANGES WILL BE UNCONDITIONALLY REVERTED!
>> +# UNAUTHORIZED CHANGES WILL BE UNCONDITIONALLY REVERTED!
>
> Couple of comments. The above is not a typo, that's the British
> spelling. We generally don't change those. (Arguably it adds character
> to the project.) :)
>
> The other is more of a question, I'm not sure what the point of these
> changes is: ${var:-} The :- parameter substitution kicks in if var is
> unset or null, but you're not substituting it with anything.
Yeah, that was silly. I was doing this out of habit with set -u...
So I'm taking it that the only change of benefit is the attached patch.
Thanks,
-Garrett
--- /usr/ports/Mk/bsd.port.mk 2010-06-04 01:09:17.000000000 -0700
+++ bsd.port.mk 2010-07-13 08:09:13.000000000 -0700
@@ -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 \
_______________________________________________
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "freebsd-hackers-unsubscr...@freebsd.org"
