From owner-svn-ports-all@freebsd.org  Sun Aug 16 03:03:40 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3A5C9B7B98;
 Sun, 16 Aug 2015 03:03:40 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 944001702;
 Sun, 16 Aug 2015 03:03:40 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7G33eDM018795;
 Sun, 16 Aug 2015 03:03:40 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7G33e8f018794;
 Sun, 16 Aug 2015 03:03:40 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201508160303.t7G33e8f018794@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 16 Aug 2015 03:03:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r394384 - in head/archivers/pigz: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Aug 2015 03:03:40 -0000

Author: jbeich
Date: Sun Aug 16 03:03:39 2015
New Revision: 394384
URL: https://svnweb.freebsd.org/changeset/ports/394384

Log:
  archivers/pigz: convert to system libzopfli and respect CC/CFLAGS/LDFLAGS
  
  PR:		201895
  Approved by:	delphij (maintainer)

Deleted:
  head/archivers/pigz/files/
Modified:
  head/archivers/pigz/Makefile

Modified: head/archivers/pigz/Makefile
==============================================================================
--- head/archivers/pigz/Makefile	Sun Aug 16 02:52:45 2015	(r394383)
+++ head/archivers/pigz/Makefile	Sun Aug 16 03:03:39 2015	(r394384)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pigz
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.zlib.net/pigz/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -10,15 +11,24 @@ MASTER_SITES=	http://www.zlib.net/pigz/ 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Parallel GZIP
 
-USES=		cpe gmake
+LICENSE=	ZLIB
+
+LIB_DEPENDS=	libzopfli.so:${PORTSDIR}/archivers/zopfli
+
+USES=		cpe gmake localbase
 CPE_VENDOR=	zlib
-MAKE_FLAGS+=	ZOPFLI=zopfli/src/zopfli/
+ALL_TARGET=	dev
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-lz -lzopfli
 
 PLIST_FILES=	bin/pigz bin/pigzn bin/pigzt bin/unpigz
 PLIST_FILES+=	man/man1/pigz.1.gz
 
 post-patch:
-	${REINPLACE_CMD} -e 's/ -lz/ -lm -lz/g' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's/$${ZOPFLI}.*//' \
+		${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's,zopfli/src/,,' \
+		${WRKSRC}/pigz.c
 
 do-install:
 .for FILE in pigz pigzn pigzt unpigz