Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10356

Modified Files:
        lesspipe.info 
Log Message:
New upsteam version and cleanup work arounds for older file/less commands which 
are no longer needed on Tiger

Index: lesspipe.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/lesspipe.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lesspipe.info       12 Dec 2005 16:42:00 -0000      1.3
+++ lesspipe.info       20 Dec 2005 12:38:26 -0000      1.4
@@ -1,12 +1,12 @@
 Package: lesspipe
-Version: 1.50
-Revision: 12
-Source: ftp://ftp.ifh.de/pub/unix/utility/lesspipe.tar.gz
+Version: 1.52
+Revision: 11
+Source: ftp://ftp.ifh.de/pub/unix/utility/lesspipe-%v.tar.gz
 SourceRename: %n-%v.tar.gz
-Source-MD5: 1a41af9d840987e9c75174d8d0c38059
+Source-MD5: 95cea0dc8b6b8788dc7003b6c3b4a80f
 SourceDirectory: %n-%v
 BuildDepends: fink (>= 0.18.0) 
-Recommends: file (>= 4.09), lynx, antiword, rpm, ghostscript, html2text, unrtf
+Recommends: lynx, antiword, rpm, ghostscript, html2text, unrtf
 PatchScript: <<
  /usr/bin/sed "s=/etc=%p/etc=g" code2color > code2color.new
  /bin/mv -f code2color.new code2color
@@ -22,34 +22,18 @@
  /usr/bin/install -d -m 755 %i/bin
  /usr/bin/install -m 0755 lesspipe.sh.fink %i/bin/lesspipe.sh
  /usr/bin/install -m 0755 code2color %i/bin
- # add magic file for BOM
- /usr/bin/install -d -m 755 %i/share/%n
- echo "0       string  BOMStore        Mac OS X bill of materials (BOM) file" 
> %i/share/%n/magic
+
  # install environment scripts
  /usr/bin/install -d -m 755 %i/etc/profile.d
  ### bash version ###
  cat >%i/etc/profile.d/%n.sh <<EOF
 export LESSOPEN='| %p/bin/lesspipe.sh %%s'
 
-if [ \`file -v | /usr/bin/sed -n 's/file-\([0-9.]\).\([0-9]\)/\1\2/p'\` -lt 
409 ]; then
-    if [ -z "\$MAGIC" ]; then
-        MAGIC=%p/share/%n/magic:/usr/share/file/magic
-    else
-        prepend_path MAGIC %p/share/%n/magic
-    fi
-    export MAGIC
-fi
- 
-if [ \`less --version | /usr/bin/sed -n 's/less\ \([0-9]\)/\1/p'\` -ge 346 ]; 
then
-    option="--RAW-CONTROL-CHARS"
-else
-    option="--raw-control-chars"
-fi
 if [ -z "\$LESS" ]; then
-    LESS=\$option
+    LESS="--raw-control-chars"
 else
     if [ \`printenv LESS | /usr/bin/grep -c -e "-[Rr]"\` -eq 0 ]; then
-       LESS="\$LESS \$option"
+       LESS="\$LESS --raw-control-chars"
     fi
 fi
 export LESS
@@ -58,25 +42,12 @@
  cat >%i/etc/profile.d/%n.csh <<EOF
 setenv LESSOPEN '| %p/bin/lesspipe.sh %%s'
 
-if ( \`file -v | sed -n 's/file-\([0-9.]\).\([0-9]\)/\1\2/p'\` < 409 ) then
-    if ( \$?MAGIC ) then
-        prepend_path MAGIC %p/share/%n/magic
-    else
-        setenv MAGIC %p/share/%n/magic:/usr/share/file/magic
-    endif
-endif
- 
-if ( \`less --version | sed -n 's/less\ \([0-9]\)/\1/p'\` >= 346 ) then
-    set option="--RAW-CONTROL-CHARS"
-else
-    set option="--raw-control-chars"
-endif
 if ( \$?LESS ) then
     if ( "\$LESS" !~ *-{R,r}* ) then
-       setenv LESS "\$LESS \$option"
+       setenv LESS "\$LESS --raw-control-chars"
     endif
 else
-    setenv LESS \$option
+    setenv LESS "--raw-control-chars"
 endif
 EOF
  /bin/chmod 755 %i/etc/profile.d/%n.*sh
@@ -107,10 +78,8 @@
 you can use lesspipe, because it uses the environment variable
 LESSOPEN.
 
-Additionally the envrionment variables LESS and MAGIC are set. The
-former feeds the option '-R' to less which enables the syntax
-highlighting. The latter is needed for the 'file' command to recognize
-the BOM (Bill Of Materials) files correctly.
+Additionally the envrionment variable LESS is set. It feeds the option
+'--raw-control-chars' to less which enables syntax highlighting.
 <<
 DescPackaging: <<
 We need to depend on fink >= 0.18.0 which provides the correct



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to