diff options
author | minskim <minskim@pkgsrc.org> | 2004-03-30 01:36:54 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2004-03-30 01:36:54 +0000 |
commit | 8a8b0a6a9da0b6b19e53c4180551a2b429d0b4c5 (patch) | |
tree | eb946c5ad10ca197706d1fd034a888f2baa0c5d2 | |
parent | 91d555c0a3c876321c82f941428d00e4e5243ad2 (diff) | |
download | pkgsrc-8a8b0a6a9da0b6b19e53c4180551a2b429d0b4c5.tar.gz |
Regen patch-aa to make GNU patch happy.
-rw-r--r-- | devel/tkcvs/distinfo | 4 | ||||
-rw-r--r-- | devel/tkcvs/patches/patch-aa | 23 |
2 files changed, 9 insertions, 18 deletions
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo index ee56b3d8974..25495dcaea8 100644 --- a/devel/tkcvs/distinfo +++ b/devel/tkcvs/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.9 2004/03/09 22:49:48 minskim Exp $ +$NetBSD: distinfo,v 1.10 2004/03/30 01:36:54 minskim Exp $ SHA1 (tkcvs_7_2.tar.gz) = 1f2f2e745545ed42fd677bafd4682103e7f86bc4 Size (tkcvs_7_2.tar.gz) = 279525 bytes -SHA1 (patch-aa) = a9d50bce32e84d9b7e23244957430fca57a765cd +SHA1 (patch-aa) = 21bb6f92541aba3eef7559a1d4aa86a2fa98c181 diff --git a/devel/tkcvs/patches/patch-aa b/devel/tkcvs/patches/patch-aa index fdee08d2aef..a5f54db7e76 100644 --- a/devel/tkcvs/patches/patch-aa +++ b/devel/tkcvs/patches/patch-aa @@ -1,26 +1,22 @@ -$NetBSD: patch-aa,v 1.9 2002/12/23 13:13:29 tron Exp $ +$NetBSD: patch-aa,v 1.10 2004/03/30 01:36:54 minskim Exp $ ---- doinstall.tcl.orig Wed Jan 23 18:18:03 2002 +--- doinstall.tcl.orig 2003-10-16 02:23:32.000000000 -0500 +++ doinstall.tcl -@@ -1,6 +1,6 @@ - #!/bin/sh +@@ -2,5 +2,5 @@ #-*-tcl-*- # the next line restarts using wish \ -if [ -z "$DISPLAY" ]; then exec tclsh "$0" -- ${1+"$@"}; else exec wish "$0" -- ${1+"$@"}; fi +exec tclsh "$0" -- ${1+"$@"} # -@@ -29,7 +29,7 @@ - set MANDIR "" +@@ -30,5 +30,5 @@ proc set_paths {INSTALLROOT} { } else { set BINDIR [file join $INSTALLROOT bin] - set LIBDIR [file join $INSTALLROOT lib] + set LIBDIR [file join $INSTALLROOT share] set MANDIR [file join $INSTALLROOT man man1] } - } -@@ -40,23 +40,6 @@ - global LIBDIR BINDIR MANDIR +@@ -41,21 +41,4 @@ proc show_paths {INSTALLROOT} { set_paths $INSTALLROOT - @@ -42,9 +38,7 @@ $NetBSD: patch-aa,v 1.9 2002/12/23 13:13:29 tron Exp $ - } } - proc doinstall { INSTALLROOT } { -@@ -117,13 +100,6 @@ - } +@@ -118,11 +101,4 @@ proc doinstall { INSTALLROOT } { cd .. puts "Finished!" - @@ -56,9 +50,7 @@ $NetBSD: patch-aa,v 1.9 2002/12/23 13:13:29 tron Exp $ - } } - ################################################################################ -@@ -132,12 +108,7 @@ - set X 1 +@@ -133,10 +109,5 @@ set X 1 # Check Tcl/TK version -if {$tcl_version < 8.3} { @@ -70,4 +62,3 @@ $NetBSD: patch-aa,v 1.9 2002/12/23 13:13:29 tron Exp $ +# This is done by the package Makefile # Do this after checking tcl version, because 7.x doesn't have it. - puts "[info nameofexecutable]" |