Merge branch 'master' of github.com:mikestaszel/archplug

core/b43-fwcutter/PKGBUILD

@@ -7,7 +7,7 @@ pkgdesc="firmware extractor for the bcm43xx kernel module"
 url="http://linuxwireless.org/en/users/Drivers/b43"
 depends=('glibc')
 license=('GPL')
-arch=('arm')
+arch=('i686' 'x86_64' 'arm')
 source=(http://bu3sch.de/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('69eadf67b459f313a8d6b37aaabef96c')
 

core/bash/PKGBUILD

@@ -1,54 +1,63 @@
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# ARM Maintainer: Philipp Scholl <pscholl@bawue.de>
+# Maintainer: Mike Staszel <mikestaszel@openpogo.com>
 
 pkgname=bash
-_patchlevel=028
+_patchlevel=033 #prepare for some patches
 pkgver=4.0.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
-arch=('arm')
+arch=(i686 x86_64 arm)
 license=('GPL')
 url="http://www.gnu.org/software/bash/bash.html"
 groups=('base')
 backup=(etc/profile.bash etc/skel/.bashrc etc/skel/.bash_profile)
-depends=('readline>=5.2' 'glibc')
+depends=('readline>=6.0' 'glibc')
 makedepends=(gzip)
 provides=('sh')
+install=bash.install
 source=(http://ftp.gnu.org/gnu/bash/bash-4.0.tar.gz
-        profile.bash bashrc)
-for p in $(seq -w 001 $_patchlevel); do
-    source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-$p)
-done
+        profile.bash
+        bashrc
+        enable-system-config-files.patch
+        system.bashrc)
+if [ $_patchlevel -gt 000 ]; then
+    for p in $(seq -w 001 $_patchlevel); do
+        source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash4$
+    done
+fi
 
-build() {
-  cd ${startdir}/src/${pkgname}-4.0
+build() {                      
+  cd ${srcdir}/${pkgname}-4.0
   for p in ../bash40-*; do
+    [ -e "$p" ] || continue
     msg "applying patch ${p}"
     patch -Np0 -i ${p} || return 1
   done
 
+  patch -Np0 -i ../enable-system-config-files.patch || return 1
+
   ./configure --prefix=/usr --with-curses --enable-readline \
     --without-bash-malloc --with-installed-readline \
     --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 
-  install -D -m644 ${startdir}/src/profile.bash ${startdir}/pkg/etc/profile.bash
+  install -D -m644 ${srcdir}/profile.bash ${pkgdir}/etc/profile.bash || return 1
+  install -D -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc || return 1
 
   # for now, bash is our default /bin/sh
-  cd ${startdir}/pkg/bin
+  cd ${pkgdir}/bin
   ln -s bash sh
 
-  mkdir -p $startdir/pkg/etc/skel/
-  install -D -m644 $startdir/src/bashrc $startdir/pkg/etc/skel/.bashrc
-  echo ". \$HOME/.bashrc" >$startdir/pkg/etc/skel/.bash_profile
-
-  rm -rf ${pkgdir}/usr/share/{info,man}
+  mkdir -p ${pkgdir}/etc/skel/
+  install -D -m644 ${srcdir}/bashrc ${pkgdir}/etc/skel/.bashrc
+  echo ". \$HOME/.bashrc" >${pkgdir}/etc/skel/.bash_profile
 }
 
 md5sums=('a90a1b5a6db4838483f05438e05e8eb9'
          'c2fae355facefcac8a732cce877da194'
          '3d2837e84645eac9bde399b58014bafa'
+         '51725defa4c2dec49c1bc15883e0bee2'
+         '196697769f1667a8a1aed608811129c6'
          'bc7f4762443939bd7dccb42370f0d932'
          'c2a4a4786a83ed4ec366c6a8924369a2'
          '22e8a824eddba21a8fce10d7984c2aba'
@@ -76,4 +85,9 @@ md5sums=('a90a1b5a6db4838483f05438e05e8eb9'
          'b26f9007ac4eef5c378f1abcb8959025'
          '83bc844c82d0a30740e8d91a8238bfa9'
          'a41c187f05ecab07389c18acc91214c6'
-         'fcc367e6471267d2e397257e703b817d')
+         'fcc367e6471267d2e397257e703b817d'
+         '4d4da1c0be8dfee8e2a6a7703901130f'
+         '55cbdc8e5173d7d59bf1113c3ff590dc'
+         '389635281133416de9d13295251cabc7'
+         'd646cb4aed8e0f0d1d47eea2ed5f3690'
+         'd3e77d2a0a051478aca8c30d13ded834')

core/bash/bash.install

@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(bash.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}

core/bc/PKGBUILD

@@ -1,17 +1,18 @@
-# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
+# Maintainer: Mike Staszel <mikestaszel@openpogo.com>
 
 pkgname=bc
 pkgver=1.06
 pkgrel=1
 pkgdesc="An arbitrary precision calculator language"
-arch=('arm')
+arch=(i686 x86_64 arm)
 license=('GPL')
 depends=('readline')
 replaces=(bc-readline)
 conflicts=(bc-readline)
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	build-fix.patch)
-md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116')
+		build-fix.patch)
+md5sums=('d44b5dddebd8a7a7309aea6c36fda117'
+		 'fc7ecbd9e55ef04c6d3a495692626116')
 
 build() {
   CFLAGS="$CFLAGS -O3"

core/bison/PKGBUILD

@@ -4,7 +4,7 @@ pkgname=bison
 pkgver=2.4.1
 pkgrel=1
 pkgdesc="The GNU general-purpose parser generator"
-arch=('arm')
+arch=('i686' 'x86_64' 'arm')
 license=('GPL')
 url="http://www.gnu.org/software/bison/bison.html"
 depends=('glibc' 'm4' 'texinfo')
@@ -17,4 +17,7 @@ build() {
   ./configure --prefix=/usr --datadir=/usr/share || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
+  rm ${pkgdir}/usr/share/info/dir || return 1
+  gzip ${pkgdir}/usr/share/info/* || return 1
+
 }

core/nano/PKGBUILD

@@ -1,13 +1,11 @@
-# $Id: PKGBUILD 31750 2009-03-28 08:53:41Z andyrtr $
-# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
-# Archlinux's Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: Mike Staszel <mikestaszel@openpogo.com>
 # Contributor: Judd <judd@archlinux.org>
 
 pkgname=nano
 pkgver=2.0.9
 pkgrel=2
 pkgdesc="Pico editor clone with enhancements"
-arch=('arm')
+arch=(i686 x86_64 arm)
 license=('GPL')
 url="http://www.nano-editor.org"
 groups=('base')