diff options
Diffstat (limited to 'source/x')
| -rw-r--r-- | source/x/mesa/doinst.sh | 6 | ||||
| -rwxr-xr-x | source/x/mesa/mesa.SlackBuild | 4 | ||||
| -rw-r--r-- | source/x/x11/build/xf86-video-i740 | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/source/x/mesa/doinst.sh b/source/x/mesa/doinst.sh index 42c4667c7..d6297d692 100644 --- a/source/x/mesa/doinst.sh +++ b/source/x/mesa/doinst.sh @@ -10,4 +10,8 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } -config etc/drirc.new +# Don't mess with /etc/drirc. Mesa now installs the defaults as +# /usr/share/drirc.d/00-mesa-defaults.conf. We won't protect that +# as a .new file as it shouldn't be modified. Create /etc/drirc if +# you need local overrides. +#config etc/drirc.new diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index 523f0860e..ee8d7c26f 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -148,7 +148,9 @@ make install DESTDIR=$PKG || exit 1 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la # Install /etc/drirc as a .new file: -mv $PKG/etc/drirc $PKG/etc/drirc.new +if [ -r $PKG/etc/drirc ]; then + mv $PKG/etc/drirc $PKG/etc/drirc.new +fi # Now build/install a small subset of the demos: export CWD SLKCFLAGS NUMJOBS PKG diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740 index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-i740 +++ b/source/x/x11/build/xf86-video-i740 @@ -1 +1 @@ -3 +1 |