svn commit: r321707 - in head/archivers/gzip: . files

[Johan van Selst]

Author: johans
Date: Mon Jun 24 19:04:49 2013
New Revision: 321707
URL: http://svnweb.freebsd.org/changeset/ports/321707

Log:
  - Update GNU gzip to 1.6
  - Remove patch for -k (finally included upstream)
  - Adopt port
  
  Approved by:    gabor (old maintainer)

Deleted:
  head/archivers/gzip/files/patch-gzip.1
  head/archivers/gzip/files/patch-gzip.c
Modified:
  head/archivers/gzip/Makefile
  head/archivers/gzip/distinfo
  head/archivers/gzip/files/extra-patch-gzip-rsyncable.diff

Modified: head/archivers/gzip/Makefile
==============================================================================
--- head/archivers/gzip/Makefile	Mon Jun 24 18:57:56 2013	(r321706)
+++ head/archivers/gzip/Makefile	Mon Jun 24 19:04:49 2013	(r321707)
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	gzip
-PORTVERSION=	1.4
-PORTREVISION=	2
+PORTVERSION=	1.6
 CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
-MAINTAINER=	gabor at FreeBSD.org
+MAINTAINER=	johans at FreeBSD.org
 COMMENT=	Compression utility designed to be a replacement for compress
 
 USES=		charsetfix

Modified: head/archivers/gzip/distinfo
==============================================================================
--- head/archivers/gzip/distinfo	Mon Jun 24 18:57:56 2013	(r321706)
+++ head/archivers/gzip/distinfo	Mon Jun 24 19:04:49 2013	(r321707)
@@ -1,2 +1,2 @@
-SHA256 (gzip-1.4.tar.gz) = d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee
-SIZE (gzip-1.4.tar.gz) = 907411
+SHA256 (gzip-1.6.tar.gz) = 97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e
+SIZE (gzip-1.6.tar.gz) = 1074924

Modified: head/archivers/gzip/files/extra-patch-gzip-rsyncable.diff
==============================================================================
--- head/archivers/gzip/files/extra-patch-gzip-rsyncable.diff	Mon Jun 24 18:57:56 2013	(r321706)
+++ head/archivers/gzip/files/extra-patch-gzip-rsyncable.diff	Mon Jun 24 19:04:49 2013	(r321707)
@@ -106,17 +106,17 @@ diff -u -r ../gzip-1.3.12.orig/deflate.c
  
              lookahead -= match_length;
  
-+	    RSYNC_ROLL(strstart, match_length);
- 	    /* Insert new strings in the hash table only if the match length
++            RSYNC_ROLL(strstart, match_length);
+             /* Insert new strings in the hash table only if the match length
               * is not too large. This saves time but degrades compression.
               */
-@@ -652,9 +702,14 @@
+@@ -654,9 +704,14 @@
              /* No match, output a literal byte */
              Tracevv((stderr,"%c",window[strstart]));
              flush = ct_tally (0, window[strstart]);
 +            RSYNC_ROLL(strstart, 1);
              lookahead--;
- 	    strstart++;
+             strstart++;
          }
 +        if (rsync && strstart > rsync_chunk_end) {
 +            rsync_chunk_end = 0xFFFFFFFFUL;
@@ -206,11 +206,12 @@ diff -u -r ../gzip-1.3.12.orig/gzip.c ./
  
  struct option longopts[] =
  {
-@@ -260,6 +261,7 @@
+@@ -260,7 +261,8 @@
      {"best",       0, 0, '9'}, /* compress better */
      {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
      {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
 +    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */
+ 
      { 0, 0, 0, 0 }
  };
  
@@ -223,12 +224,12 @@ diff -u -r ../gzip-1.3.12.orig/gzip.c ./
   "With no FILE, or when FILE is -, read standard input.",
   "",
 @@ -469,6 +472,8 @@
- 	    recursive = 1;
+             recursive = 1;
  #endif
- 	    break;
-+	case 'R':
-+	    rsync = 1; break;
- 	case 'S':
+             break;
++        case 'R':
++            rsync = 1; break;
+         case 'S':
  #ifdef NO_MULTIPLE_DOTS
              if (*optarg == '.') optarg++;
 diff -u -r ../gzip-1.3.12.orig/gzip.h ./gzip.h
@@ -244,13 +245,13 @@ diff -u -r ../gzip-1.3.12.orig/gzip.h ./
  extern off_t bytes_out;  /* number of output bytes */
 @@ -306,7 +307,7 @@
          /* in trees.c */
- void ct_init     OF((ush *attr, int *method));
- int  ct_tally    OF((int dist, int lc));
--off_t flush_block OF((char *buf, ulg stored_len, int eof));
-+off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof));
+ extern void ct_init     (ush *attr, int *method);
+ extern int  ct_tally    (int dist, int lc);
+-extern off_t flush_block (char *buf, ulg stored_len, int eof);
++extern off_t flush_block (char *buf, ulg stored_len, int pad, int eof);
  
          /* in bits.c */
- void     bi_init    OF((file_t zipfile));
+ extern void     bi_init    (file_t zipfile);
 diff -u -r ../gzip-1.3.12.orig/trees.c ./trees.c
 --- ../gzip-1.3.12.orig/trees.c	2006-11-20 02:40:33.000000000 -0600
 +++ ./trees.c	2008-09-01 20:53:37.000000000 -0500