ports/146496: [PATCH] Removing ${PORTSDIR} from dependencies
Bapt
baptiste.daroussin at gmail.com
Tue May 11 14:30:08 UTC 2010
>Number: 146496
>Category: ports
>Synopsis: [PATCH] Removing ${PORTSDIR} from dependencies
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 11 14:30:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Bapt
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD abhoth.lan 8.0-STABLE FreeBSD 8.0-STABLE #2: Mon Nov 30 02:31:24 CET 2009 root at wicklow.lan:/usr/obj/usr/src/sys/WICKLOW amd64
>Description:
I have patches that removes the need of specifying ${PORTSDIR} in *_DEPENDS lines if ${PORTSDIR} is defined, it doesn't do anything, if it is not,
if it adds it.
As far as I have tested it works, but I haven't the resources to launch larger tests.
>How-To-Repeat:
>Fix:
--- bsd.port.mk-no-portsdir-deps.patch begins here ---
--- bsd.port.mk.orig 2010-04-28 23:25:58.850693033 +0200
+++ bsd.port.mk 2010-05-11 16:03:56.094604535 +0200
@@ -5052,9 +5067,13 @@
break; \
fi; \
dir=`${ECHO_CMD} $$i | ${SED} -e 's/[^:]*://'`; \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
if ${EXPR} "$$dir" : '.*:' > /dev/null; then \
target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \
dir=`${ECHO_CMD} $$dir | ${SED} -e 's/:.*//'`; \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
if [ X${DEPENDS_PRECLEAN} != "X" ]; then \
target="clean $$target"; \
depends_args="$$depends_args NOCLEANDEPENDS=yes"; \
@@ -5154,6 +5173,7 @@
else \
dir=$${dir%%:*}; \
fi; \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
${ECHO_MSG} -n "===> ${PKGNAME} depends on shared library: $$lib"; \
if ${LDCONFIG} ${_LDCONFIG_FLAGS} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
${ECHO_MSG} " - found"; \
@@ -5305,6 +5325,7 @@
.if !target(clean-depends)
clean-depends:
@for dir in $$(${CLEAN-DEPENDS-FULL}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \
done
.endif
@@ -5312,6 +5333,7 @@
.if !target(limited-clean-depends)
limited-clean-depends:
@for dir in $$(${CLEAN-DEPENDS-LIMITED}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \
done
.endif
@@ -5319,6 +5341,7 @@
.if !target(deinstall-depends)
deinstall-depends:
@for dir in $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} deinstall); \
done
.endif
@@ -5327,6 +5350,7 @@
fetch-recursive:
@${ECHO_MSG} "===> Fetching all distfiles for ${PKGNAME} and dependencies"
@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} fetch); \
done
.endif
@@ -5334,6 +5358,7 @@
.if !target(fetch-recursive-list)
fetch-recursive-list:
@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} fetch-list); \
done
.endif
@@ -5357,10 +5382,12 @@
case $$dir in \
*:*) if [ $$prog != $${prog\#/} -o ! -e $$prog ]; then \
dir=$${dir%%:*}; \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
else \
continue; \
fi;; \
*) if [ -d ${PKG_DBDIR}/$$(cd $$dir; ${MAKE} -V PKGNAME) ]; then \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
continue; \
fi;; \
esac; \
@@ -5397,6 +5424,7 @@
checksum-recursive:
@${ECHO_MSG} "===> Fetching and checking checksums for ${PKGNAME} and dependencies"
@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} checksum); \
done
.endif
@@ -5410,6 +5438,7 @@
BUILD-DEPENDS-LIST= \
for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -E -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
@@ -5424,6 +5453,7 @@
RUN-DEPENDS-LIST= \
for dir in $$(${ECHO_CMD} "${_LIB_RUN_DEPENDS:C,.*:([^:]*).*,\1,}" | ${SED} -e 'y/ /\n/' | ${SORT} -u); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
@@ -5456,6 +5486,7 @@
fi; \
checked="${PARENT_CHECKED}"; \
for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
dir=$$(${REALPATH} $$dir); \
if [ -d $$dir ]; then \
case $$checked in \
@@ -5484,6 +5515,7 @@
fi; \
done); \
for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
tmp=$${dir%/*}; \
dir=$${tmp\#\#*/}/$${dir\#\#*/}; \
set -- $$origins; \
@@ -5517,12 +5549,14 @@
package-recursive: package
@for dir in $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} package-noinstall); \
done
# Show missing dependiencies
missing:
@for dir in $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
THISORIGIN=$${dir##${PORTSDIR}/}; \
installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \
if [ -z "$$installed" ]; then \
@@ -6144,6 +6178,7 @@
config-recursive:
@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} config-conditional); \
done
.endif
@@ -6213,6 +6248,7 @@
showconfig-recursive:
@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME} and dependencies";
@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} showconfig); \
done
.endif
@@ -6240,6 +6276,7 @@
rmconfig-recursive:
@${ECHO_MSG} "===> Removing user-specified options for ${PKGNAME} and dependencies";
@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
+ ${ECHO_CMD} "$${dir}" | grep -q "^${PORTSDIR}" || dir="${PORTSDIR}/$${dir}" ; \
(cd $$dir; ${MAKE} rmconfig); \
done
.endif
--- bsd.port.mk-no-portsdir-deps.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list