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

[Eric Belanger]

    Date: Wednesday, May 28, 2008 @ 17:43:41
  Author: eric
Revision: 2183

Merged revisions 2-2182 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/cvs/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2181 | eric | 2008-05-28 17:19:21 -0400 (Wed, 28 May 2008) | 1 line
  
  upgpkg: cvs 1.11.23-1
........

Modified:
  cvs/repos/extra-i686/	(properties)
  cvs/repos/extra-i686/PKGBUILD
Deleted:
  cvs/repos/extra-i686/cvs-1.11.22-free.patch

------------------------+
 PKGBUILD               |   15 ++++++---------
 cvs-1.11.22-free.patch |   11 -----------
 2 files changed, 6 insertions(+), 20 deletions(-)


Property changes on: cvs/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /cvs/trunk:1
   + /cvs/trunk:1-2182

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-28 21:19:33 UTC (rev 2182)
+++ extra-i686/PKGBUILD	2008-05-28 21:43:41 UTC (rev 2183)
@@ -1,23 +1,20 @@
 # $Id$
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=cvs
-pkgver=1.11.22
-pkgrel=6
+pkgver=1.11.23
+pkgrel=1
 pkgdesc="Concurrent Versions System - a source control system"
 arch=(i686 x86_64)
+url="http://ximbiot.com/cvs/wiki/index.php"
 license=('GPL')
 depends=('heimdal>=1.0.1')
-source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/1.11.22/$pkgname-$pkgver.tar.bz2 \
-        cvs-1.11.22-free.patch)
-url="http://ximbiot.com/cvs/wiki/index.php"
-md5sums=('f24043a640509aff1aa28871dd345762'
-         'e1cc96a621de316dd719322c424a8334')
+source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$pkgname-$pkgver.tar.bz2)
+md5sums=('0213ea514e231559d6ff8f80a34117f0')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   unset EDITOR VISUAL
-  patch -p1 -i $startdir/src/cvs-1.11.22-free.patch || return 1
   ./configure --prefix=/usr
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make DESTDIR=$startdir/pkg install
 }

Deleted: extra-i686/cvs-1.11.22-free.patch
===================================================================
--- extra-i686/cvs-1.11.22-free.patch	2008-05-28 21:19:33 UTC (rev 2182)
+++ extra-i686/cvs-1.11.22-free.patch	2008-05-28 21:43:41 UTC (rev 2183)
@@ -1,11 +0,0 @@
---- cvs-1.11.22/src/login.c.old	2006-06-28 13:41:14.000000000 +0200
-+++ cvs-1.11.22/src/login.c	2006-06-28 13:35:40.000000000 +0200
-@@ -600,7 +600,7 @@
-        context, then assume they have supplied the correct, scrambled
-        password. */
-     if (cvs_password)
--	return cvs_password;
-+	return xstrdup(cvs_password);
- 
-     if (getenv ("CVS_PASSWORD") != NULL)
-     {