[arch-commits] Commit in nx-common/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Sunday, April 15, 2012 @ 10:20:08
  Author: andyrtr
Revision: 156188

upgpkg: nx-common 3.5.0-4.1

mv files to /usr; use new nx-libs

Modified:
  nx-common/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-15 14:12:20 UTC (rev 156187)
+++ PKGBUILD	2012-04-15 14:20:08 UTC (rev 156188)
@@ -4,56 +4,42 @@
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=4
+pkgrel=4.1
 pkgdesc="NoMachine NX common package for client and server"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://nomachine.com/"
-depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'bash')
-makedepends=('xorg-server-devel')
-source=( #Compression libs and proxy sources
-	http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
-	http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
-	http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
-	nxcompsh-gcc43.patch
-	nx-3.5.0-libpng15.patch)
-options=(!libtool)
-md5sums=('ad8c0f133122c6d07732ca69c8759410'
-         '84ade443b79ea079380b754aba9d392e'
+depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash'
+makedepends=('xorg-server-devel' 'nx-headers')
+source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
+        http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
+        nxcompsh-gcc43.patch)
+options=('!libtool')
+md5sums=('84ade443b79ea079380b754aba9d392e'
          'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
-         'b6c279654dac421fc3dd1a27d66ff53c'
-         '2966353cabb96829eab291212ef078dc')
+         'b6c279654dac421fc3dd1a27d66ff53c')
 
 build() {
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-
-  ./configure --prefix=/opt/NX
-  make
   # nxcompsh
   cd ${srcdir}/nxcompsh
   patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
- 
-  ./configure --prefix=/opt/NX
+  ./configure --prefix=/usr/lib/nx
   make
+
   # nxssh
   cd ${srcdir}/nxssh
-  ./configure --prefix=/opt/NX
+  sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
   make
 }
 
 package() {
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib 
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
 
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
   # nxcompsh
   cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
+  cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx # really needed?
   # nxssh
   cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
+  install -D -m755 nxssh ${pkgdir}/usr/bin/nxssh
 }