X-Git-Url: http://gitweb/?a=blobdiff_plain;f=kbd%2FPkgfile;h=31712a5d5b7f5241bb6dc67cbc1cc3603de3151c;hb=69672c0bd989d63e66db613717d0061471e77857;hp=80f1a74180b54569c361e074d70548bd59c2b8ca;hpb=6dca1d213a39ee6af51632926e8b7c8914215cd9;p=crossrootfs.git

diff --git a/kbd/Pkgfile b/kbd/Pkgfile
index 80f1a74..31712a5 100644
--- a/kbd/Pkgfile
+++ b/kbd/Pkgfile
@@ -1,18 +1,18 @@
 # Description: Keytable files and keyboard utilities
 # URL: ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX ARM System Team
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on:
 
 name=kbd
-version=1.15
-release=2
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/$name-$version.tar.gz)
+version=2.0.4
+release=1
+source=(http://ftp.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz)
 
 build() {
   cd $name-$version
 
-  export CC=$CC RANLIB=$RANLIB
+  export CC="$CC" RANLIB="$RANLIB"
 
   cat > config.cache <<EOF
 ac_cv_func_setpgrp_void=yes
@@ -23,22 +23,18 @@ EOF
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
-              --mandir=/usr/man \
               --datadir=/usr/share/kbd \
+              --disable-vlock \
               --disable-nls \
               --cache-file=config.cache
-  make
+  make -j1
   make DESTDIR=$PKG install
 
-  install -d $PKG/bin
-  mv $PKG/usr/bin/loadkeys $PKG/bin
-
-  ln -sf default8x9.psfu.gz $PKG/usr/share/kbd/consolefonts/default.gz
+  ln -sf default8x16.psfu.gz $PKG/usr/share/kbd/consolefonts/default.gz
 
   rm -r $PKG/usr/share/kbd/keymaps/{ppc,mac,atari,amiga,sun}
-  rm $PKG/usr/bin/{psfxtable,mapscrn,loadunimap} \
-     $PKG/usr/bin/{psfaddtable,psfgettable,psfstriptable} \
-     $PKG/usr/man/man1/{psfaddtable.1,psfgettable.1,psfstriptable.1,psfxtable.1} \
-     $PKG/usr/man/man8/{loadunimap.8,resizecons.8,mapscrn.8}
-  find $PKG/usr/share/kbd/ -name "README*" -exec rm {} \;
+  rm $PKG/usr/bin/{loadunimap,mapscrn,psf*table}
+  rm $PKG/usr/share/man/man8/{loadunimap,mapscrn}.8
+  rm $PKG/usr/share/man/man1/psf*table.1
+  find $PKG/usr/share/kbd/ -type f -name "README*" -delete
 }