From 88af45f5124b4cdb66504288030e33bcb9a8d7ca Mon Sep 17 00:00:00 2001 From: PyroPeter Date: Sat, 18 Sep 2010 18:26:32 +0200 Subject: [PATCH] Bug #20350: Update prototypes (package(), s/Contributor/Maintainer/) Signed-off-by: PyroPeter --- prototypes/PKGBUILD-bzr.proto | 5 ++++- prototypes/PKGBUILD-cvs.proto | 5 ++++- prototypes/PKGBUILD-darcs.proto | 5 ++++- prototypes/PKGBUILD-git.proto | 5 ++++- prototypes/PKGBUILD-gnome.proto | 5 ++++- prototypes/PKGBUILD-haskell.proto | 7 +++++-- prototypes/PKGBUILD-hg.proto | 5 ++++- prototypes/PKGBUILD-perl.proto | 11 ++++++++--- prototypes/PKGBUILD-rubygem.proto | 6 +++--- prototypes/PKGBUILD-svn.proto | 5 ++++- 10 files changed, 44 insertions(+), 15 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index d3e41fe..75dbec8 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines # for more information on packaging from Bazaar sources. -# Contributor: Your Name +# Maintainer: Your Name pkgname=NAME-bzr pkgver=VERSION pkgrel=1 @@ -55,5 +55,8 @@ build() { ./autogen.sh ./configure --prefix=/usr make +} + +package() { make DESTDIR="$pkgdir/" install } diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index 520087d..822545a 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines # for more information on packaging from CVS sources. -# Contributor: Your Name +# Maintainer: Your Name pkgname=NAME-cvs pkgver=VERSION pkgrel=1 @@ -56,5 +56,8 @@ build() { ./autogen.sh ./configure --prefix=/usr make +} + +package() { make DESTDIR="$pkgdir/" install } diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 0c3377c..1260e4e 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines # for more information on packaging from darcs sources. -# Contributor: Your Name +# Maintainer: Your Name pkgname=NAME-darcs pkgver=VERSION pkgrel=1 @@ -59,5 +59,8 @@ build() { ./autogen.sh ./configure --prefix=/usr make +} + +package() { make DESTDIR="$pkgdir/" install } diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 3bbfddb..592687a 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines # for more information on packaging from GIT sources. -# Contributor: Your Name +# Maintainer: Your Name pkgname=NAME-git pkgver=VERSION pkgrel=1 @@ -55,5 +55,8 @@ build() { ./autogen.sh ./configure --prefix=/usr make +} + +package() { make DESTDIR="$pkgdir/" install } diff --git a/prototypes/PKGBUILD-gnome.proto b/prototypes/PKGBUILD-gnome.proto index 8c7b695..208e4c5 100644 --- a/prototypes/PKGBUILD-gnome.proto +++ b/prototypes/PKGBUILD-gnome.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/Gnome_package_guidelines for more # information on Gnome packaging. -# Contributor: Your Name +# Maintainer: Your Name pkgname=NAME pkgver=VERSION pkgrel=1 @@ -32,6 +32,9 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make +} + +package() { make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install install -m755 -d "$pkgdir"/usr/share/gconf/schemas diff --git a/prototypes/PKGBUILD-haskell.proto b/prototypes/PKGBUILD-haskell.proto index 6d7322f..e22a2f1 100644 --- a/prototypes/PKGBUILD-haskell.proto +++ b/prototypes/PKGBUILD-haskell.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/Haskell_package_guidelines for more # information on Haskell packaging. -# Contributor: Your Name +# Maintainer: Your Name pkgname=NAME pkgver=VERSION pkgrel=1 @@ -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,10 @@ build() { # runhaskell Setup register --gen-script runhaskell Setup unregister --gen-script +} + +package() { + 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 } diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index c589991..bc1ca3d 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines # for more information on packaging from Mercurial(hg) sources. -# Contributor: Your Name +# Maintainer: Your Name pkgname=NAME-hg pkgver=VERSION pkgrel=1 @@ -56,5 +56,8 @@ build() { ./autogen.sh ./configure --prefix=/usr make +} + +package() { make DESTDIR="$pkgdir/" install } diff --git a/prototypes/PKGBUILD-perl.proto b/prototypes/PKGBUILD-perl.proto index 2f8759a..f7f8fd4 100644 --- a/prototypes/PKGBUILD-perl.proto +++ b/prototypes/PKGBUILD-perl.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/Perl_Package_Guidelines for more # information on Perl packaging. -# Contributor: Your Name +# Maintainer: Your Name pkgname=perl-foo-bar pkgver=VERSION pkgrel=1 @@ -31,11 +31,16 @@ 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() { + make install DESTDIR="$pkgdir/" + + ## for packages with Build.PL, do this instead: # perl Build install } diff --git a/prototypes/PKGBUILD-rubygem.proto b/prototypes/PKGBUILD-rubygem.proto index c3b5533..92fbc06 100644 --- a/prototypes/PKGBUILD-rubygem.proto +++ b/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. -# Contributor: YourName +# Maintainer: Your Name 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')" diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index 588423b..020763d 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -6,7 +6,7 @@ # See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines # for more information on packaging from SVN sources. -# Contributor: Your Name +# Maintainer: Your Name pkgname=NAME-svn pkgver=VERSION pkgrel=1 @@ -52,5 +52,8 @@ build() { ./autogen.sh ./configure --prefix=/usr make +} + +package() { make DESTDIR="$pkgdir/" install } -- 1.7.2.3