system/nvidia-legacy304-driver: Removed nvidia-installer, cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 17 insertions, 38 deletions

diff --git a/system/nvidia-legacy304-driver/changelog.txt b/system/nvidia-legacy304-driver/changelog.txt
index f0e784494e3a0..fc2924d40df19 100644
--- a/system/nvidia-legacy304-driver/changelog.txt
+++ b/system/nvidia-legacy304-driver/changelog.txt
@@ -1,15 +1,16 @@
-1.0		20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1		10-APR-2011	updated to new version, testing 13.37rc4.6692
-1.2		27-MAY-2011	new version, allow multilib option, minor edits
+1.0	20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
+1.1	10-APR-2011	updated to new version, testing 13.37rc4.6692
+1.2	27-MAY-2011	new version, allow multilib option, minor edits
 1.2.1	20-JUN-2011	minor edits, thanks to Robby and Roberto
-1.5		01-JUL-2011	new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6		27-AUG-2011	version bump, minor edits
-1.7		21-OCT-2011	version bump
-1.8		24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
-1.9		02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
-3.0		06-JUL-2013 Legacy 304 branch, removed 32-bit compatibility
-3.1		22-SEP-2013	version update
+1.5	01-JUL-2011	new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
+1.6	27-AUG-2011	version bump, minor edits
+1.7	21-OCT-2011	version bump
+1.8	24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
+1.9	02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
+3.0	06-JUL-2013 Legacy 304 branch, removed 32-bit compatibility
+3.1	22-SEP-2013	version update
 3.1a	04-NOV-2013	minor fixes for 14.1 release
-3.2		08-FEB-2015 version update, restored 32-bit compatibility
-3.3     05-SEP-2015 version update
-3.4     13-DEC-2015 version update, X.org 1.18
+3.2	08-FEB-2015 version update, restored 32-bit compatibility
+3.3	05-SEP-2015 version update
+3.4	13-DEC-2015 version update, X.org 1.18
+3.5	19-MAR-2016 remove nvidia-installer (doesn't compile on 14.2RC1), minor edits
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
index 6d7447275446a..dab5100ba8059 100644
--- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
+++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for nvidia-driver
 
 # Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2011-2013 Edward W. koenig, Vancouver, WA, USA
+# Copyright 2011-2016 Edward W. koenig, Vancouver, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -73,8 +73,6 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf nvidia-installer-$VERSION
-tar xvf $CWD/nvidia-installer-$VERSION.tar.bz2
 rm -rf nvidia-settings-$VERSION
 tar xvf $CWD/nvidia-settings-$VERSION.tar.bz2
 rm -rf nvidia-xconfig-$VERSION
@@ -175,22 +173,6 @@ if [ "$ARCH" = "x86_64" -a "${CPROXY}" = "yes" ]; then
    install -m 644 nvidia-cuda-mps-control.1.gz $PKG/usr/man/man1/
 fi
 
-# Compiling nvidia-installer from source
-# Not really needed for this SBo package
-cd $TMP/nvidia-installer-$VERSION
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-  CFLAGS="$SLKCFLAGS" LDFLAGS="-lz" make
-
-  install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
-  install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
-cd -
-
 # Compiling nvidia-settings from source
 cd $TMP/nvidia-settings-$VERSION
   chown -R root:root .
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
index cc89c3771d95e..c3f37ee05efbc 100644
--- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
+++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
@@ -2,19 +2,15 @@ PRGNAM="nvidia-legacy304-driver"
 VERSION="304.131"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.131/NVIDIA-Linux-x86-304.131.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.131.tar.bz2 \
           ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \
           ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2"
 MD5SUM="9f3222fd7287d9b31f54f1d75760e183 \
-        682e392770b5763fb018d6e2193b2bbd \
         fd5535623e840330cd05fe7e05278ec4 \
         e3c8f8c3918449728a8da09863a03d3c"
 DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.131/NVIDIA-Linux-x86_64-304.131.run \
-				 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.131.tar.bz2 \
-				 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \
-				 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2"
+		 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \
+		 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2"
 MD5SUM_x86_64="e80db7eaf32294d4066f841f0870a85a \
-        682e392770b5763fb018d6e2193b2bbd \
         fd5535623e840330cd05fe7e05278ec4 \
         e3c8f8c3918449728a8da09863a03d3c"
 REQUIRES="nvidia-legacy304-kernel"