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

[Eric Bélanger]

    Date: Sunday, February 8, 2009 @ 01:48:30
  Author: eric
Revision: 26497

fixed svn conflict

Added:
  di/repos/extra-i686/ChangeLog
    (from rev 26496, di/trunk/ChangeLog)
Modified:
  di/repos/extra-i686/	(properties)
  di/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    9 +++++++++
 PKGBUILD  |   27 ++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)


Property changes on: di/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /di/trunk:1
   + /di/trunk:1-26496

Copied: di/repos/extra-i686/ChangeLog (from rev 26496, di/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-02-08 06:48:30 UTC (rev 26497)
@@ -0,0 +1,9 @@
+2009-02-08  Eric Belanger  <eric at archlinux.org>
+
+	* di 4.13-1
+	* Upstream update
+	* Corrected license
+	* FHS man pages
+	* Added locales
+	* Disabled SMP build
+	* Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-08 06:47:19 UTC (rev 26496)
+++ extra-i686/PKGBUILD	2009-02-08 06:48:30 UTC (rev 26497)
@@ -1,27 +1,24 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=di
-pkgver=4.11
+pkgver=4.13
 pkgrel=1
 pkgdesc="di is a disk information utility, displaying everything (and more) that your df command does"
 arch=('i686' 'x86_64')
 url="http://www.gentoo.com/di/"
-license=('custom')
+license=('ZLIB')
 depends=('glibc')
-source=(http://www.gentoo.com/di/$pkgname-$pkgver.tar.gz)
-md5sums=('d41461eb23dbe2adab9d074478240b7e')
+options=('!makeflags')
+source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
+md5sums=('7f774bf1d044c28136373fdd06489cb1')
+sha1sums=('6cd254482f6075b83191e58b327516e6701840fb')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
-	# ./configure --prefix=/usr
-	make || return 1
-
-	mkdir -p $startdir/pkg/usr/{bin,man/man1}
-	install -m 755 di $startdir/pkg/usr/bin/di
-	ln -s /usr/bin/di $startdir/pkg/usr/bin/mi
-	install -m 644 di.1 $startdir/pkg/usr/man/man1/di.1
-	install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
-	install -D -m644 LICENSE.iffe $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.iffe
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make || return 1
+  make prefix=${pkgdir}/usr install || return 1
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE.iffe ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.iffe
 }