summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2000-12-22 01:35:33 +0000
committerdmcmahill <dmcmahill>2000-12-22 01:35:33 +0000
commit295b4d831d5f9bc9e295279205f9c09c1f59fc82 (patch)
treefb983a162fb344b5dcf8fcd32e01a1a7e8961667 /mk
parente66a53e80b2ba85d04d5a7178349228bd4ef09fc (diff)
downloadpkgsrc-295b4d831d5f9bc9e295279205f9c09c1f59fc82.tar.gz
make the pruning of distfiles be controlled by a build.conf setting.
this way if you have 2 different pkgsrc trees sharing a distfiles directory you don't nuke distfiles which may still be needed.
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/build.conf-example6
-rw-r--r--mk/bulk/pre-build16
2 files changed, 16 insertions, 6 deletions
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example
index 274306346f7..237c7edf9ae 100644
--- a/mk/bulk/build.conf-example
+++ b/mk/bulk/build.conf-example
@@ -1,5 +1,5 @@
# build.conf
-# $NetBSD: build.conf-example,v 1.4 2000/11/17 16:59:01 hubertf Exp $
+# $NetBSD: build.conf-example,v 1.5 2000/12/22 01:35:33 dmcmahill Exp $
#
# config file in /bin/sh syntax for {,pre,post}-build
#
@@ -26,6 +26,10 @@ USR_PKGSRC="/usr/pkgsrc"
# As which user to run "cvs updates". Leave empty for no update.
CVS_USER="yourlogin"
+# prune distfiles to remove those which are out of date
+# can be set to 'yes' or 'no'.
+PRUNEDISTFILES=yes
+
# Proxies (optional):
#ftp_proxy=http://proxy.machi.ne:3128/
#http_proxy=http://proxy.machi.ne:3128/
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index 588f7217409..77ad3782d7d 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.6 2000/12/15 23:08:42 hubertf Exp $
+# $NetBSD: pre-build,v 1.7 2000/12/22 01:35:33 dmcmahill Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -15,6 +15,7 @@ else
. `dirname $0`/build.conf
fi
+PRUNEDISTFILES=${PRUNEDISTFILES:-"yes"}
#
# Install cvs package and do a cvs update here
@@ -36,10 +37,15 @@ fi
#
# Remove old/broken distfiles and binary packages
#
-echo Removing old/broken distfiles and binary packages
-( cd ${USR_PKGSRC}/pkgtools/pkglint ; make bulk-install )
-lintpkgsrc -r -P${USR_PKGSRC}
-echo done.
+
+if [ $PRUNEDISTFILES = "yes" -o $PRUNEDISTFILES = "YES" ]; then
+ echo Removing old/broken distfiles and binary packages
+ ( cd ${USR_PKGSRC}/pkgtools/pkglint ; make bulk-install )
+ lintpkgsrc -r -P${USR_PKGSRC}
+ echo done.
+else
+ echo "Skipping distfile pruning."
+fi
#
# Clean out everything and it's mother