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

[Xin LI]

Author: delphij
Date: Wed Jun 26 17:15:45 2013
New Revision: 321801
URL: http://svnweb.freebsd.org/changeset/ports/321801

Log:
   - Update to 2.3
   - Remove hardcoded GFLAGS
   - Convert Makefile headers to new style
   - Use single space after WWW in pkg-descr
  
  PR:		ports/179937 with
  		improvements from Alex Kozlov <spam at rm-rf.kiev.ua>
  Approved by:	maintainer (gslin)

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

Modified: head/archivers/pigz/Makefile
==============================================================================
--- head/archivers/pigz/Makefile	Wed Jun 26 17:12:08 2013	(r321800)
+++ head/archivers/pigz/Makefile	Wed Jun 26 17:15:45 2013	(r321801)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	pigz
-# Date created:		2008-06-06
-# Whom:			Gea-Suan Lin <gslin at gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin at 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 @@ MASTER_SITES=	http://www.zlib.net/pigz/ 
 MAINTAINER=	gslin at 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

Modified: head/archivers/pigz/distinfo
==============================================================================
--- head/archivers/pigz/distinfo	Wed Jun 26 17:12:08 2013	(r321800)
+++ head/archivers/pigz/distinfo	Wed Jun 26 17:15:45 2013	(r321801)
@@ -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

Modified: head/archivers/pigz/files/patch-Makefile
==============================================================================
--- head/archivers/pigz/files/patch-Makefile	Wed Jun 26 17:12:08 2013	(r321800)
+++ head/archivers/pigz/files/patch-Makefile	Wed Jun 26 17:15:45 2013	(r321801)
@@ -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) $(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

Modified: head/archivers/pigz/pkg-descr
==============================================================================
--- head/archivers/pigz/pkg-descr	Wed Jun 26 17:12:08 2013	(r321800)
+++ head/archivers/pigz/pkg-descr	Wed Jun 26 17:15:45 2013	(r321801)
@@ -3,4 +3,4 @@ capable Parallel Implementation of GZip,
 implements nearly all of gzip's functionality, including decompression
 of .gz and .Z (Unix compress) files.
 
-WWW:	http://www.zlib.net/pigz/
+WWW: http://www.zlib.net/pigz/