aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvd <vd@FreeBSD.org>2006-05-02 17:16:10 +0800
committervd <vd@FreeBSD.org>2006-05-02 17:16:10 +0800
commit2a5d356e7bb65c494ad32342f5dd595c06a19012 (patch)
tree79c43b50e0af91a49dd8785334ef867605a447b2
parentd53b47fc7fe7042aa20c8406ecf431c3df7da41b (diff)
downloadfreebsd-ports-gnome-2a5d356e7bb65c494ad32342f5dd595c06a19012.tar.gz
freebsd-ports-gnome-2a5d356e7bb65c494ad32342f5dd595c06a19012.tar.zst
freebsd-ports-gnome-2a5d356e7bb65c494ad32342f5dd595c06a19012.zip
Improve dependency check:
When removing category/port - look if other ports' Makefiles contain `/port' rather than `category/port', since the later misses things like `${.CURDIR}/../port'
-rwxr-xr-xTools/scripts/rmport5
1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/scripts/rmport b/Tools/scripts/rmport
index 5571a7e9c53f..7013cacebb1e 100755
--- a/Tools/scripts/rmport
+++ b/Tools/scripts/rmport
@@ -113,11 +113,12 @@ check_dep()
fi
# check if some port mentions the port to be deleted
+ portdir_grep="/`basename ${catport}`"
r="`find ${PORTSDIR} -mindepth 3 -maxdepth 3 -name "Makefile*" \
- |xargs grep -Hw ${catport} \
+ |xargs grep -Hw ${portdir_grep} \
|grep -vE "^(${rmcatports})" || :`"
if [ -n "${r}" ] ; then
- log "${catport}: some ports mention ${catport} in their Makefiles:"
+ log "${catport}: some ports mention ${portdir_grep} in their Makefiles:"
printf "%s\n" "${r}" >&2
err=1
fi