Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Aug 2015 03:03:40 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r394384 - in head/archivers/pigz: . files
Message-ID:  <201508160303.t7G33e8f018794@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508160303.t7G33e8f018794>