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

[Eric Bélanger]

    Date: Saturday, October 31, 2009 @ 05:29:11
  Author: eric
Revision: 57018

Merged revisions 57016 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cscope/trunk

........
  r57016 | eric | 2009-10-31 05:25:35 -0400 (Sat, 31 Oct 2009) | 2 lines
  
  upgpkg: cscope 15.7a-1
      Upstream update, Fixed license, Fixed path in ocs script, PKGBUILD clean up
........

Modified:
  cscope/repos/extra-i686/	(properties)
  cscope/repos/extra-i686/PKGBUILD
Deleted:
  cscope/repos/extra-i686/cscope.patch

--------------+
 PKGBUILD     |   33 ++++++++++++++--------------
 cscope.patch |   65 ---------------------------------------------------------
 2 files changed, 16 insertions(+), 82 deletions(-)


Property changes on: cscope/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /cscope/trunk:1-9121
   + /cscope/trunk:1-57017

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-31 09:25:51 UTC (rev 57017)
+++ extra-i686/PKGBUILD	2009-10-31 09:29:11 UTC (rev 57018)
@@ -3,24 +3,23 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=cscope
-pkgver=15.6
-pkgrel=2
-pkgdesc="Cscope is a developers tool for browsing program code"
-arch=(i686 x86_64)
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('beb6032a301bb11524aec74bfb5e4840')
+pkgver=15.7a
+pkgrel=1
+pkgdesc="A developers tool for browsing program code"
+arch=('i686' 'x86_64')
 url="http://cscope.sourceforge.net/index.html"
-license=('custom')
-depends=(ncurses)
+license=('BSD')
+depends=('ncurses' 'sh')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('da43987622ace8c36bbf14c15a350ec1')
+sha1sums=('f6348694e5443769add851f97fd39365e93dc474')
 
 build() {
-cd $startdir/src/$pkgname-$pkgver
-#patch -Np1 -i ../../cscope.patch
-./configure --prefix=/usr
-make || return 1
-make prefix=$startdir/pkg/usr install
-install -dm755 ${pkgdir}/usr/share/man
-mv ${pkgdir}/usr/man ${pkgdir}/usr/share
-install -Dm644 COPYING ${pkgdir}/usr/share/licenses/cscope/LICENSE
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/usr/local/lib/cs|/usr/lib/cs|' contrib/ocs || return 1
+  ./configure --prefix=/usr || return 1
+  make || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  install -d "${pkgdir}/usr/lib/cs"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/cscope/LICENSE"
 }
-md5sums=('db87833f90d8267b1fc0c419cfc4d219')

Deleted: extra-i686/cscope.patch
===================================================================
--- extra-i686/cscope.patch	2009-10-31 09:25:51 UTC (rev 57017)
+++ extra-i686/cscope.patch	2009-10-31 09:29:11 UTC (rev 57018)
@@ -1,65 +0,0 @@
---- cscope-15.4/src/egrep.y.orig	2002-11-30 08:11:02.000000000 +0100
-+++ cscope-15.4/src/egrep.y	2002-11-30 08:22:13.000000000 +0100
-@@ -113,45 +113,45 @@
- 
- %%
- s:	t
--		={ unary(FINAL, $1);
-+		{ unary(FINAL, $1);
- 		  line--;
- 		}
- 	;
- t:	b r
--		={ $$ = node(CAT, $1, $2); }
-+		{ $$ = node(CAT, $1, $2); }
- 	| OR b r OR
--		={ $$ = node(CAT, $2, $3); }
-+		{ $$ = node(CAT, $2, $3); }
- 	| OR b r
--		={ $$ = node(CAT, $2, $3); }
-+		{ $$ = node(CAT, $2, $3); }
- 	| b r OR
--		={ $$ = node(CAT, $1, $2); }
-+		{ $$ = node(CAT, $1, $2); }
- 	;
- b:
--		={ $$ = enter(DOT);
-+		{ $$ = enter(DOT);
- 		   $$ = unary(STAR, $$); }
- 	;
- r:	CHAR
--		={ $$ = enter($1); }
-+		{ $$ = enter($1); }
- 	| DOT
--		={ $$ = enter(DOT); }
-+		{ $$ = enter(DOT); }
- 	| CCL
--		={ $$ = cclenter(CCL); }
-+		{ $$ = cclenter(CCL); }
- 	| NCCL
--		={ $$ = cclenter(NCCL); }
-+		{ $$ = cclenter(NCCL); }
- 	;
- 
- r:	r OR r
--		={ $$ = node(OR, $1, $3); }
-+		{ $$ = node(OR, $1, $3); }
- 	| r r %prec CAT
--		={ $$ = node(CAT, $1, $2); }
-+		{ $$ = node(CAT, $1, $2); }
- 	| r STAR
--		={ $$ = unary(STAR, $1); }
-+		{ $$ = unary(STAR, $1); }
- 	| r PLUS
--		={ $$ = unary(PLUS, $1); }
-+		{ $$ = unary(PLUS, $1); }
- 	| r QUEST
--		={ $$ = unary(QUEST, $1); }
-+		{ $$ = unary(QUEST, $1); }
- 	| '(' r ')'
--		={ $$ = $2; }
-+		{ $$ = $2; }
- 	| error 
- 	;
- 
-