diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-24 23:57:14 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-24 23:57:14 +0800 |
| commit | 4bc43815741411358355b332e9fb4572ae2b0d6a (patch) | |
| tree | b7d9f531dec0bb97c5d5640a5dc0e764976a065b /Mk | |
| parent | 8d5cb85cae1d8d33faa9a159dbfdf6b98f288bc0 (diff) | |
| download | marcuscom-ports-4bc43815741411358355b332e9fb4572ae2b0d6a.tar marcuscom-ports-4bc43815741411358355b332e9fb4572ae2b0d6a.tar.gz marcuscom-ports-4bc43815741411358355b332e9fb4572ae2b0d6a.tar.bz2 marcuscom-ports-4bc43815741411358355b332e9fb4572ae2b0d6a.tar.lz marcuscom-ports-4bc43815741411358355b332e9fb4572ae2b0d6a.tar.xz marcuscom-ports-4bc43815741411358355b332e9fb4572ae2b0d6a.tar.zst marcuscom-ports-4bc43815741411358355b332e9fb4572ae2b0d6a.zip | |
Fix some bad mismerge mistakes with the PERL{RUN,BUILD}_DEPENDS backout.
Submitted by: Pascal Hofstee <caelian@gmail.com>
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5747 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 214cd5e01..1490e93c8 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4690,7 +4690,7 @@ 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 \ @@ -4704,7 +4704,7 @@ 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 \ @@ -4735,7 +4735,7 @@ PACKAGE-DEPENDS-LIST?= \ done; \ fi; \ checked="${PARENT_CHECKED}"; \ - for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \ + for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \ dir=$$(${REALPATH} $$dir); \ if [ -d $$dir ]; then \ if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ |