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

[Eric Bélanger]

    Date: Monday, April 20, 2009 @ 22:04:21
  Author: eric
Revision: 36334

Merged revisions 36333 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/x2x/trunk

........
  r36333 | eric | 2009-04-20 22:04:03 -0400 (Mon, 20 Apr 2009) | 2 lines
  
  upgpkg: x2x 1.27-5
      Added license, Added url, Fixed typo in makedepends, FHS man pages
........

Added:
  x2x/repos/extra-x86_64/LICENSE
    (from rev 36333, x2x/trunk/LICENSE)
Modified:
  x2x/repos/extra-x86_64/	(properties)
  x2x/repos/extra-x86_64/PKGBUILD

----------+
 LICENSE  |   39 +++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   24 +++++++++++++-----------
 2 files changed, 52 insertions(+), 11 deletions(-)


Property changes on: x2x/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /x2x/trunk:1-8805
   + /x2x/trunk:1-36333

Copied: x2x/repos/extra-x86_64/LICENSE (from rev 36333, x2x/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2009-04-21 02:04:21 UTC (rev 36334)
@@ -0,0 +1,39 @@
+/*
+ * x2x: Uses the XTEST extension to forward keystrokes from a window on
+ *      one display to another display.  Useful for desks
+ *      with multiple keyboards.
+ *
+ * Copyright (c) 1997
+ * Digital Equipment Corporation.  All rights reserved.
+ * 
+ * By downloading, installing, using, modifying or distributing this
+ * software, you agree to the following:
+ * 
+ * 1. CONDITIONS. Subject to the following conditions, you may download,
+ * install, use, modify and distribute this software in source and binary
+ * forms:
+ * 
+ * a) Any source code, binary code and associated documentation
+ * (including the online manual) used, modified or distributed must
+ * reproduce and retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ * 
+ * b) No right is granted to use any trade name, trademark or logo of
+ * Digital Equipment Corporation.  Neither the "Digital Equipment
+ * Corporation" name nor any trademark or logo of Digital Equipment
+ * Corporation may be used to endorse or promote products derived from
+ * this software without the prior written permission of Digital
+ * Equipment Corporation.
+ * 
+ * 2.  DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY DIGITAL "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-21 02:04:03 UTC (rev 36333)
+++ extra-x86_64/PKGBUILD	2009-04-21 02:04:21 UTC (rev 36334)
@@ -1,21 +1,23 @@
 # $Id$
 # Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
 pkgname=x2x
 pkgver=1.27
-pkgrel=4
+pkgrel=5
 pkgdesc="Control one X display from another"
 arch=(i686 x86_64)
+url="http://x2x.dottedmag.net/"
+license=('custom')
 depends=('libxtst')
-makedepens=('imake')
-#source=(http://gatekeeper.dec.com/pub/DEC/SRC/x2x/$pkgname-$pkgver.tar.gz)
-source=(http://netsw.org/x11/extensions/x2x/$pkgname-$pkgver.tar.gz)
-md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0')
+makedepends=('imake')
+source=(http://x2x.dottedmag.net/releases/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0' '7ebc35f66a8ded9b8d8d7ca4131c7ae8')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  xmkmf
-  make x2x || return 1
-  install -D -m755 x2x $startdir/pkg/usr/bin/x2x
-  install -D -m644 x2x.1 $startdir/pkg/usr/man/man1/x2x.1
+  cd $srcdir/$pkgname-$pkgver
+  mv x2x.1 x2x.man 
+  xmkmf || return 1
+  make || return 1
+  make DESTDIR=$pkgdir MANPATH=/usr/share/man install install.man || return 1
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }