Slackware 14.0slackware-14.0

Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!

We're perfectionists here at Slackware, so this release has been a long
time a-brewing.  But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Thanks to everyone who helped make this happen.  The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.

Have fun!  :-)

9 files changed, 136 insertions, 819 deletions

diff --git a/testing/source/xf86-video-nouveau/arch.use.flags b/testing/source/xf86-video-nouveau/arch.use.flags
deleted file mode 100644
index f28a6ccab..000000000
--- a/testing/source/xf86-video-nouveau/arch.use.flags
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-fi
diff --git a/testing/source/xf86-video-nouveau/configure/xf86-video-nouveau b/testing/source/xf86-video-nouveau/configure/xf86-video-nouveau
deleted file mode 100644
index e050771b3..000000000
--- a/testing/source/xf86-video-nouveau/configure/xf86-video-nouveau
+++ /dev/null
@@ -1,11 +0,0 @@
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --disable-static \
-  --build=$ARCH-slackware-linux
diff --git a/testing/source/xf86-video-nouveau/get-xf86-video-nouveau.sh b/testing/source/xf86-video-nouveau/get-xf86-video-nouveau.sh
deleted file mode 100755
index 72d3efd37..000000000
--- a/testing/source/xf86-video-nouveau/get-xf86-video-nouveau.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-# Pull a stable branch + patches
-BRANCH=master
-
-rm -rf xf86-video-nouveau
-git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
-
-# use master branch
-#( cd xf86-video-nouveau 
-#  git checkout $BRANCH || exit 1
-#)
-
-HEADISAT="$(cat xf86-video-nouveau/.git/packed-refs | grep refs/remotes/origin/$BRANCH | cut -b1-7)"
-# Cleanup.  We're not packing up the whole git repo.
-( cd xf86-video-nouveau && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
-DATE=$(date +%Y%m%d)
-mv xf86-video-nouveau xf86-video-nouveau-git_${DATE}_${HEADISAT}
-tar cf xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar xf86-video-nouveau-git_${DATE}_${HEADISAT}
-xz -9 xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar
-rm -rf xf86-video-nouveau-git_${DATE}_${HEADISAT}
-echo
-echo "xf86-video-nouveau branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar.xz"
-echo
diff --git a/testing/source/xf86-video-nouveau/modularize b/testing/source/xf86-video-nouveau/modularize
deleted file mode 100644
index 47da583fd..000000000
--- a/testing/source/xf86-video-nouveau/modularize
+++ /dev/null
@@ -1,293 +0,0 @@
-# If a package is listed here, it will be built apart from the
-# usual "grab bag" package that's made from each source directory.
-
-applewmproto
-appres
-bdftopcf
-beforelight
-bigreqsproto
-bitmap
-compiz
-compositeproto
-constype
-damageproto
-dmxproto
-dri2proto
-editres
-encodings
-evieext
-fixesproto
-font-adobe-100dpi
-font-adobe-75dpi
-font-adobe-utopia-100dpi
-font-adobe-utopia-75dpi
-font-adobe-utopia-type1
-font-alias
-font-arabic-misc
-font-bh-100dpi
-font-bh-75dpi
-font-bh-lucidatypewriter-100dpi
-font-bh-lucidatypewriter-75dpi
-font-bh-ttf
-font-bh-type1
-font-bitstream-100dpi
-font-bitstream-75dpi
-font-bitstream-speedo
-font-bitstream-type1
-font-cronyx-cyrillic
-font-cursor-misc
-font-daewoo-misc
-font-dec-misc
-font-ibm-type1
-font-isas-misc
-font-jis-misc
-font-micro-misc
-font-misc-cyrillic
-font-misc-ethiopic
-font-misc-meltho
-font-misc-misc
-font-mutt-misc
-font-schumacher-misc
-font-screen-cyrillic
-font-sony-misc
-font-sun-misc
-font-util
-font-winitzki-cyrillic
-font-xfree86-type1
-fontcacheproto
-fontsproto
-fonttosfnt
-fslsfonts
-fstobdf
-gccmakedep
-glproto
-iceauth
-ico
-imake
-inputproto
-intel-gpu-tools
-kbproto
-libAppleWM
-libFS
-libICE
-libSM
-libWindowsWM
-libX11
-libXScrnSaver
-libXTrap
-libXau
-libXaw
-libXcomposite
-libXcursor
-libXdamage
-libXdmcp
-libXevie
-libXext
-libXfixes
-libXfont
-libXfontcache
-libXft
-libXi
-libXinerama
-libXmu
-libXp
-libXpm
-libXprintAppUtil
-libXprintUtil
-libXrandr
-libXrender
-libXres
-libXt
-libXtst
-libXv
-libXvMC
-libXxf86dga
-libXxf86misc
-libXxf86vm
-libdmx
-libfontenc
-libpciaccess
-libpthread-stubs
-libxcb
-libxkbfile
-libxkbui
-listres
-lndir
-luit
-makedepend
-mkcfm
-mkcomposecache
-mkfontdir
-mkfontscale
-oclock
-pixman
-printproto
-proxymngr
-randrproto
-recordproto
-rendercheck
-renderproto
-resourceproto
-rgb
-rstart
-scripts
-scrnsaverproto
-sessreg
-setxkbmap
-showfont
-smproxy
-trapproto
-twm
-util-macros
-videoproto
-viewres
-windowswmproto
-x11perf
-xauth
-xbacklight
-xbiff
-xbitmaps
-xcalc
-xcb-proto
-xcb-util
-xclipboard
-xclock
-xcmiscproto
-xcmsdb
-xcompmgr
-xconsole
-xcursor-themes
-xcursorgen
-xdbedizzy
-xditview
-xdm
-xdpyinfo
-xdriinfo
-xedit
-xev
-xextproto
-xeyes
-xf86-input-acecad
-xf86-input-aiptek
-xf86-input-citron
-xf86-input-evdev
-xf86-input-joystick
-xf86-input-keyboard
-xf86-input-mouse
-xf86-input-penmount
-xf86-input-synaptics
-xf86-input-vmmouse
-xf86-input-void
-xf86-input-wacom
-xf86-video-geode
-xf86-video-apm
-xf86-video-ark
-xf86-video-ast
-xf86-video-ati
-xf86-video-chips
-xf86-video-cirrus
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-glint
-xf86-video-i128
-xf86-video-i740
-xf86-video-i810
-xf86-video-intel
-xf86-video-mach64
-xf86-video-mga
-xf86-video-neomagic
-xf86-video-nouveau
-xf86-video-nsc
-xf86-video-nv
-xf86-video-openchrome
-xf86-video-r128
-xf86-video-rendition
-xf86-video-s3
-xf86-video-s3virge
-xf86-video-savage
-xf86-video-siliconmotion
-xf86-video-sis
-xf86-video-sisusb
-xf86-video-sunbw2
-xf86-video-suncg14
-xf86-video-suncg3
-xf86-video-suncg6
-xf86-video-sunffb
-xf86-video-sunleo
-xf86-video-suntcx
-xf86-video-tdfx
-xf86-video-tga
-xf86-video-trident
-xf86-video-tseng
-xf86-video-v4l
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
-xf86-video-wsfb
-xf86-video-xgi
-xf86-video-xgixp
-xf86bigfontproto
-xf86dga
-xf86dgaproto
-xf86driproto
-xf86miscproto
-xf86rushproto
-xf86vidmodeproto
-xfd
-xfindproxy
-xfontsel
-xfs
-xfsinfo
-xfwp
-xgamma
-xgc
-xhost
-xineramaproto
-xinit
-xinput
-xkbcomp
-xkbevd
-xkbprint
-xkbutils
-xkeyboard-config
-xkill
-xload
-xlogo
-xlsatoms
-xlsclients
-xlsfonts
-xmag
-xman
-xmessage
-xmh
-xmodmap
-xmore
-xorg-cf-files
-xorg-docs
-xorg-server
-xorg-sgml-doctools
-xphelloworld
-xplsprinters
-xpr
-xprehashprinterlist
-xprop
-xproto
-xproxymanagementprotocol
-xpyb
-xrandr
-xrdb
-xrefresh
-xscope
-xset
-xsetmode
-xsetpointer
-xsetroot
-xsm
-xstdcmap
-xtrans
-xtrap
-xvidtune
-xvinfo
-xwd
-xwininfo
-xwud
diff --git a/testing/source/xf86-video-nouveau/noarch b/testing/source/xf86-video-nouveau/noarch
deleted file mode 100644
index 79eb0e569..000000000
--- a/testing/source/xf86-video-nouveau/noarch
+++ /dev/null
@@ -1,81 +0,0 @@
-# List packages with an $ARCH of "noarch" (i.e. packages
-# that contain no binaries) here:
-bigreqsproto
-compositeproto
-damageproto
-dejavu-ttf
-dmxproto
-encodings
-evieext
-font-adobe-100dpi
-font-adobe-75dpi
-font-adobe-utopia-100dpi
-font-adobe-utopia-75dpi
-font-adobe-utopia-type1
-font-alias
-font-arabic-misc
-font-bh-100dpi
-font-bh-75dpi
-font-bh-lucidatypewriter-100dpi
-font-bh-lucidatypewriter-75dpi
-font-bh-ttf
-font-bh-type1
-font-bitstream-100dpi
-font-bitstream-75dpi
-font-bitstream-speedo
-font-bitstream-type1
-font-cronyx-cyrillic
-font-cursor-misc
-font-daewoo-misc
-font-dec-misc
-font-ibm-type1
-font-isas-misc
-font-jis-misc
-font-micro-misc
-font-misc-cyrillic
-font-misc-ethiopic
-font-misc-meltho
-font-misc-misc
-font-mutt-misc
-font-schumacher-misc
-font-screen-cyrillic
-font-sony-misc
-font-sun-misc
-font-winitzki-cyrillic
-font-xfree86-type1
-fontcacheproto
-fontsproto
-gccmakedep
-glproto
-inputproto
-kbproto
-libpthread-stubs
-mkfontdir
-printproto
-randrproto
-recordproto
-renderproto
-resourceproto
-scripts
-scrnsaverproto
-trapproto
-ttf-indic-fonts
-util-macros
-videoproto
-x11-skel
-xcb-proto
-xcmiscproto
-xcursor-themes
-xf86bigfontproto
-xf86dgaproto
-xf86driproto
-xf86miscproto
-xf86rushproto
-xf86vidmodeproto
-xineramaproto
-xkeyboard-config
-xorg-cf-files
-xorg-docs
-xproto
-xproxymanagementprotocol
-xtrans
diff --git a/testing/source/xf86-video-nouveau/package-blacklist b/testing/source/xf86-video-nouveau/package-blacklist
deleted file mode 100644
index 377624999..000000000
--- a/testing/source/xf86-video-nouveau/package-blacklist
+++ /dev/null
@@ -1,39 +0,0 @@
-# Enter packages to skip (perhaps because they aren't used on
-# this platform) below.  Just the package name -- no version
-# number is needed.
-
-# MacOS related packages:
-applewmproto
-windowswmproto
-libAppleWM
-libWindowsWM
-
-# Sun video cards:
-xf86-video-sunbw2
-xf86-video-suncg14
-xf86-video-suncg3
-xf86-video-suncg6
-xf86-video-sunffb
-xf86-video-sunleo
-xf86-video-suntcx
-
-# Obsolete packages:
-liboldX
-xf86-video-amd
-xf86-video-via
-xkbdata
-xphelloworld
-xrx
-
-# Not applicable to us
-grandr
-constype
-
-# CAREFUL NOT TO "SHIP" THE STUFF BELOW IN THE MAIN X PACKAGES DIR!
-
-# This is probably obsolete, and kills "X -configure" too
-xf86-video-nsc
-
-# We don't want this one, as it causes failure of X with no xorg.conf
-xf86-video-fbdev
-
diff --git a/testing/source/xf86-video-nouveau/slack-desc/xf86-video-nouveau b/testing/source/xf86-video-nouveau/slack-desc
index 8697a60e6..ef2076229 100644
--- a/testing/source/xf86-video-nouveau/slack-desc/xf86-video-nouveau
+++ b/testing/source/xf86-video-nouveau/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-xf86-video-nouveau: xf86-video-nouveau
+xf86-video-nouveau: xf86-video-nouveau (accelerated open source driver for nVidia cards)
 xf86-video-nouveau:
 xf86-video-nouveau: xf86-video-nouveau is part of X11.
 xf86-video-nouveau:
diff --git a/testing/source/xf86-video-nouveau/x11.SlackBuild b/testing/source/xf86-video-nouveau/x11.SlackBuild
deleted file mode 100755
index ca7297082..000000000
--- a/testing/source/xf86-video-nouveau/x11.SlackBuild
+++ /dev/null
@@ -1,364 +0,0 @@
-#!/bin/sh
-# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# To build only a single package group, specify it as $1, like:
-# ./x11.SlackBuild lib
-# To build only a single package, specify both the source directory
-# and the name of the package, like:
-# ./x11.SlackBuild lib libX11
-
-pkgbase() {
-  PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
-  case $PKGEXT in
-  'gz' )
-    PKGRETURN=$(basename $1 .tar.gz)
-    ;;
-  'bz2' )
-    PKGRETURN=$(basename $1 .tar.bz2)
-    ;;
-  'lzma' )
-    PKGRETURN=$(basename $1 .tar.lzma)
-    ;;
-  'xz' )
-    PKGRETURN=$(basename $1 .tar.xz)
-    ;;
-  *)
-    PKGRETURN=$(basename $1)
-    ;;
-  esac
-  echo $PKGRETURN
-}
-
-# Set initial variables:
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# A lot of this stuff just controls the package names this time:
-VERSION=${VERSION:-7.5}
-BUILD=${BUILD:-1}
-PKGARCH=$ARCH
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
-# Set up a few useful functions:
-
-fix_perms() {
-  chown -R root:root .
-  find . \
-   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-   -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-   -exec chmod 644 {} \;
-}
-
-process_man_pages() {
-  # Compress and if needed symlink the man pages:
-  if [ -d usr/man ]; then
-    ( cd usr/man
-      for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.*
-      )
-      done
-    )
-  fi
-}
-
-process_info_pages() {
-  # Compress info pages and purge "dir" file from the package:
-  if [ -d usr/info ]; then
-    ( cd usr/info
-      rm -f dir
-      gzip -9 *
-    )
-  fi
-}
-
-no_usr_share_doc() {
-  # If there are docs, move them:
-  if [ -d usr/share/doc ]; then
-    mkdir -p usr/doc
-    mv usr/share/doc/* usr/doc
-    rmdir usr/share/doc
-  fi
-}
-
-# Set the compile options for the $ARCH being used:
-. $CWD/arch.use.flags
-
-SLACK_X_BUILD_DIR=$TMP/x11-build
-mkdir -p $SLACK_X_BUILD_DIR
-
-# Better have some binaries installed first, as this may not be
-# in the "magic order".  I built mine by hand through trial-and-error
-# before getting this script to work.  It wasn't that hard...  I think.  ;-)
-( cd src
-  for x_source_dir in proto data util xcb lib app doc driver font xserver ; do
-    # See if $1 is a source directory like "lib":
-    if [ ! -z "$1" ]; then
-      if [ ! "$1" = "${x_source_dir}" ]; then
-        continue
-      fi
-    fi
-    PKG=${SLACK_X_BUILD_DIR}/package-${x_source_dir}
-    rm -rf $PKG
-    mkdir -p $PKG
-    ( cd $x_source_dir
-      for x_pkg in *.tar.?z* ; do
-        # Reset $PKGARCH to its initial value:
-        PKGARCH=$ARCH
-        PKGNAME=$(echo $x_pkg | rev | cut -f 2- -d - | rev)
-        # Perhaps $PKGARCH should be something different:
-        if grep -wq "^$PKGNAME" ${CWD}/noarch ; then
-          PKGARCH=noarch
-        fi 
-        if grep -wq "^$PKGNAME" ${CWD}/package-blacklist ; then
-          continue
-        fi
-        cd $SLACK_X_BUILD_DIR
-        # If $2 is set, we only want to build one package:
-        if [ ! -z "$2" ]; then
-          if [ "$2" = "$PKGNAME" ]; then
-            # Set $PKG to a private dir for the modular package build:
-            PKG=$SLACK_X_BUILD_DIR/package-$PKGNAME
-            rm -rf $PKG
-            mkdir -p $PKG
-          else
-            continue
-          fi
-        else
-          echo
-          echo "Building from source ${x_pkg}"
-          echo
-        fi
-        if grep -wq "^$PKGNAME" ${CWD}/modularize ; then
-          # Set $PKG to a private dir for the modular package build:
-          PKG=$SLACK_X_BUILD_DIR/package-$PKGNAME
-          rm -rf $PKG
-          mkdir -p $PKG
-        fi
-
-        # Let's figure out the version number on the modular package:
-        MODULAR_PACKAGE_VERSION=$(echo $x_pkg | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-
-        rm -rf $(pkgbase $x_pkg)
-        tar xf $CWD/src/${x_source_dir}/${x_pkg} || exit 1
-        cd $(pkgbase $x_pkg) || exit 1
-
-        fix_perms
-
-        # If any patches are needed, call this script to apply them:
-        if [ -r $CWD/patch/${PKGNAME}.patch ]; then
-          . $CWD/patch/${PKGNAME}.patch
-        fi
-
-        # I heard somewhere that -O2 breaks some chipset or another.  If you encounter
-        # problems, please contact volkerdi@slackware.com.  Thanks! :-)
-
-        # ./configure, using custom configure script if needed:
-        if [ -r $CWD/configure/${PKGNAME} ]; then
-          . $CWD/configure/${PKGNAME}
-        else
-          # This is the default configure script:
-          . $CWD/configure/configure
-        fi
-
-        if ! make $NUMJOBS ; then
-          touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
-          continue
-        fi
-
-        make install DESTDIR=$PKG
-
-        mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
-        cp -a \
-          AUTHORS* COPYING* INSTALL* README* NEWS* TODO* \
-          $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
-
-        # If there's a ChangeLog, installing at least part of the recent history
-        # is useful, but don't let it get totally out of control:
-        if [ -r ChangeLog ]; then
-          DOCSDIR=$(echo $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION)
-          cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-          touch -r ChangeLog $DOCSDIR/ChangeLog
-        fi
-
-        # Get rid of zero-length junk files:
-        find $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION -type f -size 0 -exec rm --verbose "{}" \;
-        rmdir --verbose $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION 2> /dev/null
-   
-        # Strip binaries:
-        ( cd $PKG
-          find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-          find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-          find . | xargs file | grep "current ar archive" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null
-        )
-
-        # If there's any special post-install things to do, do them:
-        if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then
-          RUNSCRIPT=$(mktemp -p $TMP) || exit 1
-          cat $CWD/post-install/${PKGNAME}.post-install \
-            | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" > $RUNSCRIPT
-          . $RUNSCRIPT
-          rm -f $RUNSCRIPT
-        fi
-
-        # If this package requires some doinst.sh material, add it here:
-        if [ -r $CWD/doinst.sh/${PKGNAME} ]; then
-          mkdir -p $PKG/install
-          cat $CWD/doinst.sh/${PKGNAME} \
-            | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
-            >> $PKG/install/doinst.sh
-        fi
-
-        # If this is a modular package, build it here:
-        if [ -d $SLACK_X_BUILD_DIR/package-$PKGNAME ]; then
-          cd $PKG
-          process_man_pages
-          process_info_pages
-          no_usr_share_doc          
-          mkdir -p $PKG/install
-          if [ -r $CWD/slack-desc/${PKGNAME} ]; then
-            cat $CWD/slack-desc/${PKGNAME} > $PKG/install/slack-desc
-          else
-            touch $PKG/install/slack-desc-missing
-          fi
-          if [ -r $CWD/build/${PKGNAME} ]; then
-            MODBUILD=$(cat $CWD/build/${PKGNAME})
-          else
-            MODBUILD=$BUILD
-          fi
-          if [ -r $CWD/makepkg/${PKGNAME} ]; then
-            BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
-          else
-            /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz
-          fi
-        fi
-
-        # Reset $PKG to assume we're building the whole source dir:
-        PKG=${SLACK_X_BUILD_DIR}/package-${x_source_dir}
-
-      done
-
-      # Nothing here?  Must have been fully modular. :-)
-      if [ ! -d ${SLACK_X_BUILD_DIR}/package-${x_source_dir}/etc -a \
-        ! -d ${SLACK_X_BUILD_DIR}/package-${x_source_dir}/usr ]; then
-        continue
-      fi
-
-      # Build an "x11-<sourcedir>" package for anything that wasn't built modular:
-      # It's safer to consider these to have binaries in them. ;-)
-      PKGARCH=$ARCH
-      cd $PKG
-      process_man_pages
-      process_info_pages
-      no_usr_share_doc
-      # If there are post-install things to do for the combined package,
-      # we do them here.  This could be used for things like making a
-      # VERSION number for a combined package.  :-)
-      if [ -r $CWD/post-install/x11-${x_source_dir}.post-install ]; then
-        RUNSCRIPT=$(mktemp -p $TMP) || exit 1
-        cat $CWD/post-install/x11-${x_source_dir}.post-install \
-          | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" > $RUNSCRIPT
-        . $RUNSCRIPT
-        rm -f $RUNSCRIPT
-      fi
-      mkdir -p $PKG/install
-      if [ -r $CWD/slack-desc/x11-${x_source_dir} ]; then
-        cat $CWD/slack-desc/x11-${x_source_dir} > $PKG/install/slack-desc
-      else
-        touch $PKG/install/slack-desc-missing
-      fi
-      if [ -r $CWD/doinst.sh/x11-${x_source_dir} ]; then
-        cat $CWD/doinst.sh/x11-${x_source_dir} \
-          | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
-          >> $PKG/install/doinst.sh
-      fi
-      if [ -r $CWD/build/x11-${PKGNAME} ]; then
-        SRCDIRBUILD=$(cat $CWD/build/x11-${PKGNAME})
-      else
-        SRCDIRBUILD=$BUILD
-      fi
-      if [ -r $CWD/makepkg/${PKGNAME} ]; then
-        BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
-      else
-        /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
-      fi
-    )
-  done
-)
-
-exit 0
-
-# I don't think I'll be using the following stuff, since I went for the latest in
-# "individual", rather than a release.  That was mostly because version 7.1 depends
-# on a version of Mesa that won't build against kernel headers this new (&etc.).
-
-# If environment variable "REFRESH" is exported, start by refreshing the source tree:
-# export REFRESH yes
-if [ ! -z "$REFRESH" ]; then
-  # Only works once, unless you uncomment above.
-  unset REFRESH
-  ( cd patches
-    lftp -c \
-    "lftp ftp://ftp.x.org:/pub/X11R7.1/patches
-     mirror --delete --dereference .
-     exit"
-    chmod 644 *
-  )
-  ( cd src
-    mkdir -p update everything
-    for dir in app data deprecated doc driver extras font lib proto util xserver ; do
-      # We won't really download "update", as problems ensue.  Plus, --dereference is
-      # bringing us updated files when needed, so it's redundant (like "everything").
-      if [ ! -d $dir ]; then
-        mkdir $dir
-      fi
-      ( cd $dir
-        lftp -c \
-        "lftp ftp://ftp.x.org:/pub/X11R7.1/src/$dir
-         mirror -c --delete --dereference --include-glob "*.tar.bz2" .
-         exit"
-        chmod 644 *
-      )
-    done
-  )
-fi
-
diff --git a/testing/source/xf86-video-nouveau/xf86-video-nouveau.SlackBuild b/testing/source/xf86-video-nouveau/xf86-video-nouveau.SlackBuild
index 70f93a309..393b7bfdf 100755
--- a/testing/source/xf86-video-nouveau/xf86-video-nouveau.SlackBuild
+++ b/testing/source/xf86-video-nouveau/xf86-video-nouveau.SlackBuild
@@ -1 +1,135 @@
-./x11.SlackBuild driver xf86-video-nouveau
+#!/bin/sh
+
+# Copyright 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=xf86-video-nouveau
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS=$SLKCFLAGS \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/xf86-video-fbdev-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+