[arch-commits] Commit in nforce-utils/repos (3 files)

[Eric Bélanger]

    Date: Friday, May 1, 2009 @ 01:06:36
  Author: eric
Revision: 37206

Merged revisions 356,37202 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/nforce-utils/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r37202 | eric | 2009-05-01 00:53:20 -0400 (Fri, 01 May 2009) | 2 lines
  
  upgpkg: nforce-utils 1.0.0310-2
      Added license, Updated post-install message, Fixed x86_64 package (now installs x86_64 binaries instead of i686)
........

Modified:
  nforce-utils/repos/extra-i686/	(properties)
  nforce-utils/repos/extra-i686/PKGBUILD
  nforce-utils/repos/extra-i686/nforce.install

----------------+
 PKGBUILD       |   41 ++++++++++++++++++++++++-----------------
 nforce.install |    9 ++-------
 2 files changed, 26 insertions(+), 24 deletions(-)


Property changes on: nforce-utils/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /nforce-utils/trunk:1
   + /nforce-utils/trunk:1-37205

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-01 04:59:05 UTC (rev 37205)
+++ extra-i686/PKGBUILD	2009-05-01 05:06:36 UTC (rev 37206)
@@ -1,29 +1,36 @@
 # $Id$
 # Maintainer : Tobias Powalowski <tpowa at archlinux.org>
 
-
 pkgname=nforce-utils
 pkgver=1.0.0310
 _nver=1.0-0310
-pkgrel=1
+pkgrel=2
 pkgdesc="The Nvidia nforce utilities"
 arch=(i686 x86_64)
 url="http://www.nvidia.com"
-depends=()
-source=(ftp://download.nvidia.com/XFree86/nforce/${_nver}/NFORCE-Linux-x86-${_nver}-pkg1.run)
-install="nforce.install"
-build() {  
-cd $startdir/src/
+license=('custom')
+install=nforce.install
+[ "${CARCH}" = "i686" ] && source=(ftp://download.nvidia.com/XFree86/nforce/${_nver}/NFORCE-Linux-x86-${_nver}-pkg1.run)
+[ "${CARCH}" = "i686" ] && md5sums=('9e0b636ff53f4f23768383af962cc68c')
+[ "${CARCH}" = "x86_64" ] && source=(ftp://download.nvidia.com/XFree86/nforce/${_nver}/NFORCE-Linux-x86_64-${_nver}-pkg1.run)
+[ "${CARCH}" = "x86_64" ] && md5sums=('52295218f89f5338b88ceb40f34eb3a3')
+
+
+build() {
   # Extract
-  cd $startdir/src/
-  sh NFORCE-Linux-x86-${_nver}-pkg1.run --extract-only
-  cd NFORCE-Linux-x86-${_nver}-pkg1
+  cd $srcdir
+  if [ "${CARCH}" = "i686" ]; then
+    sh NFORCE-Linux-x86-${_nver}-pkg1.run --extract-only
+    cd NFORCE-Linux-x86-${_nver}-pkg1
+  elif [ "${CARCH}" = "x86_64" ]; then
+    sh NFORCE-Linux-x86_64-${_nver}-pkg1.run --extract-only
+    cd NFORCE-Linux-x86_64-${_nver}-pkg1
+  fi
 
-  mkdir -p $startdir/pkg/usr/{lib,bin}
-  install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/nforce/LICENSE
-  install -D -m755 nvsound/nvmix-reg $startdir/pkg/usr/bin/nvmix-reg 
-  install -D -m755 nvsound/nvmixer $startdir/pkg/usr/bin/nvmixer
-  install -D -m644 nvsound/lib/libnvalut.a  $startdir/pkg/usr/lib/libnvalut.a
-  install -D -m644 nvsound/lib/libnvopenal.a $startdir/pkg/usr/lib/libnvopenal.a
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/nforce-utils/LICENSE
+  install -D -m755 nvsound/nvmix-reg $pkgdir/usr/bin/nvmix-reg 
+  install -D -m755 nvsound/nvmixer $pkgdir/usr/bin/nvmixer
+  install -D -m644 nvsound/lib/libnvalut.a  $pkgdir/usr/lib/libnvalut.a
+  install -D -m644 nvsound/lib/libnvopenal.a $pkgdir/usr/lib/libnvopenal.a
  }
-md5sums=('9e0b636ff53f4f23768383af962cc68c')
+

Modified: extra-i686/nforce.install
===================================================================
--- extra-i686/nforce.install	2009-05-01 04:59:05 UTC (rev 37205)
+++ extra-i686/nforce.install	2009-05-01 05:06:36 UTC (rev 37206)
@@ -1,19 +1,14 @@
 post_install() {
   echo -------------------------------
   echo By using this package you accept the NVIDIA license, 
-  echo which has been installed in /usr/share/licenses/nforce/LICENSE
+  echo which has been installed in /usr/share/licenses/nforce-utils/LICENSE
   echo If you do not accept this license, you must remove the package immediately.
   echo If you need more information about setting up nforce drivers have a look at:
   echo 'http://wiki.archlinux.org/index.php/Nforce_Drivers'
-  echo To use the addon programs you need 'qt' installed.
+  echo To use the addon programs you need 'libstdc++5' and 'qt3' installed.
   echo ------------------------------- 
 }
 
 post_upgrade() {
  post_install $1
 }
-
-op=$1
-shift
-
-$op $*