diff options
| author | eik <eik@FreeBSD.org> | 2004-07-07 09:55:56 +0000 |
|---|---|---|
| committer | eik <eik@FreeBSD.org> | 2004-07-07 09:55:56 +0000 |
| commit | 8a004787ab66d7fdc0976e8a555d2e53f2a8115e (patch) | |
| tree | e48380c5fe9e4002af82af09838833f81a8ecc76 /ports-mgmt | |
| parent | 7680e406558899a974eddf2c40c655e9d07ca070 (diff) | |
| download | FreeBSD-ports-8a004787ab66d7fdc0976e8a555d2e53f2a8115e.zip FreeBSD-ports-8a004787ab66d7fdc0976e8a555d2e53f2a8115e.tar.gz | |
eliminate some verbatim uses of mktemp and sort
PR: 62298
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.post.mk | 16 | ||||
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.pre.mk | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/ports-mgmt/portmk/Mk/bsd.port.post.mk b/ports-mgmt/portmk/Mk/bsd.port.post.mk index 07d870e..c36f5f3 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.post.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.post.mk @@ -2502,7 +2502,7 @@ ALL-DEPENDS-LIST= \ else \ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ fi; \ - done | sort -u + done | ${SORT} -u .PHONY: clean-depends .if !target(clean-depends) @@ -2614,13 +2614,13 @@ build-depends-list: .endif BUILD-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u); do \ + for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | ${SORT} -u); do \ if [ -d $$dir ]; then \ ${ECHO_CMD} $$dir; \ else \ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ fi; \ - done | sort -u + done | ${SORT} -u .PHONY: run-depends-list run-depends-list: @@ -2629,13 +2629,13 @@ run-depends-list: .endif RUN-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | sort -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | sort -u); do \ + for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | ${SORT} -u); do \ if [ -d $$dir ]; then \ ${ECHO_CMD} $$dir; \ else \ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ fi; \ - done | sort -u + done | ${SORT} -u # Package (recursive runtime) dependency list. Print out both directory names # and package names. @@ -3007,7 +3007,7 @@ fake-pkg: if [ -f ${PKGMESSAGE} ]; then \ ${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ fi; \ - for dep in `${PKG_INFO} -qf ${PKGNAME} | ${GREP} -w ^@pkgdep | ${AWK} '{print $$2}' | sort -u`; do \ + for dep in `${PKG_INFO} -qf ${PKGNAME} | ${GREP} -w ^@pkgdep | ${AWK} '{print $$2}' | ${SORT} -u`; do \ if [ -d ${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \ if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \ >/dev/null 2>&1; then \ @@ -3101,7 +3101,7 @@ config: DEFOPTIONS="$${DEFOPTIONS} $$1 \"$$2\" $${val}"; \ shift 3; \ done; \ - TMPOPTIONSFILE=$$(mktemp -t portoptions); \ + TMPOPTIONSFILE=$$(${MKTEMP} -t portoptions); \ trap "${RM} -f $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \ ${SH} -c "${DIALOG} --checklist \"Options for ${PKGNAME:C/-([^-]+)$/ \1/}\" 21 70 15 $${DEFOPTIONS} 2> $${TMPOPTIONSFILE}"; \ status=$$?; \ @@ -3116,7 +3116,7 @@ config: fi; \ SELOPTIONS=$$(${CAT} $${TMPOPTIONSFILE}); \ ${RM} -f $${TMPOPTIONSFILE}; \ - TMPOPTIONSFILE=$$(mktemp -t portoptions); \ + 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}; \ diff --git a/ports-mgmt/portmk/Mk/bsd.port.pre.mk b/ports-mgmt/portmk/Mk/bsd.port.pre.mk index 0881f76..c63b821 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.pre.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.pre.mk @@ -56,6 +56,7 @@ LDCONFIG?= /sbin/ldconfig LN?= /bin/ln LS?= /bin/ls MKDIR?= /bin/mkdir -p +MKTEMP?= /usr/bin/mktemp MV?= /bin/mv OBJCOPY?= /usr/bin/objcopy OBJDUMP?= /usr/bin/objdump |
