gzip: Update to 1.6.

diff --git a/gzip/gzip.nm b/gzip/gzip.nm
index 020e9d7982eb1b5d4daa82f77b57bbe18e82f79d..20c389b09ede51ea559675d0ca74c583b4e310af 100644 (file)
--- a/gzip/gzip.nm
+++ b/gzip/gzip.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = gzip
-version    = 1.5
+version    = 1.6
 release    = 1
 
 groups     = Applications/Compression
@@ -23,6 +23,9 @@ build
        requires
                coreutils
                less
+               texinfo
+
+               /usr/bin/more
        end
 
        # NO_ASM is for textrels.

diff --git a/gzip/patches/gzip-1.3.5-zforce.patch b/gzip/patches/gzip-1.3.5-zforce.patch
index 5a9beca1f37945d8693f992283b43bde5b8c3ed6..b13c76644b44f0258bd8b73cb3359030abb41186 100644 (file)
--- a/gzip/patches/gzip-1.3.5-zforce.patch
+++ b/gzip/patches/gzip-1.3.5-zforce.patch
@@ -6,7 +6,7 @@ diff -up gzip-1.3.12/zforce.in.zforce gzip-1.3.12/zforce.in
    fi
  
 -  if gzip -lv < "$i" 2>/dev/null | grep '^defl' > /dev/null; then
-+  if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then
++  if gzip -l < "$i" 2>/dev/null | grep 'compressed' > /dev/null; then
  
      new="$i.gz"
      if mv "$i" "$new"; then

diff --git a/gzip/patches/gzip-1.3.9-addsuffix.patch b/gzip/patches/gzip-1.3.9-addsuffix.patch
deleted file mode 100644 (file)
index 80a823d..0000000
--- a/gzip/patches/gzip-1.3.9-addsuffix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gzip-1.3.9/zmore.in.pom 2007-01-15 15:31:26.000000000 +0100
-+++ gzip-1.3.9/zmore.in 2007-01-15 15:34:06.000000000 +0100
-@@ -70,7 +70,7 @@
-         --v*) exec echo "$version";;
-         esac
- 
--        < "$FILE" || continue
-+        if test -e $FILE || test -e $FILE.gz; then 
-         if test $FIRST -eq 0; then
-                 echo $n1 "--More--(Next file: $FILE)$n2"
-                 stty $cb -echo 2>/dev/null
-@@ -88,5 +88,7 @@
-         if test -t 1; then
-                 FIRST=0
-         fi
-+        else < $FILE
-+        fi 
-     done
- fi