Use package() function in prototypes

Signed-off-by: PyroPeter <abi1789@googlemail.com>
[Allan: Add "cd" in package()]
Signed-off-by: Allan McRae <allan@archlinux.org>

prototypes/PKGBUILD-bzr.proto

@@ -55,5 +55,9 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$_bzrmod-build"
   make DESTDIR="$pkgdir/" install
 } 

prototypes/PKGBUILD-cvs.proto

@@ -56,5 +56,9 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$_cvsmod-build"
   make DESTDIR="$pkgdir/" install
 }

prototypes/PKGBUILD-darcs.proto

@@ -59,5 +59,9 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$_darcsmod-build"
   make DESTDIR="$pkgdir/" install
 }

prototypes/PKGBUILD-git.proto

@@ -55,5 +55,9 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$_gitname-build"
   make DESTDIR="$pkgdir/" install
 } 

prototypes/PKGBUILD-gnome.proto

@@ -32,6 +32,10 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-scrollkeeper
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install
 
   install -m755 -d "$pkgdir"/usr/share/gconf/schemas

prototypes/PKGBUILD-haskell.proto

@@ -30,7 +30,6 @@ build() {
 
   runhaskell Setup configure --prefix=/usr --enable-executable-stripping
   runhaskell Setup build
-  runhaskell Setup copy --destdir="$pkgdir/"
 
   #
   # Setup registration phase for library packages
@@ -38,6 +37,12 @@ build() {
   #
   runhaskell Setup register --gen-script
   runhaskell Setup unregister --gen-script
+}
+
+package() {
+  cd "$srcdir/***-$pkgver"
+  runhaskell Setup copy --destdir="$pkgdir/"
+
   install -Dm744 register.sh "$pkgdir"/usr/share/haskell/$pkgname/register.sh
   install -m744 unregister.sh "$pkgdir"/usr/share/haskell/$pkgname/unregister.sh
 }

prototypes/PKGBUILD-hg.proto

@@ -56,5 +56,9 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$_hgrepo-build"
   make DESTDIR="$pkgdir/" install
 } 

prototypes/PKGBUILD-perl.proto

@@ -31,11 +31,17 @@ build() {
   # install module in vendor directories.
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
-  make install DESTDIR="$pkgdir/"
-
+  
   ## for packages with Build.PL, do this instead:
   # perl Build.PL installdirs=vendor destdir="$pkgdir/"
   # perl Build
+}
+
+package() {
+  cd "$srcdir/***-$pkgver"
+  make install DESTDIR="$pkgdir/"
+
+  ## for packages with Build.PL, do this instead:
   # perl Build install
 }
 

prototypes/PKGBUILD-rubygem.proto

@@ -6,7 +6,7 @@
 # See http://wiki.archlinux.org/index.php/Ruby_Gem_Package_Guidelines for more
 # information on Ruby Gem packaging.
 
-# Maintainer: YourName <YourEmail AT example DOT com>
+# Maintainer: Your Name <youremail@domain.com>
 pkgname=ruby-GEMNAME
 pkgver=VERSION
 pkgrel=1
@@ -20,9 +20,9 @@ source=(http://gems.rubyforge.org/gems/GEMNAME-$pkgver.gem)
 noextract=(GEMNAME-$pkgver.gem)
 md5sums=()
 
-build() {
+package() {
   cd $srcdir
-  # _gemdir is defined inside build() because if ruby[gems] is not installed on the system
+  # _gemdir is defined inside package() because if ruby[gems] is not installed on the system
   # makepkg will exit with an error when sourcing the PKGBUILD
   local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
 

prototypes/PKGBUILD-svn.proto

@@ -52,5 +52,9 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$_svnmod-build"
   make DESTDIR="$pkgdir/" install
 }