diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2004-12-10 06:31:43 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2004-12-10 06:31:43 +0000 |
| commit | b46b39308263d1e2c1caffa9188e03c6f8a34166 (patch) | |
| tree | d04f10a18971d90233e065c668047da2a69dfb50 /Tools | |
| parent | 0334edaab42506c19ff621854aec038c04db86c8 (diff) | |
| download | ports-b46b39308263d1e2c1caffa9188e03c6f8a34166.tar.gz ports-b46b39308263d1e2c1caffa9188e03c6f8a34166.zip | |
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.
Notes
Notes:
svn path=/head/; revision=123621
Diffstat (limited to 'Tools')
| -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 f3866de4cf7d..31ae8f7840e1 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 |