[arch-commits] Commit in tcsh/repos (5 files)

[Eric Bélanger]

    Date: Monday, July 27, 2009 @ 19:07:21
  Author: eric
Revision: 47804

Merged revisions 47803 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/tcsh/trunk

........
  r47803 | eric | 2009-07-27 19:07:05 -0400 (Mon, 27 Jul 2009) | 2 lines
  
  upgpkg: tcsh 6.17.00-1
      Upstream update, Updated ls color patch
........

Added:
  tcsh/repos/extra-x86_64/tcsh-6.17.00-ls-colors-var.patch
    (from rev 47803, tcsh/trunk/tcsh-6.17.00-ls-colors-var.patch)
Modified:
  tcsh/repos/extra-x86_64/	(properties)
  tcsh/repos/extra-x86_64/ChangeLog
  tcsh/repos/extra-x86_64/PKGBUILD
Deleted:
  tcsh/repos/extra-x86_64/tcsh-6.15.00-ls-colors-var.patch

----------------------------------+
 ChangeLog                        |    6 ++++++
 PKGBUILD                         |   25 +++++++++++--------------
 tcsh-6.15.00-ls-colors-var.patch |   13 -------------
 tcsh-6.17.00-ls-colors-var.patch |   11 +++++++++++
 4 files changed, 28 insertions(+), 27 deletions(-)


Property changes on: tcsh/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /tcsh/trunk:1-43444
   + /tcsh/trunk:1-47803

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-07-27 23:07:05 UTC (rev 47803)
+++ extra-x86_64/ChangeLog	2009-07-27 23:07:21 UTC (rev 47804)
@@ -1,3 +1,9 @@
+2009-07-27  Eric Belanger  <eric at archlinux.org>
+
+	* tcsh 6.17.00-1
+	* Upstream update
+	* Updated ls color patch
+
 2009-06-23  Eric Belanger  <eric at archlinux.org>
 
 	* tcsh 6.16.00-4

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-27 23:07:05 UTC (rev 47803)
+++ extra-x86_64/PKGBUILD	2009-07-27 23:07:21 UTC (rev 47804)
@@ -3,8 +3,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=tcsh
-pkgver=6.16.00
-pkgrel=4
+pkgver=6.17.00
+pkgrel=1
 pkgdesc="Enhanced version of the Berkeley C shell"
 arch=('i686' 'x86_64')
 url="http://www.tcsh.org/Welcome"
@@ -12,23 +12,20 @@
 depends=('ncurses')
 install=tcsh.install
 source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz csh.cshrc \
-        tcsh-6.15.00-ls-colors-var.patch csh.login usr_csh.sh usr_tcsh.sh)
-md5sums=('55f1a41512250168ec4bf1db0e246db4' '7ca0fe6d1a1b9a0093f632499d4fb112'\
-         'e744f5c31fc8009e7977aa50bbd9d0ae' '4869b9da87c79854e2cc97241f125853'\
+        tcsh-6.17.00-ls-colors-var.patch csh.login usr_csh.sh usr_tcsh.sh)
+md5sums=('c47de903e3d52f6824c8dd0c91eeb477' '7ca0fe6d1a1b9a0093f632499d4fb112'\
+         '5febe6965b9426417c10348404bfcfd5' '4869b9da87c79854e2cc97241f125853'\
          '2b672c67b5e08ab81fbb03d8588d25e3' '8758b20326f00a1057bd95a300c28355')
-sha1sums=('3d3536bbb9201abdf39b8b364b95e0a218970a5c'
-          'f156f79f67c2cc1d96617095230dc90e75ea1e43'
-          'e61fb09bd20d5af0cdb000de4972acf926521de8'
-          'dbbcfacc078789104f75cbf5a99640ce7251c99e'
-          '7668da494d053a00199f8e2c857bf3998c74f0be'
-          '31da3a6aaa00cd8d66a6c1fba42e19fbc99f2c7c')
+sha1sums=('9bf67d5ce1b406178e9ba535ecd34553fe0d4d36' 'f156f79f67c2cc1d96617095230dc90e75ea1e43'\
+         '12425a655b80366db5b1f188d737f053a3115bc3' 'dbbcfacc078789104f75cbf5a99640ce7251c99e'\
+         '7668da494d053a00199f8e2c857bf3998c74f0be' '31da3a6aaa00cd8d66a6c1fba42e19fbc99f2c7c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../tcsh-6.15.00-ls-colors-var.patch || return 1
-  ./configure --prefix=/ --sysconfdir=/etc --mandir=/usr/share/man || return 1
+  patch -p0 < ../tcsh-6.17.00-ls-colors-var.patch || return 1
+  ./configure --prefix=/ --sysconfdir=/etc || return 1
   make || return 1
-  make DESTDIR="${pkgdir}" install install.man || return 1
+  make DESTDIR="${pkgdir}" mandir=/usr/share/man install install.man || return 1
 
   install -D -m644 "${srcdir}/csh.cshrc" "${pkgdir}/etc/csh.cshrc" || return 1
   install -D -m644 "${srcdir}/csh.login" "${pkgdir}/etc/csh.login" || return 1

Deleted: extra-x86_64/tcsh-6.15.00-ls-colors-var.patch
===================================================================
--- extra-x86_64/tcsh-6.15.00-ls-colors-var.patch	2009-07-27 23:07:05 UTC (rev 47803)
+++ extra-x86_64/tcsh-6.15.00-ls-colors-var.patch	2009-07-27 23:07:21 UTC (rev 47804)
@@ -1,13 +0,0 @@
-diff -p -up tcsh-6.15.00/tw.color.c.ls-colors tcsh-6.15.00/tw.color.c
---- tcsh-6.15.00/tw.color.c.ls-colors	2006-03-02 19:46:45.000000000 +0100
-+++ tcsh-6.15.00/tw.color.c	2008-09-15 15:08:19.000000000 +0200
-@@ -85,6 +85,9 @@ static Variable variables[] = {
-     VAR(NOS, "tw", ""),		/* Sticky and other writable dir (+t,o+w) */
-     VAR(NOS, "ow", ""),		/* Other writable dir (o+w) but not sticky */
-     VAR(NOS, "st", ""),		/* Sticky dir (+t) but not other writable */
-+    VAR(NOS, "rs", ""),		/* Reset to "normal" color */
-+    VAR(NOS, "hl", ""),		/* Regular file with more than one link */
-+    VAR(NOS, "ca", ""),		/* File with capability */
- };
- 
- enum FileType {

Copied: tcsh/repos/extra-x86_64/tcsh-6.17.00-ls-colors-var.patch (from rev 47803, tcsh/trunk/tcsh-6.17.00-ls-colors-var.patch)
===================================================================
--- extra-x86_64/tcsh-6.17.00-ls-colors-var.patch	                        (rev 0)
+++ extra-x86_64/tcsh-6.17.00-ls-colors-var.patch	2009-07-27 23:07:21 UTC (rev 47804)
@@ -0,0 +1,11 @@
+--- tw.color.c.orig	2009-07-27 01:45:38.000000000 -0400
++++ tw.color.c	2009-07-27 01:47:55.000000000 -0400
+@@ -86,6 +86,8 @@
+     VAR(NOS, "ow", ""),		/* Other writable dir (o+w) but not sticky */
+     VAR(NOS, "st", ""),		/* Sticky dir (+t) but not other writable */
+     VAR(NOS, "rs", "0"),	/* Reset to normal color */
++    VAR(NOS, "hl", ""),		/* Regular file with more than one link */
++    VAR(NOS, "ca", ""),		/* File with capability */
+ };
+ 
+ enum FileType {