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

[Giovanni Scafora]

    Date: Thursday, April 2, 2009 @ 12:16:11
  Author: giovanni
Revision: 32911

Merged revisions 356,13856,32899 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mcrypt/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (ven, 18 apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r13856 | allan | 2008-09-28 20:24:18 -0700 (dom, 28 set 2008) | 1 line
  
  correct sourceforge url
........
  r32899 | andrea | 2009-04-02 08:08:34 -0700 (gio, 02 apr 2009) | 1 line
  
  upgpkg: mcrypt 2.6.8-1
........

Modified:
  mcrypt/repos/extra-x86_64/	(properties)
  mcrypt/repos/extra-x86_64/PKGBUILD
Deleted:
  mcrypt/repos/extra-x86_64/mcrypt-2.6.4-destdirfix.patch

-------------------------------+
 PKGBUILD                      |   17 ++++++++---------
 mcrypt-2.6.4-destdirfix.patch |   11 -----------
 2 files changed, 8 insertions(+), 20 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-02 16:09:55 UTC (rev 32910)
+++ extra-x86_64/PKGBUILD	2009-04-02 16:16:11 UTC (rev 32911)
@@ -1,26 +1,25 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=mcrypt
-pkgver=2.6.5
+pkgver=2.6.8
 pkgrel=1
-pkgdesc="mcrypt is a program for encrypting files or streams"
+pkgdesc="A program for encrypting files or streams"
 url="http://mcrypt.sourceforge.net/"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('mhash' 'libmcrypt>=2.5.8' 'zlib')
-source=(http://heanet.dl.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2
-	mcrypt-2.6.4-destdirfix.patch)
-md5sums=('19d9f0b15fe68a7cae7e9faa02859c89' '36f2a201cc6ada4280c82f458b0cbe05')
+source=(http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz)
+md5sums=('97639f8821b10f80943fa17da302607e')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   aclocal -I ./m4 || return 1
   autoconf || return 1
   automake --force --copy || return 1
-  patch -Np1 -i ${startdir}/src/mcrypt-2.6.4-destdirfix.patch || return 1
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 }

Deleted: extra-x86_64/mcrypt-2.6.4-destdirfix.patch
===================================================================
--- extra-x86_64/mcrypt-2.6.4-destdirfix.patch	2009-04-02 16:09:55 UTC (rev 32910)
+++ extra-x86_64/mcrypt-2.6.4-destdirfix.patch	2009-04-02 16:16:11 UTC (rev 32911)
@@ -1,11 +0,0 @@
---- mcrypt-2.6.4/Makefile.in.BAD	2005-09-22 17:58:15.000000000 -0500
-+++ mcrypt-2.6.4/Makefile.in	2005-09-22 17:58:25.000000000 -0500
-@@ -552,7 +552,7 @@
- 
- install-exec-hook:
- 	-$(RM) -f $(bindir)/mdecrypt
--	$(LN_S) mcrypt $(bindir)/mdecrypt
-+	$(LN_S) mcrypt $(DESTDIR)$(bindir)/mdecrypt
- uninstall-local:
- 	-$(RM) -f $(bindir)/mdecrypt
-