summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-09-07 11:02:28 +0000
committerjperkin <jperkin@pkgsrc.org>2015-09-07 11:02:28 +0000
commitd3dc409fc58244379130f8f3ea827aaa6f8ea8d1 (patch)
tree6cd06fff72a19956b602425c5278e8052a1d16d6
parent5161daeaa7c55977f58f5161117e53d8d4a79ac2 (diff)
downloadpkgsrc-d3dc409fc58244379130f8f3ea827aaa6f8ea8d1.tar.gz
Switch to globbing for package symlinks to delete. This provides significant
performance improvements on at least OSX and SunOS, where each file is stat'd rather than just the links we are looking for, especially with large package directories over NFS.
-rw-r--r--mk/pkgformat/pkg/package.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/pkgformat/pkg/package.mk b/mk/pkgformat/pkg/package.mk
index 0de336e6e24..2453a903f2b 100644
--- a/mk/pkgformat/pkg/package.mk
+++ b/mk/pkgformat/pkg/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.10 2015/04/21 17:01:56 joerg Exp $
+# $NetBSD: package.mk,v 1.11 2015/09/07 11:02:28 jperkin Exp $
.if defined(PKG_SUFX)
WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -137,8 +137,8 @@ package-links: delete-package-links
### the non-primary categories to which the package belongs.
###
delete-package-links:
- ${RUN} ${FIND} ${PACKAGES} -type l -name ${PKGFILE:T} -print \
- | ${XARGS} ${RM} -f
+ ${RUN} ${FIND} ${PACKAGES}/*/${PKGFILE:T} -type l -print \
+ 2>/dev/null | ${XARGS} ${RM} -f
######################################################################
### tarup (PUBLIC)