Attachment #135152 for bug #179937

View | Details | Raw Unified | Return to bug 179937
Collapse All | Expand All

Lines 1-12 Link Here

(-)archivers/pigz/Makefile (-6 / +7 lines)
1	# New ports collection makefile for: pigz	1	# Created by: Gea-Suan Lin <gslin@gslin.org>
2	# Date created: 2008-06-06
3	# Whom: Gea-Suan Lin <gslin@gslin.org>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= pigz	4	PORTNAME= pigz
9	PORTVERSION= 2.2.5	5	PORTVERSION= 2.3
10	CATEGORIES= archivers	6	CATEGORIES= archivers
11	MASTER_SITES= http://www.zlib.net/pigz/ \	7	MASTER_SITES= http://www.zlib.net/pigz/ \
12	http://freebsd.unixfreunde.de/sources/	8	http://freebsd.unixfreunde.de/sources/
Lines 14-23 Link Here
14	MAINTAINER= gslin@gslin.org	10	MAINTAINER= gslin@gslin.org
15	COMMENT= Parallel GZIP	11	COMMENT= Parallel GZIP
16		12
		13	USE_GMAKE= yes
		14
17	.if !defined(NO_INSTALL_MANPAGES)	15	.if !defined(NO_INSTALL_MANPAGES)
18	MAN1= pigz.1	16	MAN1= pigz.1
19	.endif	17	.endif
20		18
		19	post-patch:
		20	${REINPLACE_CMD} -e 's/ -lz/ -lm -lz/g' ${WRKSRC}/Makefile
		21
21	do-install:	22	do-install:
22	.for FILE in pigz pigzn pigzt unpigz	23	.for FILE in pigz pigzn pigzt unpigz
23	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/bin	24	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/bin

Lines 1-2 Link Here

(-)archivers/pigz/distinfo (-2 / +2 lines)
1	SHA256 (pigz-2.2.5.tar.gz) = e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759	1	SHA256 (pigz-2.3.tar.gz) = 74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21
2	SIZE (pigz-2.2.5.tar.gz) = 49717	2	SIZE (pigz-2.3.tar.gz) = 83636




--- ./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 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

Return to bug 179937

Lines 1-8 Link Here

(-)archivers/pigz/files/patch-Makefile (-6 / +33 lines)
1	--- Makefile.orig 2008-10-29 14:27:57.000000000 +0800	1	--- ./Makefile.orig 2013-03-03 22:06:35.000000000 -0800
2	+++ Makefile 2009-02-08 04:35:10.000000000 +0800	2	+++ ./Makefile 2013-06-24 12:59:58.000000000 -0700
3	@@ -1,4 +1,4 @@	3	@@ -1,5 +1,4 @@
4	-CFLAGS=-O2	4	-CC=cc
		5	-CFLAGS=-O3 -Wall -Wextra
5	+all: dev	6	+all: dev
6		7
7	pigz: pigz.o yarn.o	8
8	cc -o pigz pigz.o yarn.o -lpthread -lz	9	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
		10	@@ -30,20 +29,20 @@
		11
		12	dev: pigz pigzt pigzn
		13
		14	-pigzt: pigzt.o yarnt.o
		15	- $(CC) -o pigzt pigzt.o yarnt.o -lpthread -lz
		16	+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
		17	+ $(CC) -o pigzt $^ -lpthread -lz
		18
		19	pigzt.o: pigz.c yarn.h
		20	- $(CC) -Wall -O3 -DDEBUG -g -c -o pigzt.o pigz.c
		21	+ $(CC) -DDEBUG -g -c -o pigzt.o pigz.c
		22
		23	yarnt.o: yarn.c yarn.h
		24	- $(CC) -Wall -O3 -DDEBUG -g -c -o yarnt.o yarn.c
		25	+ $(CC) -DDEBUG -g -c -o yarnt.o yarn.c
		26
		27	pigzn: pigzn.o
		28	$(CC) -o pigzn pigzn.o -lz
		29
		30	pigzn.o: pigz.c
		31	- $(CC) -Wall -O3 -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
		32	+ $(CC) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
		33
		34	test: pigz
		35	./pigz -kf pigz.c ; ./pigz -t pigz.c.gz