summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf>2000-12-05 16:33:27 +0000
committerhubertf <hubertf>2000-12-05 16:33:27 +0000
commit1f835d5982cc1bd9570577796eb181d7b56806af (patch)
tree6003e8a0ffae7309cddbe93f8da561d1d18de250 /mk
parent10dbdc221494d6e8ccdb0b78fc13a45b20d45438 (diff)
downloadpkgsrc-1f835d5982cc1bd9570577796eb181d7b56806af.tar.gz
If cvs and ssh are in base, don't pkg_add them
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/pre-build13
1 files changed, 9 insertions, 4 deletions
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index 554344da38b..aec6452d73c 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.4 2000/09/29 04:27:42 hubertf Exp $
+# $NetBSD: pre-build,v 1.5 2000/12/05 16:33:27 hubertf Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -20,9 +20,14 @@ fi
# Install cvs package and do a cvs update here
#
if [ "$CVS_USER" != "" ]; then
- echo Installing required pkgs for CVS update
- ( cd ${USR_PKGSRC}/devel/cvs ; make bulk-install )
- ( cd ${USR_PKGSRC}/security/ssh ; make bulk-install )
+ if [ ! -f /usr/bin/cvs ]; then
+ echo Installing required cvs pkgs for CVS update
+ ( cd ${USR_PKGSRC}/devel/cvs ; make bulk-install )
+ fi
+ if [ ! -f /usr/bin/ssh ]; then
+ echo Installing required ssh pkgs for CVS update
+ ( cd ${USR_PKGSRC}/security/ssh ; make bulk-install )
+ fi
echo Performing CVS update - this will take some time
su - ${CVS_USER} -c 'stty sane ; cd '${USR_PKGSRC}' ; cvs -q update -Pd'
echo CVS update done.