diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2010-06-01 04:01:31 +0800 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2010-06-01 04:01:31 +0800 |
| commit | dcabe96b556d21d094df2ef02db3059c3288f93c (patch) | |
| tree | 7fa3cac637088b22ebae993053158b3ee4f6a8ed /Tools | |
| parent | e9f130dc430236e9fe94eba1cfcb97803a13d526 (diff) | |
| download | freebsd-ports-gnome-dcabe96b556d21d094df2ef02db3059c3288f93c.tar.gz freebsd-ports-gnome-dcabe96b556d21d094df2ef02db3059c3288f93c.tar.zst freebsd-ports-gnome-dcabe96b556d21d094df2ef02db3059c3288f93c.zip | |
Get rid of the remnants of X11BASE.
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, 7 insertions, 1 deletions
diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv index 07af4dc54f68..7abd9dc3e651 100644 --- a/Tools/portbuild/scripts/buildenv +++ b/Tools/portbuild/scripts/buildenv @@ -115,6 +115,7 @@ 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 75d3cf4a1651..50fde5696960 100755 --- a/Tools/portbuild/scripts/buildfailure +++ b/Tools/portbuild/scripts/buildfailure @@ -35,6 +35,7 @@ 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 e98201a334fe..3c5b7d0e5ed8 100755 --- a/Tools/portbuild/scripts/buildsuccess +++ b/Tools/portbuild/scripts/buildsuccess @@ -29,6 +29,7 @@ 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 b1c330ea7474..809f73821d07 100755 --- a/Tools/portbuild/scripts/makeduds +++ b/Tools/portbuild/scripts/makeduds @@ -34,6 +34,7 @@ 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 c0664b8e2295..e14c1557442e 100755 --- a/Tools/portbuild/scripts/makeindex +++ b/Tools/portbuild/scripts/makeindex @@ -38,10 +38,11 @@ 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," ${INDEXFILE} +sed -i '' -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e "s,${LOCALBASE},/usr/local," -e "s,${X11BASE},/usr/local," ${INDEXFILE} diff --git a/Tools/portbuild/scripts/makerestr b/Tools/portbuild/scripts/makerestr index 8346b863a6f7..85cc1e52d785 100755 --- a/Tools/portbuild/scripts/makerestr +++ b/Tools/portbuild/scripts/makerestr @@ -27,6 +27,7 @@ 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 |