Merge branch 'testing' of ssh://linhes.org/mount/repository/linhes_pkgbuild into testing

5 files changed, 85 insertions, 23 deletions

diff --git a/abs/core/evieext/PKGBUILD b/abs/core/evieext/PKGBUILD
index 0f7161a..29754f2 100644
--- a/abs/core/evieext/PKGBUILD
+++ b/abs/core/evieext/PKGBUILD
@@ -1,19 +1,25 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 51098 2009-09-04 21:12:24Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evieext
-pkgver=1.0.2
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="X11 Event Interception extension wire protocol"
-arch=(i686 x86_64)
+arch=(any)
 url="http://xorg.freedesktop.org/"
+license=('MIT')
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2507b5d0f4b2848147fbddd155aa6cfe')
-sha1sums=('1ab4048ffbfb6b69e88d2f0f2cab7ca60e50cc99')
+sha1sums=('d0b57a8fbbf0845588a690542a6c29d351c2b4e5')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
 }
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+}
+
diff --git a/abs/core/libxtrap/PKGBUILD b/abs/core/libxtrap/PKGBUILD
index 27d84ee..37427a3 100644
--- a/abs/core/libxtrap/PKGBUILD
+++ b/abs/core/libxtrap/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libxtrap
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X11 event trapping extension library"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -18,6 +18,9 @@ build() {
   cd ${srcdir}/libXTrap-${pkgver}
   ./configure --prefix=/usr || return 1
   make || return 1
+}
+package() {
+  cd ${srcdir}/libXTrap-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
diff --git a/abs/core/trapproto/PKGBUILD b/abs/core/trapproto/PKGBUILD
index 0744d52..9f6830c 100644
--- a/abs/core/trapproto/PKGBUILD
+++ b/abs/core/trapproto/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trapproto
 pkgver=3.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Trap extension wire protocol"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,8 +12,11 @@ md5sums=('3b713239e5e6b269b31cb665563358df')
 sha1sums=('b108aa39a7bfde530d5cd347fda7c58770d5b8da')
 
 build() {
-  cd $startdir/src/${pkgname}-$pkgver
+  cd ${srcdir}/${pkgname}-$pkgver
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+}
+package() {
+  cd ${srcdir}/${pkgname}-$pkgver
+  make DESTDIR=${pkgdir} install || return 1
 }
diff --git a/abs/core/xbitmaps/LICENSE b/abs/core/xbitmaps/LICENSE
new file mode 100644
index 0000000..c5fe9b0
--- /dev/null
+++ b/abs/core/xbitmaps/LICENSE
@@ -0,0 +1,50 @@
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+
+/*****************************************************************************/
+/**       Copyright 1988 by Evans & Sutherland Computer Corporation,        **/
+/**                          Salt Lake City, Utah                           **/
+/**                                                                         **/
+/**                           All Rights Reserved                           **/
+/**                                                                         **/
+/**    Permission to use, copy, modify, and distribute this software and    **/
+/**    its documentation  for  any  purpose  and  without  fee is hereby    **/
+/**    granted, provided that the above copyright notice appear  in  all    **/
+/**    copies and that both  that  copyright  notice  and  this  permis-    **/
+/**    sion  notice appear in supporting  documentation,  and  that  the    **/
+/**    name  of Evans & Sutherland  not be used in advertising or publi-    **/
+/**    city pertaining to distribution  of the software without  specif-    **/
+/**    ic, written prior permission.                                        **/
+/**                                                                         **/
+/**    EVANS  & SUTHERLAND  DISCLAIMS  ALL  WARRANTIES  WITH  REGARD  TO    **/
+/**    THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILI-    **/
+/**    TY AND FITNESS, IN NO EVENT SHALL EVANS &  SUTHERLAND  BE  LIABLE    **/
+/**    FOR  ANY  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY  DAM-    **/
+/**    AGES  WHATSOEVER RESULTING FROM  LOSS OF USE,  DATA  OR  PROFITS,    **/
+/**    WHETHER   IN  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS    **/
+/**    ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE  OR PER-    **/
+/**    FORMANCE OF THIS SOFTWARE.                                           **/
+/*****************************************************************************/
+
diff --git a/abs/core/xbitmaps/PKGBUILD b/abs/core/xbitmaps/PKGBUILD
index dbf65d3..ba46954 100644
--- a/abs/core/xbitmaps/PKGBUILD
+++ b/abs/core/xbitmaps/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 56379 2009-10-21 19:00:03Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xbitmaps
-pkgver=1.0.1
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="X.org Bitmap files"
+arch=('any')
 url="http://xorg.freedesktop.org/"
+license=('custom')
 makedepends=('pkgconfig')
-_xorg=X11R7.0
-_relname=xbitmaps
-arch=('i686' 'x86_64')
-source=(${url}/releases/${_xorg}/src/everything/${_relname}-${_xorg}-${pkgver}.tar.bz2)
-md5sums=('22c6f4a17220cd6b41d9799905f8e357')
+source=(${url}/releases/individual/data/${pkgname}-${pkgver}.tar.bz2 LICENSE)
 
 build() {
-  cd ${startdir}/src/${_relname}-${_xorg}-${pkgver}
-  ./configure --prefix=/usr
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
-
+md5sums=('7444bbbd999b53bec6a60608a5301f4c'
+         '8d6c2d0109ea72abdcbf6846a908f399')