Attachment #138374 for bug #184318

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




# $FreeBSD$

PORTNAME=	pigz
PORTVERSION=	2.3.1
CATEGORIES=	archivers
MASTER_SITES=	http://www.zlib.net/pigz/ \
		http://freebsd.unixfreunde.de/sources/

MAINTAINER=	gslin@gslin.org
COMMENT=	Parallel GZIP

NO_STAGE=	yes
USES=		gmake

PLIST_FILES=	bin/pigz bin/pigzn bin/pigzt bin/unpigz
.if !defined(NO_INSTALL_MANPAGES)
PLIST_FILES+=	man/man1/pigz.1.gz
.endif

post-patch:


do-install:
.for FILE in pigz pigzn pigzt unpigz
	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${PREFIX}/bin
.endfor
.if !defined(NO_INSTALL_MANPAGES)
	${INSTALL_MAN} ${WRKSRC}/pigz.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)archivers/pigz/distinfo (-2 / +2 lines)
1	SHA256 (pigz-2.3.tar.gz) = 74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21	1	SHA256 (pigz-2.3.1.tar.gz) = 629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54
2	SIZE (pigz-2.3.tar.gz) = 83636	2	SIZE (pigz-2.3.1.tar.gz) = 86651




--- ./Makefile.orig	2013-03-10 10:38:22.000000000 -0700
+++ ./Makefile	2013-11-26 13:32:03.000000000 -0800
@@ -1,5 +1,4 @@
-CC=cc
-CFLAGS=-O3 -Wall -Wextra

 
 
 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) $(CFLAGS) -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) $(CFLAGS) -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) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
 
 test: pigz
 	./pigz -kf pigz.c ; ./pigz -t pigz.c.gz

Lines 1-5 Link Here

(-)archivers/pigz/pkg-plist (-5 lines)
1	@comment $FreeBSD$
2	bin/pigz
3	bin/pigzn
4	bin/pigzt
5	bin/unpigz

Return to bug 184318

Lines 2-8 Link Here

(-)archivers/pigz/Makefile (-5 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pigz	4	PORTNAME= pigz
5	PORTVERSION= 2.3	5	PORTVERSION= 2.3.1
6	CATEGORIES= archivers	6	CATEGORIES= archivers
7	MASTER_SITES= http://www.zlib.net/pigz/ \	7	MASTER_SITES= http://www.zlib.net/pigz/ \
8	http://freebsd.unixfreunde.de/sources/	8	http://freebsd.unixfreunde.de/sources/
Lines 10-20 MASTER_SITES= http://www.zlib.net/pigz/ \ Link Here
10	MAINTAINER= gslin@gslin.org	10	MAINTAINER= gslin@gslin.org
11	COMMENT= Parallel GZIP	11	COMMENT= Parallel GZIP
12		12
13	NO_STAGE= yes
14	USES= gmake	13	USES= gmake
15		14
		15	PLIST_FILES= bin/pigz bin/pigzn bin/pigzt bin/unpigz
16	.if !defined(NO_INSTALL_MANPAGES)	16	.if !defined(NO_INSTALL_MANPAGES)
17	MAN1= pigz.1	17	PLIST_FILES+= man/man1/pigz.1.gz
18	.endif	18	.endif
19		19
20	post-patch:	20	post-patch:
Lines 22-31 post-patch: Link Here
22		22
23	do-install:	23	do-install:
24	.for FILE in pigz pigzn pigzt unpigz	24	.for FILE in pigz pigzn pigzt unpigz
25	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/bin	25	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${PREFIX}/bin
26	.endfor	26	.endfor
27	.if !defined(NO_INSTALL_MANPAGES)	27	.if !defined(NO_INSTALL_MANPAGES)
28	${INSTALL_MAN} ${WRKSRC}/pigz.1 ${MAN1PREFIX}/man/man1/	28	${INSTALL_MAN} ${WRKSRC}/pigz.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
29	.endif	29	.endif
30		30
31	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)archivers/pigz/files/patch-Makefile (-28 / +2 lines)
1	--- ./Makefile.orig 2013-03-03 22:06:35.000000000 -0800	1	--- ./Makefile.orig 2013-03-10 10:38:22.000000000 -0700
2	+++ ./Makefile 2013-06-24 12:59:58.000000000 -0700	2	+++ ./Makefile 2013-11-26 13:32:03.000000000 -0800
3	@@ -1,5 +1,4 @@	3	@@ -1,5 +1,4 @@
4	-CC=cc	4	-CC=cc
5	-CFLAGS=-O3 -Wall -Wextra	5	-CFLAGS=-O3 -Wall -Wextra
Lines 7-35 Link Here
7		7
8		8
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	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) $(CFLAGS) -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) $(CFLAGS) -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) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
33
34	test: pigz
35	./pigz -kf pigz.c ; ./pigz -t pigz.c.gz