[pacman-dev] FS7228: Update {PKGBUILD,install}.proto

[Dan McGee]

On 7/6/07, Andrew Fyfe <andrew at neptune-one.net> wrote:
> Dan McGee wrote:
> > On 7/6/07, Andrew Fyfe <andrew at neptune-one.net> wrote:
> >> Andrew Fyfe wrote:
> >>> Attached is a patch to update {PKGBUILD,install}.proto
> >>>     - Add group and options field
> >>>     - Quote $startdir
> >>>     - Add vim modeline
> >>>     - Add check to see if function exists in install.proto
> >>>       before trying to call it, avoids the annoying bash
> >>>       error if the function is missing.
> >>>
> >>> Andrew
> >>>
> >>>
> >>> ------------------------------------------------------------------------
> >>>
> >>> _______________________________________________
> >>> pacman-dev mailing list
> >>> pacman-dev at archlinux.org
> >>> http://archlinux.org/mailman/listinfo/pacman-dev
> >> Bump :)
> >
> > Grrr... I have this done locally. I'll push sometime. Is this everything?
> >
> > -Dan
> >
> > Index: PKGBUILD.proto
> > ===================================================================
> > RCS file: /home/cvs-arch/arch/build/PKGBUILD.proto,v
> > retrieving revision 1.15
> > diff -u -r1.15 PKGBUILD.proto
> > --- PKGBUILD.proto    2 Mar 2007 20:42:07 -0000       1.15
> > +++ PKGBUILD.proto    6 Jul 2007 15:45:32 -0000
> > @@ -11,20 +11,23 @@
> >  arch=()
> >  url=""
> >  license=('GPL')
> > +groups=()
> >  depends=()
> >  makedepends=()
> >  provides=()
> >  conflicts=()
> >  replaces=()
> >  backup=()
> > +options=()
> >  install=
> >  source=($pkgname-$pkgver.tar.gz)
> >  noextract=()
> > -md5sums=(generate with makepkg -g)
> > +md5sums=() #generate with 'makepkg -g'
> >
> >  build() {
> > -  cd $startdir/src/$pkgname-$pkgver
> > +  cd "$startdir/src/$pkgname-$pkgver"
> > +
> >    ./configure --prefix=/usr
> >    make || return 1
> > -  make DESTDIR=$startdir/pkg install
> > +  make DESTDIR="$startdir/pkg" install
> >  }
> > Index: install.proto
> > ===================================================================
> > RCS file: /home/cvs-arch/arch/build/install.proto,v
> > retrieving revision 1.5
> > diff -u -r1.5 install.proto
> > --- install.proto     3 Nov 2004 01:14:37 -0000       1.5
> > +++ install.proto     6 Jul 2007 15:45:32 -0000
> > @@ -35,4 +35,4 @@
> >
> >  op=$1
> >  shift
> > -$op $*
> > +["$(type -t "$op")" = "function" ] && $op "$@"
> >
> > _______________________________________________
> > pacman-dev mailing list
> > pacman-dev at archlinux.org
> > http://archlinux.org/mailman/listinfo/pacman-dev
>
> vim modelines would be nice :)
>
> # vim:set ts=2 sw=2 et:
>
> Andrew

Done.