[arch-commits] Commit in nx-common/repos (extra-i686 extra-i686/PKGBUILD)

[Tobias Powalowski]

    Date: Monday, December 1, 2008 @ 15:50:29
  Author: tpowa
Revision: 20256

Merged revisions 20247 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/nx-common/trunk

........
  r20247 | tpowa | 2008-12-01 20:13:22 +0000 (Mo, 01 Dez 2008) | 1 line
  
  upgpkg: nx-common 3.3.0-1
........

Modified:
  nx-common/repos/extra-i686/	(properties)
  nx-common/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)


Property changes on: nx-common/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /nx-common/trunk:1-13802
   + /nx-common/trunk:1-20255

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-01 20:49:22 UTC (rev 20255)
+++ extra-i686/PKGBUILD	2008-12-01 20:50:29 UTC (rev 20256)
@@ -2,7 +2,7 @@
 # Maintainer Tobias Powalowski <tpowa at archlinux.org>
 # Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
 pkgname=nx-common
-pkgver=3.2.0
+pkgver=3.3.0
 pkgrel=1
 pkgdesc="NoMachine NX common package for client and server"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@
 depends=('libjpeg' 'libpng' 'openssl>=0.9.8g' 'gcc-libs' 'audiofile' 'alsa-lib' 'bash')
 source=(\
 #Compression libs and proxy sources
-http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-3.tar.gz \
 http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz \
 # ESD Support
 http://64.34.161.181/download/$pkgver/sources/nxesd-$pkgver-1.tar.gz
@@ -19,37 +19,36 @@
 NXproto.h.64bit.diff)
 options=(!libtool)
 
-
 build() {
-  cd $startdir/src
+  cd ${srcdir}
  
-  mkdir -p $startdir/pkg/opt/NX/bin
-  mkdir -p $startdir/pkg/opt/NX/lib 
+  mkdir -p ${pkgdir}/opt/NX/bin
+  mkdir -p ${pkgdir}/opt/NX/lib 
 
-  cd $startdir/src/nxcomp
+  cd ${srcdir}/nxcomp
   if [ "$CARCH" = "x86_64" ]; then
     patch -Np1 -i ../NXproto.h.64bit.diff  || return 1
   fi
   ./configure --prefix=/opt/NX
   make || return 1
-  cp -a libXcomp.so.* $startdir/pkg/opt/NX/lib
-  cd $startdir/pkg/opt/NX/lib
+  cp -a libXcomp.so.* ${pkgdir}/opt/NX/lib
+  cd ${pkgdir}/opt/NX/lib
   ln -s libXcomp.so.1 libXcomp.so
 
-  cd $startdir/src/nxssh
+  cd ${srcdir}/nxssh
   ./configure --prefix=/opt/NX
   make || return 1
-  install -D -m755 nxssh $startdir/pkg/opt/NX/bin/nxssh
+  install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
  
-  cd $startdir/src/nxesd
+  cd ${srcdir}/nxesd
   ./configure --prefix=/opt/NX
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR=${pkgdir} install || return 1
   # fix libxcomp linking
-  cd $startdir/pkg/opt/NX/lib
+  cd ${pkgdir}/opt/NX/lib
   ln -s libXcomp.so.3 libXcomp.so.1
 }
-md5sums=('5ea64a557c770d9f5cc4b9a7a9d1343c'
-         '6d4955376ea1dfcb6971b2b46d31ece1'
-         '4a239b52e5bcf6efb2e7f33ebcd24188'
+md5sums=('2327cca8e6116fd6a96345566336d81d'
+         'e9bb4c1cd61c42db9626894845fcf3f7'
+         '358c449a459a2d7d66e70b61b72baa72'
          '58341ba70dfab92ff38570071fbbf88a')