[arch-commits] Commit in hibernate-script/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Allan McRae]

    Date: Saturday, October 31, 2009 @ 23:28:17
  Author: allan
Revision: 57613

Merged revisions 57611 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/hibernate-script/trunk

........
  r57611 | allan | 2009-11-01 13:25:46 +1000 (Sun, 01 Nov 2009) | 2 lines
  
  upgpkg: hibernate-script 1.99-2
      FHS man pages
........

Modified:
  hibernate-script/repos/extra-x86_64/	(properties)
  hibernate-script/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)


Property changes on: hibernate-script/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /hibernate-script/trunk:1-10562
   + /hibernate-script/trunk:1-57612

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-01 03:26:43 UTC (rev 57612)
+++ extra-x86_64/PKGBUILD	2009-11-01 03:28:17 UTC (rev 57613)
@@ -3,19 +3,19 @@
 
 pkgname=hibernate-script
 pkgver=1.99
-pkgrel=1
+pkgrel=2
 pkgdesc="Set of scripts for managing tux on ice, hibernation and suspend to RAM"
+arch=('i686' 'x86_64')
+url="http://www.tuxonice.net"
+license=('GPL')
 depends=('bash' 'kbd')
-arch=(i686 x86_64)
 options=(!strip)
-license=('GPL')
 backup=('etc/hibernate/hibernate.conf' 'etc/hibernate/suspend2.conf' \
         'etc/hibernate/disk.conf' 'etc/hibernate/ram.conf' \
         'etc/hibernate/common.conf' 'etc/hibernate/blacklisted-modules' \
         'etc/hibernate/ususpend-both.conf' 'etc/hibernate/sysfs-ram.conf' \
         'etc/hibernate/ususpend-ram.conf' 'etc/hibernate/sysfs-disk.conf' \
         'etc/hibernate/ususpend-disk.conf')
-url="http://www.tuxonice.net"
 source=(http://www.tuxonice.net/downloads/all/${pkgname}-${pkgver}.tar.gz
         hibernate-script-${pkgver}-arch.patch
         hibernate.rc
@@ -27,13 +27,14 @@
                   
 
 build() {
-  cd $startdir/src/hibernate-script-$pkgver
+  cd $srcdir/hibernate-script-$pkgver
   # Fix scriptlets to work properly with Archlinux
-  patch -Np1 -i ../hibernate-script-${pkgver}-arch.patch || return 1
-  patch -Np1 -i ../add-freedesktop.org-locking.patch || return 1
-  export BASE_DIR=${startdir}/pkg
+  patch -Np1 -i $srcdir/hibernate-script-${pkgver}-arch.patch || return 1
+  patch -Np1 -i $srcdir/add-freedesktop.org-locking.patch || return 1
+  export BASE_DIR=${pkgdir}
   export PREFIX=/usr
-  mkdir -p $startdir/pkg/etc/{rc,logrotate}.d
+  export MAN_DIR=$BASE_DIR$PREFIX/share/man
+  install -dm755 ${pkgdir}/etc/{rc,logrotate}.d
   ./install.sh || return 1
-  install -m 755 ../hibernate.rc $startdir/pkg/etc/rc.d/hibernate-cleanup
+  install -m 755 $srcdir/hibernate.rc $pkgdir/etc/rc.d/hibernate-cleanup
 }