diff options
| author | kris <kris@FreeBSD.org> | 2004-12-10 06:31:43 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2004-12-10 06:31:43 +0000 |
| commit | 86071678bc7a48f2c13f6d5d4846d9184f778c3f (patch) | |
| tree | 97bc8a79d0e598f104e06a2b64f71d32bc79256b /Tools/portbuild | |
| parent | ad7714ae0448812a4a3f7163e7a0ab4d1bb51fcc (diff) | |
| download | FreeBSD-ports-86071678bc7a48f2c13f6d5d4846d9184f778c3f.zip FreeBSD-ports-86071678bc7a48f2c13f6d5d4846d9184f778c3f.tar.gz | |
Belatedly catch up to XFREE86_VERSION -> X_WINDOW_SYSTEM change; apply
the BSD.x11.dist if set to xfree86-3, otherwise use BSD.x11-4.dist.
Diffstat (limited to 'Tools/portbuild')
| -rwxr-xr-x | Tools/portbuild/scripts/portbuild | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild index f3866de..31ae8f7 100755 --- a/Tools/portbuild/scripts/portbuild +++ b/Tools/portbuild/scripts/portbuild @@ -267,11 +267,11 @@ mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.usr.dist -p ${chroot}/usr \ mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.local.dist -p ${chroot}/usr/local \ >/dev/null 2>&1 -if [ $XFREE86_VERSION = 4 ]; then - mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11-4.dist -p ${chroot}/usr/X11R6 \ +if [ $X_WINDOW_SYSTEM = "xfree86-3" ]; then + mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11.dist -p ${chroot}/usr/X11R6 \ >/dev/null 2>&1 else - mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11.dist -p ${chroot}/usr/X11R6 \ + mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11-4.dist -p ${chroot}/usr/X11R6 \ >/dev/null 2>&1 fi |
