svn commit: r335450 - in head/archivers/pigz: . files

[Xin LI]

Author: delphij
Date: Mon Dec  2 04:34:58 2013
New Revision: 335450
URL: http://svnweb.freebsd.org/changeset/ports/335450

Log:
  Update to 2.3.1 and stage'ify.
  
  PR:		ports/184318
  Approved by:	maintainer (gslin at gslin org)

Deleted:
  head/archivers/pigz/pkg-plist
Modified:
  head/archivers/pigz/Makefile
  head/archivers/pigz/distinfo
  head/archivers/pigz/files/patch-Makefile

Modified: head/archivers/pigz/Makefile
==============================================================================
--- head/archivers/pigz/Makefile	Mon Dec  2 04:03:29 2013	(r335449)
+++ head/archivers/pigz/Makefile	Mon Dec  2 04:34:58 2013	(r335450)
@@ -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>

Modified: head/archivers/pigz/distinfo
==============================================================================
--- head/archivers/pigz/distinfo	Mon Dec  2 04:03:29 2013	(r335449)
+++ head/archivers/pigz/distinfo	Mon Dec  2 04:34:58 2013	(r335450)
@@ -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

Modified: head/archivers/pigz/files/patch-Makefile
==============================================================================
--- head/archivers/pigz/files/patch-Makefile	Mon Dec  2 04:03:29 2013	(r335449)
+++ head/archivers/pigz/files/patch-Makefile	Mon Dec  2 04:34:58 2013	(r335450)
@@ -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