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

[Eric Bélanger]

    Date: Friday, May 1, 2009 @ 00:57:50
  Author: eric
Revision: 37203

Fixed svn conflict

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

----------------+
 PKGBUILD       |   43 +++++++++++++++++++++++--------------------
 nforce.install |    9 ++-------
 2 files changed, 25 insertions(+), 27 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-01 04:53:20 UTC (rev 37202)
+++ extra-x86_64/PKGBUILD	2009-05-01 04:57:50 UTC (rev 37203)
@@ -1,33 +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)
-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')
+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')
 
-install="nforce.install"
-build() {  
-  cd $startdir/src/
-if [ "$CARCH" = "x86_64" ]; then
+
+build() {
+  # Extract
+  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
-  else sh NFORCE-Linux-x86-${_nver}-pkg1.run --extract-only
-       cd NFORCE-Linux-x86-${_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
+  fi
+
+  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
  }
+

Modified: extra-x86_64/nforce.install
===================================================================
--- extra-x86_64/nforce.install	2009-05-01 04:53:20 UTC (rev 37202)
+++ extra-x86_64/nforce.install	2009-05-01 04:57:50 UTC (rev 37203)
@@ -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 $*