[arch-commits] CVS update of core/base/kbd (PKGBUILD)

[Roman Kyrylych]

    Date: Saturday, March 15, 2008 @ 16:25:38
  Author: roman
    Path: /home/cvs-core/core/base/kbd

Modified: PKGBUILD (1.23 -> 1.24)

upgpkg: kbd 1.14.1.20080309-1


----------+
 PKGBUILD |   52 ++++++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 28 deletions(-)


Index: core/base/kbd/PKGBUILD
diff -u core/base/kbd/PKGBUILD:1.23 core/base/kbd/PKGBUILD:1.24
--- core/base/kbd/PKGBUILD:1.23	Thu Nov 15 18:53:17 2007
+++ core/base/kbd/PKGBUILD	Sat Mar 15 16:25:38 2008
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD,v 1.23 2007/11/15 23:53:17 daniel Exp $
-# Maintainer: judd <jvinet at zeroflux.org>
+# $Id: PKGBUILD,v 1.24 2008/03/15 20:25:38 roman Exp $
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
 pkgname=kbd
-pkgver=1.12.20070827
-pkgrel=2
+pkgver=1.14.1.20080309
+pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
-arch=(i686 x86_64)
-url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/"
+arch=('i686' 'x86_64')
+url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
 license=('GPL')
 groups=('base')
 depends=('glibc')
-source=(http://www.archlinux.org/~tpowa/$pkgname/$pkgname-$pkgver.tar.gz
-	#ftp://ftp.win.tue.nl/pub/linux-local/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz \
-	keymap_install keymap_hook)
-md5sums=('622cf0018005365f258e0905e4d916f0'
-         '9ad7e26873d769d327c69f8c1bff3dc8'
-         'bbced7e4f4ac0abdc24d6f2db7e7a207')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz
+        #ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+        rename-duplicates.patch)
+md5sums=('76e817f11c6ec80d9fc9f3f7ace79b4a'
+         'bd2d9f88141a8e78baaa4982f1d1f6c5')
 
 build() {
-  cd ${startdir}/src/${pkgname}-1.13
-  ./configure
+  cd ${startdir}/src
+  #cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ../rename-duplicates.patch
+
+  autoconf
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make || return 1
   make DESTDIR=${startdir}/pkg install
-  install -D -m755 src/loadkeys ${startdir}/pkg/bin/loadkeys
-  make clean
-  sed -i -e 's/CC	= gcc/CC	= gcc -static/g' src/Makefile
-  # build static binaries for mkinitcpio
-  cd src/ 
-  make dumpkeys kbd_mode loadkeys setfont
-  install -D -m755  loadkeys ${startdir}/pkg/bin/loadkeys.static
-  install -D -m755  dumpkeys ${startdir}/pkg/usr/bin/dumpkeys.static
-  install -D -m755  kbd_mode ${startdir}/pkg/usr/bin/kbd_mode.static
-  install -D -m755  setfont ${startdir}/pkg/usr/bin/setfont.static
-  # install hook
-  install -D -m644 ${startdir}/src/keymap_hook ${startdir}/pkg/lib/initcpio/hooks/keymap
-  install -D -m644 ${startdir}/src/keymap_install ${startdir}/pkg/lib/initcpio/install/keymap
-}
 
+  # this is needed because initscripts call /bin/loadkeys
+  # remove this when next versions of kbd
+  # and initscripts with /usr/bin/loadkeys usage will be released
+  mkdir ${startdir}/pkg/bin
+  ln -s /usr/bin/loadkeys ${startdir}/pkg/bin/loadkeys
+}