Attachment 135152 Details for Bug 179937 – pigz.diff

[patch] pigz.diff

pigz.diff (text/plain), 2.87 KB, created by Xin LI on 2013-06-24 21:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2013-06-24 21:10:00 UTC

Size: 2.87 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 179937: 135152 | 135153