ports/184318: [PATCH] Update archivers/pigz to 2.3.1 and stage'ify

[Xin LI]

>Number:         184318
>Category:       ports
>Synopsis:       [PATCH] Update archivers/pigz to 2.3.1 and stage'ify
>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:   Tue Nov 26 22:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Xin LI
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
iXsystems, Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r258318: Mon Nov 18 20:03:35 UTC 2013 peter at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


>Description:
	Patch tested with poudrier for 8.4, 9.2 and 11-CURRENT.
>How-To-Repeat:
>Fix:


--- pigz.diff begins here ---
Index: archivers/pigz/Makefile
===================================================================
--- archivers/pigz/Makefile	(revision 334973)
+++ archivers/pigz/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pigz
-PORTVERSION=	2.3
+PORTVERSION=	2.3.1
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.zlib.net/pigz/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -10,11 +10,11 @@ MASTER_SITES=	http://www.zlib.net/pigz/ \
 MAINTAINER=	gslin at 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)
-MAN1=	pigz.1
+PLIST_FILES+=	man/man1/pigz.1.gz
 .endif
 
 post-patch:
@@ -22,10 +22,10 @@ post-patch:
 
 do-install:
 .for FILE in pigz pigzn pigzt unpigz
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${WRKSRC}/pigz.1 ${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/pigz.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 .endif
 
 .include <bsd.port.mk>
Index: archivers/pigz/distinfo
===================================================================
--- archivers/pigz/distinfo	(revision 334973)
+++ archivers/pigz/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (pigz-2.3.tar.gz) = 74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21
-SIZE (pigz-2.3.tar.gz) = 83636
+SHA256 (pigz-2.3.1.tar.gz) = 629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54
+SIZE (pigz-2.3.1.tar.gz) = 86651
Index: archivers/pigz/files/patch-Makefile
===================================================================
--- archivers/pigz/files/patch-Makefile	(revision 334973)
+++ archivers/pigz/files/patch-Makefile	(working copy)
@@ -1,5 +1,5 @@
---- ./Makefile.orig	2013-03-03 22:06:35.000000000 -0800
-+++ ./Makefile	2013-06-24 12:59:58.000000000 -0700
+--- ./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
@@ -7,29 +7,3 @@
  
  
  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
Index: archivers/pigz/pkg-plist
===================================================================
--- archivers/pigz/pkg-plist	(revision 334973)
+++ archivers/pigz/pkg-plist	(working copy)
@@ -1,5 +0,0 @@
- at comment $FreeBSD$
-bin/pigz
-bin/pigzn
-bin/pigzt
-bin/unpigz
--- pigz.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: