[arch-commits] Commit in acct/repos (3 files)

[Eric Bélanger]

    Date: Thursday, March 26, 2009 @ 00:39:06
  Author: eric
Revision: 31363

Fixed svn conflict

Added:
  acct/repos/extra-x86_64/acct.install
    (from rev 31362, acct/trunk/acct.install)
Modified:
  acct/repos/extra-x86_64/	(properties)
  acct/repos/extra-x86_64/PKGBUILD

--------------+
 PKGBUILD     |   19 +++++++++++--------
 acct.install |   20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 8 deletions(-)


Property changes on: acct/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /acct/trunk:1
   + /acct/trunk:1-31362

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-26 04:37:13 UTC (rev 31362)
+++ extra-x86_64/PKGBUILD	2009-03-26 04:39:06 UTC (rev 31363)
@@ -4,23 +4,26 @@
 
 pkgname=acct
 pkgver=6.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of utilities which reports and summarizes data about user connect times and process execution statistics"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/acct/"
+license=('GPL')
 depends=('glibc')
+install=acct.install
 source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('da0055b254f7da8b8920db83ef1ebba1')
 
-build()
-{
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man infodir=$pkgdir/usr/share/info install || return 1
+  rm $pkgdir/usr/share/info/dir
+  gzip $pkgdir/usr/share/info/*
 
   # sysvinit already provides "last":
-  rm $startdir/pkg/usr/{bin/last,man/man1/last.1}
+  rm $pkgdir/usr/{bin/last,share/man/man1/last.1}
 }
 
 

Copied: acct/repos/extra-x86_64/acct.install (from rev 31362, acct/trunk/acct.install)
===================================================================
--- extra-x86_64/acct.install	                        (rev 0)
+++ extra-x86_64/acct.install	2009-03-26 04:39:06 UTC (rev 31363)
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(accounting.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}