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

[Eric Bélanger]

    Date: Monday, November 17, 2008 @ 22:17:05
  Author: eric
Revision: 19265

fixed svn conflict

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

----------+
 PKGBUILD |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)


Property changes on: numlockx/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /numlockx/trunk:1
   + /numlockx/trunk:1-19264

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-18 03:10:20 UTC (rev 19264)
+++ extra-x86_64/PKGBUILD	2008-11-18 03:17:05 UTC (rev 19265)
@@ -1,29 +1,26 @@
 # $Id$
-# Maintainer: Travis Willard <travisw at wmpub.ca> 
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Travis Willard <travisw at wmpub.ca> 
+# Maintainer: Thayer Williams <thayer at archlinux.org> 
 
 pkgname=numlockx
 pkgver=1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Turns on the numlock key in X11"
 arch=('i686' 'x86_64')
+license=('MIT')
 url="http://ktown.kde.org/~seli/numlockx/"
-license=('custom')
 depends=('libxtst')
 source=(http://ktown.kde.org/~seli/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('127d9dfbbbe6dbec62cc78db340f913c')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
-
-  # Install the custom license.
-  install -D LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
-
-	export CFLAGS="$CFLAGS -I/usr/include/X11"
+	cd $srcdir/$pkgname-$pkgver
 	./configure --prefix=/usr x_includes=/usr/include/X11 \
-		x_libraries=/usr/lib
+		x_libraries=/usr/lib || return 1
 	make || return 1
-	make prefix=$startdir/pkg/usr install
-}
+	make prefix=$pkgdir/usr install || return 1
 
-md5sums=('127d9dfbbbe6dbec62cc78db340f913c')
-sha1sums=('5c48276839ae108e2fa6dc2293ebfd87d83e45fd')
+    # Install the custom MIT license
+    install -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
+}