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

[Thayer Williams]

    Date: Monday, November 17, 2008 @ 17:12:15
  Author: thayer
Revision: 19225

Merged revisions 356,19224 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/numlockx/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r19224 | thayer | 2008-11-17 14:10:53 -0800 (Mon, 17 Nov 2008) | 2 lines
  
  upgpkg: numlockx 1.1-4
      license correction and pkgbuild cleanup
........

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

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


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-17 22:10:53 UTC (rev 19224)
+++ extra-i686/PKGBUILD	2008-11-17 22:12:15 UTC (rev 19225)
@@ -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=('custom')
+license=('MIT')
 url="http://ktown.kde.org/~seli/numlockx/"
 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
+}