diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2010-05-31 20:06:08 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2010-05-31 20:06:08 +0000 |
| commit | fa2be9ee8b9cb816c9579f3e0e591d46382aa83c (patch) | |
| tree | 16a116281805df0bc51c19cc474dc068b7e58216 /Tools | |
| parent | Get rid of the remnants of X11BASE. (diff) | |
Sigh. This had already been done, just not checked out on production.
Pointy hat: self
Notes
Notes:
svn path=/head/; revision=255410
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/portbuild/scripts/buildenv | 1 | ||||
| -rwxr-xr-x | Tools/portbuild/scripts/buildfailure | 1 | ||||
| -rwxr-xr-x | Tools/portbuild/scripts/buildsuccess | 1 | ||||
| -rwxr-xr-x | Tools/portbuild/scripts/makeduds | 1 | ||||
| -rwxr-xr-x | Tools/portbuild/scripts/makeindex | 3 | ||||
| -rwxr-xr-x | Tools/portbuild/scripts/makerestr | 1 |
6 files changed, 1 insertions, 7 deletions
diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv index 7abd9dc3e651..07af4dc54f68 100644 --- a/Tools/portbuild/scripts/buildenv +++ b/Tools/portbuild/scripts/buildenv @@ -115,7 +115,6 @@ buildenv () { export ARCH=${arch} export MACHINE_ARCH=${arch} - export X11BASE=/usr/local export LOCALBASE=/usr/local export PKGSUFFIX=.tbz export PKGZIPCMD=bzip2 diff --git a/Tools/portbuild/scripts/buildfailure b/Tools/portbuild/scripts/buildfailure index 50fde5696960..75d3cf4a1651 100755 --- a/Tools/portbuild/scripts/buildfailure +++ b/Tools/portbuild/scripts/buildfailure @@ -35,7 +35,6 @@ buildenv ${pb} ${arch} ${branch} ${builddir} # Don't pick up installed packages from the host export LOCALBASE=/nonexistentlocal -export X11BASE=/nonexistentx index=${PORTSDIR}/${INDEXFILE} diff --git a/Tools/portbuild/scripts/buildsuccess b/Tools/portbuild/scripts/buildsuccess index 3c5b7d0e5ed8..e98201a334fe 100755 --- a/Tools/portbuild/scripts/buildsuccess +++ b/Tools/portbuild/scripts/buildsuccess @@ -29,7 +29,6 @@ buildenv ${pb} ${arch} ${branch} ${builddir} # Don't pick up installed packages from the host export LOCALBASE=/nonexistentlocal -export X11BASE=/nonexistentx index=${PORTSDIR}/${INDEXFILE} diff --git a/Tools/portbuild/scripts/makeduds b/Tools/portbuild/scripts/makeduds index 809f73821d07..b1c330ea7474 100755 --- a/Tools/portbuild/scripts/makeduds +++ b/Tools/portbuild/scripts/makeduds @@ -34,7 +34,6 @@ unset DISPLAY export __MAKE_SHELL=/rescue/sh export PACKAGE_BUILDING=1 export LOCALBASE=/nonexistentlocal -export X11BASE=/nonexistentx export LINUXBASE=/nonexistentlinux export PKG_DBDIR=/nonexistentpkg export PORT_DBDIR=/nonexistentport diff --git a/Tools/portbuild/scripts/makeindex b/Tools/portbuild/scripts/makeindex index e14c1557442e..c0664b8e2295 100755 --- a/Tools/portbuild/scripts/makeindex +++ b/Tools/portbuild/scripts/makeindex @@ -38,11 +38,10 @@ unset DISPLAY # Don't pick up installed packages from the host export LOCALBASE=/nonexistentlocal -export X11BASE=/nonexistentx cd ${PORTSDIR} make index # remove extra spaces in dependency list -- this causes problems # Also transform the dummy paths to their canonical locations -sed -i '' -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e "s,${LOCALBASE},/usr/local," -e "s,${X11BASE},/usr/local," ${INDEXFILE} +sed -i '' -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e "s,${LOCALBASE},/usr/local," ${INDEXFILE} diff --git a/Tools/portbuild/scripts/makerestr b/Tools/portbuild/scripts/makerestr index 85cc1e52d785..8346b863a6f7 100755 --- a/Tools/portbuild/scripts/makerestr +++ b/Tools/portbuild/scripts/makerestr @@ -27,7 +27,6 @@ unset DISPLAY export __MAKE_SHELL=/rescue/sh export PACKAGE_BUILDING=1 export LOCALBASE=/nonexistentlocal -export X11BASE=/nonexistentx export LINUXBASE=/nonexistentlinux export PKG_DBDIR=/nonexistentpkg export PORT_DBDIR=/nonexistentport |