Date: Mon, 24 Jun 2013 20:06:51 GMT From: Xin LI <delphij@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: gslin@gslin.org Subject: ports/179937: [PATCH] Update archivers/pigz to 2.3 Message-ID: <201306242006.r5OK6pYT008546@freefall.freebsd.org> Resent-Message-ID: <201306242010.r5OKA02B008639@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179937 >Category: ports >Synopsis: [PATCH] Update archivers/pigz to 2.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jun 24 20:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 10.0-CURRENT amd64 >Organization: iXsystems, Inc. >Environment: System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r252008: Wed Jun 19 21:39:58 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64 >Description: This proposed patch updates archivers/pigz to 2.3. Major changes in 2.3: - Don't complain about missing suffix when not writing output file - Do not decompress concatenated zlib streams -- only gzip streams - Add option for compression level 11 to use zopfli - Fix handling of junk after compressed data >How-To-Repeat: >Fix: --- pigz.diff begins here --- Index: archivers/pigz/Makefile =================================================================== --- archivers/pigz/Makefile (revision 321697) +++ archivers/pigz/Makefile (working copy) @@ -1,12 +1,8 @@ -# New ports collection makefile for: pigz -# Date created: 2008-06-06 -# Whom: Gea-Suan Lin <gslin@gslin.org> -# +# Created by: Gea-Suan Lin <gslin@gslin.org> # $FreeBSD$ -# PORTNAME= pigz -PORTVERSION= 2.2.5 +PORTVERSION= 2.3 CATEGORIES= archivers MASTER_SITES= http://www.zlib.net/pigz/ \ http://freebsd.unixfreunde.de/sources/ @@ -14,10 +10,15 @@ MAINTAINER= gslin@gslin.org COMMENT= Parallel GZIP +USE_GMAKE= yes + .if !defined(NO_INSTALL_MANPAGES) MAN1= pigz.1 .endif +post-patch: + ${REINPLACE_CMD} -e 's/ -lz/ -lm -lz/g' ${WRKSRC}/Makefile + do-install: .for FILE in pigz pigzn pigzt unpigz ${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/bin Index: archivers/pigz/distinfo =================================================================== --- archivers/pigz/distinfo (revision 321697) +++ archivers/pigz/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (pigz-2.2.5.tar.gz) = e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759 -SIZE (pigz-2.2.5.tar.gz) = 49717 +SHA256 (pigz-2.3.tar.gz) = 74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21 +SIZE (pigz-2.3.tar.gz) = 83636 Index: archivers/pigz/files/patch-Makefile =================================================================== --- archivers/pigz/files/patch-Makefile (revision 321697) +++ archivers/pigz/files/patch-Makefile (working copy) @@ -1,8 +1,35 @@ ---- Makefile.orig 2008-10-29 14:27:57.000000000 +0800 -+++ Makefile 2009-02-08 04:35:10.000000000 +0800 -@@ -1,4 +1,4 @@ --CFLAGS=-O2 +--- ./Makefile.orig 2013-03-03 22:06:35.000000000 -0800 ++++ ./Makefile 2013-06-24 12:59:58.000000000 -0700 +@@ -1,5 +1,4 @@ +-CC=cc +-CFLAGS=-O3 -Wall -Wextra +all: dev - pigz: pigz.o yarn.o - cc -o pigz pigz.o yarn.o -lpthread -lz + + pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o +@@ -30,20 +29,20 @@ + + dev: pigz pigzt pigzn + +-pigzt: pigzt.o yarnt.o +- $(CC) -o pigzt pigzt.o yarnt.o -lpthread -lz ++pigzt: pigzt.o yarnt.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o ++ $(CC) -o pigzt $^ -lpthread -lz + + pigzt.o: pigz.c yarn.h +- $(CC) -Wall -O3 -DDEBUG -g -c -o pigzt.o pigz.c ++ $(CC) -DDEBUG -g -c -o pigzt.o pigz.c + + yarnt.o: yarn.c yarn.h +- $(CC) -Wall -O3 -DDEBUG -g -c -o yarnt.o yarn.c ++ $(CC) -DDEBUG -g -c -o yarnt.o yarn.c + + pigzn: pigzn.o + $(CC) -o pigzn pigzn.o -lz + + pigzn.o: pigz.c +- $(CC) -Wall -O3 -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c ++ $(CC) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c + + test: pigz + ./pigz -kf pigz.c ; ./pigz -t pigz.c.gz --- pigz.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306242006.r5OK6pYT008546>