aboutsummaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2002-03-16 13:48:03 +0800
committerkris <kris@FreeBSD.org>2002-03-16 13:48:03 +0800
commitf0054a600c8fe75f1eba44aa3ca4ff5c716d9758 (patch)
tree437738f7895aaaba165bf5e47a98d7663030a27d /Tools
parent82ecc071b5610d1ace84f49f455059ae8f628e1a (diff)
downloadfreebsd-ports-gnome-f0054a600c8fe75f1eba44aa3ca4ff5c716d9758.tar.gz
freebsd-ports-gnome-f0054a600c8fe75f1eba44aa3ca4ff5c716d9758.tar.zst
freebsd-ports-gnome-f0054a600c8fe75f1eba44aa3ca4ff5c716d9758.zip
Pull environment variables from buildenv, and tidy up a bit.
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/portbuild/scripts/dopackages20
1 files changed, 8 insertions, 12 deletions
diff --git a/Tools/portbuild/scripts/dopackages b/Tools/portbuild/scripts/dopackages
index ffb66d527bf6..365f0c72132b 100755
--- a/Tools/portbuild/scripts/dopackages
+++ b/Tools/portbuild/scripts/dopackages
@@ -5,6 +5,8 @@ pb=/var/portbuild
. ${pb}/portbuild.conf
+. ${pb}/scripts/buildenv
+
# packages for dependencies only
dummyports="" #x11/XFree86"
@@ -252,12 +254,11 @@ fi
if [ "$nodummy" = 1 ]; then
export NODUMMY=t
- export XFREE86_VERSION=4
fi
-export PORTSDIR=${pb}/${branch}/ports
+buildenv $branch
-cd ${pb}/${branch}/ports
+cd ${PORTSDIR}
if [ "$nocvsup" = 0 ]; then
# echo "================================================"
# echo "running cvsup"
@@ -265,7 +266,7 @@ if [ "$nocvsup" = 0 ]; then
# su ${user} -c 'cvsup -g -L 0 /etc/supfile.cvsup'
if [ "$noportscvs" = 0 ]; then
echo "================================================"
- echo "running cvs update on ${pb}/${branch}/ports"
+ echo "running cvs update on ${PORTSDIR}"
echo "================================================"
su ${user} -c 'cvs -qR update -d -P'
# XXX Check for conflicts
@@ -285,17 +286,14 @@ fi
if [ "$nocvs" = 0 ]; then
echo "================================================"
- echo "running cvs update on ${pb}/${branch}/src"
+ echo "running cvs update on ${SRCBASE}"
echo "================================================"
- cd ${pb}/${branch}/src
+ cd ${SRCBASE}
su ${user} -c 'cvs -qR update -d -P'
# XXX Check for conflicts
fi
-export SRCPREFIX=${pb}/${branch}/src
-
# this one not in background to check return status
-
if [ "$noduds" = 0 ]; then
makeduds ${pb} ${scripts} ${branch}
fi
@@ -326,11 +324,9 @@ checkindex ${pb} ${branch}
echo "all preparation ended at $(date)"
-cd ${pb}/${branch}/ports
+cd ${PORTSDIR}
make parallel branch=${branch} > ${pb}/${branch}/Makefile
-cd ${pb}/${branch}/ports
-
if [ "$nodummy" = 0 ]; then
dummypkgs=""
for i in ${dummyports}; do