[arch-commits] Commit in nx/repos (8 files)

2013-03-29 Thread Andreas Radke
Date: Friday, March 29, 2013 @ 11:06:34
  Author: andyrtr
Revision: 180978

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nx/repos/extra-i686/PKGBUILD
(from rev 180977, nx/trunk/PKGBUILD)
  nx/repos/extra-i686/keyboard_rule.diff
(from rev 180977, nx/trunk/keyboard_rule.diff)
  nx/repos/extra-x86_64/PKGBUILD
(from rev 180977, nx/trunk/PKGBUILD)
  nx/repos/extra-x86_64/keyboard_rule.diff
(from rev 180977, nx/trunk/keyboard_rule.diff)
Deleted:
  nx/repos/extra-i686/PKGBUILD
  nx/repos/extra-i686/keyboard_rule.diff
  nx/repos/extra-x86_64/PKGBUILD
  nx/repos/extra-x86_64/keyboard_rule.diff

-+
 /PKGBUILD   |  302 ++
 /keyboard_rule.diff |   22 ++
 extra-i686/PKGBUILD |  151 ---
 extra-i686/keyboard_rule.diff   |   11 -
 extra-x86_64/PKGBUILD   |  151 ---
 extra-x86_64/keyboard_rule.diff |   11 -
 6 files changed, 324 insertions(+), 324 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-03-29 10:06:10 UTC (rev 180977)
+++ extra-i686/PKGBUILD 2013-03-29 10:06:34 UTC (rev 180978)
@@ -1,151 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.19
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-#options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime 
dependencies from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
-keyboard_rule.diff)
-md5sums=('6343c8bfee72e9b0bc2686c7785d1b0f'
- 'f681bc66827cd7ddff4b81b983c20401')
-
-build() {
-  cd "${srcdir}/nx-libs-$pkgver"
-  
-  # fix keyboard layout with xkeyboard-config >= 2.6 - doesn't solve proper 
layout detection
-  # upstream needs to do much more work in that area
-  patch -Np1 -i ${srcdir}/keyboard_rule.diff
-  
-  # debug flags
-#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
-#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
-  # honour CFLAGS in X11 build - upstream fixed so far only the other libs
-  # From xorg-x11-6.9.0-r3.ebuild
-  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
-
-  HOSTCONF="config/cf/host.def"
-  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> 
${HOSTCONF}
-  # Respect LDFLAGS
-  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-  popd
-
-  # fix a broken Makefiles
-  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
-
-  make \
-PREFIX=/usr \
-CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx
-  # symlinks
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy 
${pkgdir}/usr/lib/nx/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
-  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx
-
-  # symlinks
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-  #ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
-  # nxauth
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext' 'libxml2')
-   
-  instal

[arch-commits] Commit in nx/repos (8 files)

2013-03-28 Thread Andreas Radke
Date: Thursday, March 28, 2013 @ 19:40:16
  Author: andyrtr
Revision: 180939

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nx/repos/extra-i686/PKGBUILD
(from rev 180938, nx/trunk/PKGBUILD)
  nx/repos/extra-i686/keyboard_rule.diff
(from rev 180938, nx/trunk/keyboard_rule.diff)
  nx/repos/extra-x86_64/PKGBUILD
(from rev 180938, nx/trunk/PKGBUILD)
  nx/repos/extra-x86_64/keyboard_rule.diff
(from rev 180938, nx/trunk/keyboard_rule.diff)
Deleted:
  nx/repos/extra-i686/PKGBUILD
  nx/repos/extra-i686/keyboard_rule.diff
  nx/repos/extra-x86_64/PKGBUILD
  nx/repos/extra-x86_64/keyboard_rule.diff

-+
 /PKGBUILD   |  302 ++
 /keyboard_rule.diff |   22 ++
 extra-i686/PKGBUILD |  151 ---
 extra-i686/keyboard_rule.diff   |   11 -
 extra-x86_64/PKGBUILD   |  151 ---
 extra-x86_64/keyboard_rule.diff |   11 -
 6 files changed, 324 insertions(+), 324 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-03-28 18:39:52 UTC (rev 180938)
+++ extra-i686/PKGBUILD 2013-03-28 18:40:16 UTC (rev 180939)
@@ -1,151 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.18
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-#options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime 
dependencies from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
-keyboard_rule.diff)
-md5sums=('cb321b520c3e157619e4ed5315c9e44c'
- 'f681bc66827cd7ddff4b81b983c20401')
-
-build() {
-  cd "${srcdir}/nx-libs-$pkgver"
-  
-  # fix keyboard layout with xkeyboard-config >= 2.6 - doesn't solve proper 
layout detection
-  # upstream needs to do much more work in that area
-  patch -Np1 -i ${srcdir}/keyboard_rule.diff
-  
-  # debug flags
-#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
-#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
-  # honour CFLAGS in X11 build - upstream fixed so far only the other libs
-  # From xorg-x11-6.9.0-r3.ebuild
-  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
-
-  HOSTCONF="config/cf/host.def"
-  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> 
${HOSTCONF}
-  # Respect LDFLAGS
-  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-  popd
-
-  # fix a broken Makefiles
-  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
-
-  make \
-PREFIX=/usr \
-CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx
-  # symlinks
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy 
${pkgdir}/usr/lib/nx/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
-  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx
-
-  # symlinks
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-  #ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
-  # nxauth
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext' 'libxml2')
-   
-  inst

[arch-commits] Commit in nx/repos (8 files)

2013-03-23 Thread Andreas Radke
Date: Saturday, March 23, 2013 @ 16:42:01
  Author: andyrtr
Revision: 180572

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nx/repos/extra-i686/PKGBUILD
(from rev 180571, nx/trunk/PKGBUILD)
  nx/repos/extra-i686/keyboard_rule.diff
(from rev 180571, nx/trunk/keyboard_rule.diff)
  nx/repos/extra-x86_64/PKGBUILD
(from rev 180571, nx/trunk/PKGBUILD)
  nx/repos/extra-x86_64/keyboard_rule.diff
(from rev 180571, nx/trunk/keyboard_rule.diff)
Deleted:
  nx/repos/extra-i686/PKGBUILD
  nx/repos/extra-i686/nx-cflags.patch
  nx/repos/extra-x86_64/PKGBUILD
  nx/repos/extra-x86_64/nx-cflags.patch

-+
 /PKGBUILD   |  300 ++
 extra-i686/PKGBUILD |  144 --
 extra-i686/keyboard_rule.diff   |   11 +
 extra-i686/nx-cflags.patch  |   54 --
 extra-x86_64/PKGBUILD   |  144 --
 extra-x86_64/keyboard_rule.diff |   11 +
 extra-x86_64/nx-cflags.patch|   54 --
 7 files changed, 322 insertions(+), 396 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-03-23 15:41:36 UTC (rev 180571)
+++ extra-i686/PKGBUILD 2013-03-23 15:42:01 UTC (rev 180572)
@@ -1,144 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.17
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-#options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime 
dependencies from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
-md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
-
-build() {
-  cd "${srcdir}/nx-libs-$pkgver"
-  
-  # debug flags
-#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
-#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
-  # honour CFLAGS in X11 build - upstream fixed so far only the other libs
-  # From xorg-x11-6.9.0-r3.ebuild
-  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
-
-  HOSTCONF="config/cf/host.def"
-  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> 
${HOSTCONF}
-  # Respect LDFLAGS
-  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-  popd
-
-  # fix a broken Makefiles
-  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
-
-  make \
-PREFIX=/usr \
-CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx
-  # symlinks
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy 
${pkgdir}/usr/lib/nx/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
-  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx
-
-  # symlinks
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-  #ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
-  # nxauth
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext' 'libxml2')
-   
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx}
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin
-  
-  # addition

[arch-commits] Commit in nx/repos (8 files)

2013-01-13 Thread andyrtr
Date: Sunday, January 13, 2013 @ 04:33:31
  Author: andyrtr
Revision: 175081

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nx/repos/extra-i686/PKGBUILD
(from rev 175080, nx/trunk/PKGBUILD)
  nx/repos/extra-i686/nx-cflags.patch
(from rev 175080, nx/trunk/nx-cflags.patch)
  nx/repos/extra-x86_64/PKGBUILD
(from rev 175080, nx/trunk/PKGBUILD)
  nx/repos/extra-x86_64/nx-cflags.patch
(from rev 175080, nx/trunk/nx-cflags.patch)
Deleted:
  nx/repos/extra-i686/PKGBUILD
  nx/repos/extra-i686/nx-cflags.patch
  nx/repos/extra-x86_64/PKGBUILD
  nx/repos/extra-x86_64/nx-cflags.patch

--+
 extra-i686/PKGBUILD  |  284 -
 extra-i686/nx-cflags.patch   |  108 +++
 extra-x86_64/PKGBUILD|  284 -
 extra-x86_64/nx-cflags.patch |  108 +++
 4 files changed, 396 insertions(+), 388 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-01-13 09:32:53 UTC (rev 175080)
+++ extra-i686/PKGBUILD 2013-01-13 09:33:31 UTC (rev 175081)
@@ -1,140 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.17
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-#options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime 
dependencies from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
-md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
-
-build() {
-  cd "${srcdir}/nx-libs-$pkgver"
-  
-  # debug flags
-#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
-#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
-  # honour CFLAGS in X11 build - upstream fixed so far only the other libs
-  # From xorg-x11-6.9.0-r3.ebuild
-  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
-
-  HOSTCONF="config/cf/host.def"
-  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> 
${HOSTCONF}
-  # Respect LDFLAGS
-  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-  popd
-
-  # fix two broken Makefiles
-  sed -i "s:/usr/local:/usr:" Makefile
-  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
-
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx
-  # symlinks
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy 
${pkgdir}/usr/lib/nx/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
-  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx
-
-  # symlinks
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-  #ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
-  # nxauth
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext' 'libxml2')
-   
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx}
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin
-  # the wrapper
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin
-  
-  # additional files for documentation
-  cp -a ${srcdir}/fakeinstall/usr/share/nx/SecurityPolicy 
${pkgdir}/usr/share/nx
-  
-  cp -a ${src

[arch-commits] Commit in nx/repos (8 files)

2013-01-06 Thread andyrtr
Date: Sunday, January 6, 2013 @ 12:02:54
  Author: andyrtr
Revision: 174757

db-move: moved nx from [staging] to [testing] (i686, x86_64)

Added:
  nx/repos/testing-i686/
  nx/repos/testing-i686/PKGBUILD
(from rev 174756, nx/repos/staging-i686/PKGBUILD)
  nx/repos/testing-i686/nx-cflags.patch
(from rev 174756, nx/repos/staging-i686/nx-cflags.patch)
  nx/repos/testing-x86_64/
  nx/repos/testing-x86_64/PKGBUILD
(from rev 174756, nx/repos/staging-x86_64/PKGBUILD)
  nx/repos/testing-x86_64/nx-cflags.patch
(from rev 174756, nx/repos/staging-x86_64/nx-cflags.patch)
Deleted:
  nx/repos/staging-i686/
  nx/repos/staging-x86_64/

+
 testing-i686/PKGBUILD  |  140 +++
 testing-i686/nx-cflags.patch   |   54 +++
 testing-x86_64/PKGBUILD|  140 +++
 testing-x86_64/nx-cflags.patch |   54 +++
 4 files changed, 388 insertions(+)

Copied: nx/repos/testing-i686/PKGBUILD (from rev 174756, 
nx/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-01-06 17:02:54 UTC (rev 174757)
@@ -0,0 +1,140 @@
+# $Id$
+# Maintainer: Andreas Radke 
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
+pkgver=3.5.0.17
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/";
+license=('GPL')
+#options=('!makeflags') # '!strip')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime 
dependencies from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
+md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
+
+build() {
+  cd "${srcdir}/nx-libs-$pkgver"
+  
+  # debug flags
+#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
+#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+  # honour CFLAGS in X11 build - upstream fixed so far only the other libs
+  # From xorg-x11-6.9.0-r3.ebuild
+  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
+
+  HOSTCONF="config/cf/host.def"
+  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> 
${HOSTCONF}
+  # Respect LDFLAGS
+  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+  popd
+
+  # fix two broken Makefiles
+  sed -i "s:/usr/local:/usr:" Makefile
+  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
+
+  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+  
+  pkgdesc="NX X compression library"
+  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+   
+  install -dm755 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx
+  # symlinks
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcomp.so{,.3,.3.5.0} .
+}
+
+package_nxproxy() {
+
+  pkgdesc="NX proxy"
+  depends=('libxcomp')
+  
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy 
${pkgdir}/usr/lib/nx/bin/nxproxy
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
+  # the wrapper
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
+}
+
+package_nx-xcompext() {
+  
+  pkgdesc="Xcompext/Xcompshad library for NX"
+  depends=('libxcomp' 'nx-x11')
+   
+  install -dm755 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
+  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx
+
+  # symlinks
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
+  #ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
+}
+
+package_nx-x11() {
+ 
+  pkgdesc="NX-X11 lib for the NX framework"
+  depends=('libxcomp')
+   
+  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
+  # nxauth
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+  # the wrapper
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
+}
+
+package_nxagent() {
+  
+  pkgdesc="NX X server based on Xnest"
+  depends=('nx-xcompext' 'libxml2')
+   
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx}
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin
+  # the wrapper
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin
+  
+  # additional files for documentation
+  cp -

[arch-commits] Commit in nx/repos (8 files)

2012-10-08 Thread andyrtr
Date: Monday, October 8, 2012 @ 14:52:28
  Author: andyrtr
Revision: 168322

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  nx/repos/testing-i686/
  nx/repos/testing-i686/PKGBUILD
(from rev 168321, nx/trunk/PKGBUILD)
  nx/repos/testing-i686/nx-cflags.patch
(from rev 168321, nx/trunk/nx-cflags.patch)
  nx/repos/testing-i686/nx-x11.ld.so.conf.d
(from rev 168321, nx/trunk/nx-x11.ld.so.conf.d)
  nx/repos/testing-x86_64/
  nx/repos/testing-x86_64/PKGBUILD
(from rev 168321, nx/trunk/PKGBUILD)
  nx/repos/testing-x86_64/nx-cflags.patch
(from rev 168321, nx/trunk/nx-cflags.patch)
  nx/repos/testing-x86_64/nx-x11.ld.so.conf.d
(from rev 168321, nx/trunk/nx-x11.ld.so.conf.d)

+
 testing-i686/PKGBUILD  |  145 +++
 testing-i686/nx-cflags.patch   |   54 +
 testing-i686/nx-x11.ld.so.conf.d   |1 
 testing-x86_64/PKGBUILD|  145 +++
 testing-x86_64/nx-cflags.patch |   54 +
 testing-x86_64/nx-x11.ld.so.conf.d |1 
 6 files changed, 400 insertions(+)

Copied: nx/repos/testing-i686/PKGBUILD (from rev 168321, nx/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-08 18:52:28 UTC (rev 168322)
@@ -0,0 +1,145 @@
+# $Id$
+# Maintainer: Andreas Radke 
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.15
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/";
+license=('GPL')
+options=('!makeflags') # '!strip')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
+nx-x11.ld.so.conf.d
+nx-cflags.patch)
+md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6'
+ 'd0c5b88aac0473e19699cf62d84b9d5f')
+
+build() {
+  cd "${srcdir}/nx-libs-$pkgver"
+  
+  # debug flags
+#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
+#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+
+  # Gentoo hacks to honor cflags
+  patch -Np0 -i ${srcdir}/nx-cflags.patch
+
+  # Run autoreconf in all neeed folders
+  for i in nxcomp nxcompext nxcompshad nxproxy; do
+ cd ${i}
+ autoreconf -vfi #${i}
+ cd ..
+  done
+  
+  # From xorg-x11-6.9.0-r3.ebuild
+  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
+
+  HOSTCONF="config/cf/host.def"
+  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> 
${HOSTCONF}
+  # Respect LDFLAGS
+  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+  popd
+
+  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+  
+  pkgdesc="NX X compression library"
+  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+   
+  install -dm755 ${pkgdir}/usr/lib/nx/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
+}
+
+package_nxproxy() {
+
+  pkgdesc="NX proxy"
+  depends=('libxcomp')
+  
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxproxy .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxproxy
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
+}
+
+package_nx-xcompext() {
+  
+  pkgdesc="Xcompext/Xcompshad library for NX"
+  depends=('libxcomp' 'nx-x11')
+   
+  install -dm755 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 
${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
+  ln -sv libXcompext.so.3.5.0 libXcompext.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
+}
+
+package_nx-x11() {
+ 
+  pkgdesc="NX-X11 lib for the NX framework"
+  depends=('libxcomp')
+   
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
+
+  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxauth .
+  
+  # the wrap

[arch-commits] Commit in nx/repos (8 files)

2012-06-28 Thread andyrtr
Date: Thursday, June 28, 2012 @ 13:12:56
  Author: andyrtr
Revision: 162703

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nx/repos/extra-i686/PKGBUILD
(from rev 162702, nx/trunk/PKGBUILD)
  nx/repos/extra-i686/nx-x11.ld.so.conf.d
(from rev 162702, nx/trunk/nx-x11.ld.so.conf.d)
  nx/repos/extra-x86_64/PKGBUILD
(from rev 162702, nx/trunk/PKGBUILD)
  nx/repos/extra-x86_64/nx-x11.ld.so.conf.d
(from rev 162702, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
  nx/repos/extra-i686/PKGBUILD
  nx/repos/extra-i686/nx-x11.ld.so.conf.d
  nx/repos/extra-x86_64/PKGBUILD
  nx/repos/extra-x86_64/nx-x11.ld.so.conf.d

--+
 extra-i686/PKGBUILD  |  232 ++---
 extra-i686/nx-x11.ld.so.conf.d   |2 
 extra-x86_64/PKGBUILD|  232 ++---
 extra-x86_64/nx-x11.ld.so.conf.d |2 
 4 files changed, 234 insertions(+), 234 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-06-28 17:12:15 UTC (rev 162702)
+++ extra-i686/PKGBUILD 2012-06-28 17:12:56 UTC (rev 162703)
@@ -1,116 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.13
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
-nx-x11.ld.so.conf.d)
-md5sums=('2c80e570d35a25989f8606e1f3620026'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
-  cd "${srcdir}/nx-libs_$pkgver"
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx/lib
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxproxy .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 
${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
-  ln -sv libXcompext.so.3.5.0 libXcompext.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
-
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxauth .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxauth
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" 
"$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
-   
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxagent .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxagent
-  # required nxcompshad libs
-  cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 
${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
-}
-
-package_nx-headers() {
-
-  pkgdesc="NX headers"
-  
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  

Copied: nx/repos/e

[arch-commits] Commit in nx/repos (8 files)

2012-04-22 Thread andyrtr
Date: Sunday, April 22, 2012 @ 13:10:42
  Author: andyrtr
Revision: 156665

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  nx/repos/testing-i686/PKGBUILD
(from rev 156664, nx/trunk/PKGBUILD)
  nx/repos/testing-i686/nx-x11.ld.so.conf.d
(from rev 156664, nx/trunk/nx-x11.ld.so.conf.d)
  nx/repos/testing-x86_64/PKGBUILD
(from rev 156664, nx/trunk/PKGBUILD)
  nx/repos/testing-x86_64/nx-x11.ld.so.conf.d
(from rev 156664, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
  nx/repos/testing-i686/PKGBUILD
  nx/repos/testing-i686/nx-x11.ld.so.conf.d
  nx/repos/testing-x86_64/PKGBUILD
  nx/repos/testing-x86_64/nx-x11.ld.so.conf.d

+
 testing-i686/PKGBUILD  |  224 ++-
 testing-i686/nx-x11.ld.so.conf.d   |2 
 testing-x86_64/PKGBUILD|  224 ++-
 testing-x86_64/nx-x11.ld.so.conf.d |2 
 4 files changed, 234 insertions(+), 218 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-04-22 17:09:43 UTC (rev 156664)
+++ testing-i686/PKGBUILD   2012-04-22 17:10:42 UTC (rev 156665)
@@ -1,108 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.12
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
-nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
-  cd "${srcdir}/nx-libs_$pkgver"
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx/lib
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 
${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
-  ln -sv libXcompext.so.3.5.0 libXcompext.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
-
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxauth
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" 
"$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
-   
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxagent
-  # required nxcompshad libs
-  cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 
${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
-}
-
-package_nx-headers() {
-
-  pkgdesc="NX headers"
-  
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  

Copied: nx/repos/testing-i686/PKGBUILD (from rev 156664, nx/trunk/PKGBUILD)
===

[arch-commits] Commit in nx/repos (8 files)

2012-04-21 Thread andyrtr
Date: Saturday, April 21, 2012 @ 18:50:01
  Author: andyrtr
Revision: 156615

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  nx/repos/staging-i686/PKGBUILD
(from rev 156614, nx/trunk/PKGBUILD)
  nx/repos/staging-i686/nx-x11.ld.so.conf.d
(from rev 156614, nx/trunk/nx-x11.ld.so.conf.d)
  nx/repos/staging-x86_64/PKGBUILD
(from rev 156614, nx/trunk/PKGBUILD)
  nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
(from rev 156614, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
  nx/repos/staging-i686/PKGBUILD
  nx/repos/staging-i686/nx-x11.ld.so.conf.d
  nx/repos/staging-x86_64/PKGBUILD
  nx/repos/staging-x86_64/nx-x11.ld.so.conf.d

+
 staging-i686/PKGBUILD  |  208 ++-
 staging-i686/nx-x11.ld.so.conf.d   |2 
 staging-x86_64/PKGBUILD|  208 ++-
 staging-x86_64/nx-x11.ld.so.conf.d |2 
 4 files changed, 218 insertions(+), 202 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2012-04-21 22:49:18 UTC (rev 156614)
+++ staging-i686/PKGBUILD   2012-04-21 22:50:01 UTC (rev 156615)
@@ -1,100 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.12
-pkgrel=0.4
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
-nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
-  cd "${srcdir}/nx-libs_$pkgver"
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx/lib
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  install -dm755 ${pkgdir}/usr/lib/nx
-  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 
${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
-  ln -sv libXcompext.so.3.5.0 libXcompext.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxauth
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" 
"$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
-   
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
-  # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxagent
-}
-
-package_nx-headers() {
-
-  pkgdesc="NX headers"
-  
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  

Copied: nx/repos/staging-i686/PKGBUILD (from rev 156614, nx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-04-21 22:50:01 UTC (rev 156615)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Andreas Radke 
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.

[arch-commits] Commit in nx/repos (8 files)

2012-04-16 Thread andyrtr
Date: Monday, April 16, 2012 @ 14:52:45
  Author: andyrtr
Revision: 156297

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  nx/repos/staging-i686/PKGBUILD
(from rev 156296, nx/trunk/PKGBUILD)
  nx/repos/staging-i686/nx-x11.ld.so.conf.d
(from rev 156296, nx/trunk/nx-x11.ld.so.conf.d)
  nx/repos/staging-x86_64/PKGBUILD
(from rev 156296, nx/trunk/PKGBUILD)
  nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
(from rev 156296, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
  nx/repos/staging-i686/PKGBUILD
  nx/repos/staging-i686/nx-x11.ld.so.conf.d
  nx/repos/staging-x86_64/PKGBUILD
  nx/repos/staging-x86_64/nx-x11.ld.so.conf.d

+
 staging-i686/PKGBUILD  |  191 ++-
 staging-i686/nx-x11.ld.so.conf.d   |2 
 staging-x86_64/PKGBUILD|  191 ++-
 staging-x86_64/nx-x11.ld.so.conf.d |2 
 4 files changed, 202 insertions(+), 184 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2012-04-16 18:52:06 UTC (rev 156296)
+++ staging-i686/PKGBUILD   2012-04-16 18:52:45 UTC (rev 156297)
@@ -1,91 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.12
-pkgrel=0.3
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
-nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
-  cd "${srcdir}/nx-libs_$pkgver"
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
-}
-
-package_nx-x11() {
-  
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/bin
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" 
"$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/bin
-  ln -sv /usr/lib/nx/nxagent .
-}
-
-package_nx-headers() {
-
-  pkgdesc="NX headers"
-  
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  

Copied: nx/repos/staging-i686/PKGBUILD (from rev 156296, nx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-04-16 18:52:45 UTC (rev 156297)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Andreas Radke 
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=0.4
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/";
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016

[arch-commits] Commit in nx/repos (8 files)

2012-04-15 Thread andyrtr
Date: Sunday, April 15, 2012 @ 11:11:02
  Author: andyrtr
Revision: 156194

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  nx/repos/staging-i686/PKGBUILD
(from rev 156193, nx/trunk/PKGBUILD)
  nx/repos/staging-i686/nx-x11.ld.so.conf.d
(from rev 156193, nx/trunk/nx-x11.ld.so.conf.d)
  nx/repos/staging-x86_64/PKGBUILD
(from rev 156193, nx/trunk/PKGBUILD)
  nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
(from rev 156193, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
  nx/repos/staging-i686/PKGBUILD
  nx/repos/staging-i686/nx-x11.ld.so.conf.d
  nx/repos/staging-x86_64/PKGBUILD
  nx/repos/staging-x86_64/nx-x11.ld.so.conf.d

+
 staging-i686/PKGBUILD  |  181 +--
 staging-i686/nx-x11.ld.so.conf.d   |2 
 staging-x86_64/PKGBUILD|  181 +--
 staging-x86_64/nx-x11.ld.so.conf.d |2 
 4 files changed, 184 insertions(+), 182 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2012-04-15 15:10:23 UTC (rev 156193)
+++ staging-i686/PKGBUILD   2012-04-15 15:11:02 UTC (rev 156194)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.12
-pkgrel=0.2
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
-nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
-  cd "${srcdir}/nx-libs_$pkgver"
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
-}
-
-package_nx-x11() {
-  
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" 
"$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/bin
-  ln -sv /usr/lib/nx/nxagent .
-}
-
-package_nx-headers() {
-
-  pkgdesc="NX headers"
-  
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  

Copied: nx/repos/staging-i686/PKGBUILD (from rev 156193, nx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-04-15 15:11:02 UTC (rev 156194)
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: Andreas Radke 
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=0.3
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/";
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
+  cd

[arch-commits] Commit in nx/repos (8 files)

2012-04-15 Thread andyrtr
Date: Sunday, April 15, 2012 @ 09:55:12
  Author: andyrtr
Revision: 156185

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  nx/repos/staging-i686/PKGBUILD
(from rev 156184, nx/trunk/PKGBUILD)
  nx/repos/staging-i686/nx-x11.ld.so.conf.d
(from rev 156184, nx/trunk/nx-x11.ld.so.conf.d)
  nx/repos/staging-x86_64/PKGBUILD
(from rev 156184, nx/trunk/PKGBUILD)
  nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
(from rev 156184, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
  nx/repos/staging-i686/PKGBUILD
  nx/repos/staging-i686/nx-x11.ld.so.conf.d
  nx/repos/staging-x86_64/PKGBUILD
  nx/repos/staging-x86_64/nx-x11.ld.so.conf.d

+
 staging-i686/PKGBUILD  |  171 ++-
 staging-i686/nx-x11.ld.so.conf.d   |2 
 staging-x86_64/PKGBUILD|  171 ++-
 staging-x86_64/nx-x11.ld.so.conf.d |2 
 4 files changed, 182 insertions(+), 164 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2012-04-15 13:54:31 UTC (rev 156184)
+++ staging-i686/PKGBUILD   2012-04-15 13:55:12 UTC (rev 156185)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent')
-pkgver=3.5.0.12
-pkgrel=0.1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/";
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
-nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
-  cd "${srcdir}/nx-libs_$pkgver"
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
-}
-
-package_nx-x11() {
-  
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" 
"$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
-   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/bin
-  ln -sv /usr/lib/nx/nxagent .
-}

Copied: nx/repos/staging-i686/PKGBUILD (from rev 156184, nx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-04-15 13:55:12 UTC (rev 156185)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Andreas Radke 
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=0.2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/";
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
+  cd "${srcdir}/nx-libs_$pkgver"
+  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make DESTDIR="$srcdir/fakeins