bsd.port.mk: assign and export at once

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

bsd.port.mk: assign and export at once

Klemens Nanni-2
Saw those while looking at `make -n install': no need to split this into
two steps.

OK?

Index: /usr/ports/infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1475
diff -u -p -r1.1475 bsd.port.mk
--- /usr/ports/infrastructure/mk/bsd.port.mk 14 Jul 2019 11:32:05 -0000 1.1475
+++ /usr/ports/infrastructure/mk/bsd.port.mk 23 Aug 2019 09:58:49 -0000
@@ -1660,7 +1660,7 @@ _LOCKNAME = ${PKGNAME}
 .    if empty(_LOCKS_HELD:M${_i})
 _DO_LOCK = \
  lock=${_LOCKNAME}; \
- _LOCKS_HELD="${_LOCKS_HELD} ${_LOCKNAME}"; export _LOCKS_HELD; \
+ export _LOCKS_HELD="${_LOCKS_HELD} ${_LOCKNAME}"; \
  ${_SIMPLE_LOCK}
 .    endif
 .  endfor
@@ -3149,8 +3149,7 @@ license-check:
 .  if ${PERMIT_PACKAGE${_S}:L} == "yes"
  @SUBPACKAGE=${_S} PKGPATH=${PKGPATH} ${MAKE} all-dir-depends|${_sort_dependencies}|while read subdir; do \
  ${_flavor_fragment}; \
- _MASTER_PERMIT=${PERMIT_PACKAGE${_S}:Q}; \
- export _MASTER_PERMIT; \
+ export _MASTER_PERMIT=${PERMIT_PACKAGE${_S}:Q}; \
  eval $$toset ${MAKE} _license-check; \
  done
 .  endif