[arch-commits] Commit in tightvnc/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Allan McRae]

    Date: Saturday, October 31, 2009 @ 10:20:41
  Author: allan
Revision: 57414

Merged revisions 57412 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/tightvnc/trunk

........
  r57412 | allan | 2009-11-01 00:17:42 +1000 (Sun, 01 Nov 2009) | 2 lines
  
  upgpkg: tightvnc 1.3.10-3
      FHS man packages
........

Modified:
  tightvnc/repos/extra-x86_64/	(properties)
  tightvnc/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)


Property changes on: tightvnc/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /tightvnc/trunk:1-43917
   + /tightvnc/trunk:1-57413

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-31 14:18:35 UTC (rev 57413)
+++ extra-x86_64/PKGBUILD	2009-10-31 14:20:41 UTC (rev 57414)
@@ -2,20 +2,22 @@
 # Maintainer: Paul Mattal <paul at archlinux.org>
 pkgname=tightvnc
 pkgver=1.3.10
-pkgrel=2
+pkgrel=3
 pkgdesc="VNC Unix server && viewer"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.tightvnc.com"
 depends=('libjpeg>=7' 'zlib' 'libxaw' 'libxp')
 makedepends=('imake')
 conflicts=('vnc')
 options=(!makeflags)
-source=(http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2 tightvnc-fontpath-xcolors.patch)
-md5sums=('397b35faad32d5246b6d44b142f8304f' '21aa7f3376ec3c608ff22d199a19c601')
+source=(http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2 
+        tightvnc-fontpath-xcolors.patch)
+md5sums=('397b35faad32d5246b6d44b142f8304f'
+         '21aa7f3376ec3c608ff22d199a19c601')
 
 build() {
-  cd $startdir/src/vnc_unixsrc || return 1
+  cd $srcdir/vnc_unixsrc || return 1
   patch -Np1 -i ../tightvnc-fontpath-xcolors.patch || return 1
   sed -i 's|/usr/local/|/usr/share/|' vncserver || return 1
 
@@ -27,11 +29,11 @@
   	-i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1
   make || return 1
   cd .. || return 1
-  mkdir -p $startdir/pkg/usr/bin $startdir/pkg/usr/man/man1 || return 1
-  ./vncinstall $startdir/pkg/usr/bin $startdir/pkg/usr/man || return 1
+  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 || return 1
+  ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man || return 1
   
   # install java classes
-  mkdir -p $startdir/pkg/usr/share/vnc/classes || return 1
-  install -D -m644 $startdir/src/vnc_unixsrc/classes/* \
-  	$startdir/pkg/usr/share/vnc/classes || return 1
+  mkdir -p $pkgdir/usr/share/vnc/classes || return 1
+  install -Dm644 $srcdir/vnc_unixsrc/classes/* \
+  	$pkgdir/usr/share/vnc/classes || return 1
 }