diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-08-16 11:03:39 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-08-16 11:03:39 +0800 |
| commit | fc814602f3254a2d323f638b15d22a1138a1258d (patch) | |
| tree | f5b9ab5e7d657dc725faa6821f9a4abd2f125e2f | |
| parent | 01752a70264095302abccad3ebd7062296037e5a (diff) | |
| download | freebsd-ports-gnome-fc814602f3254a2d323f638b15d22a1138a1258d.tar.gz freebsd-ports-gnome-fc814602f3254a2d323f638b15d22a1138a1258d.tar.zst freebsd-ports-gnome-fc814602f3254a2d323f638b15d22a1138a1258d.zip | |
archivers/pigz: convert to system libzopfli and respect CC/CFLAGS/LDFLAGS
PR: 201895
Approved by: delphij (maintainer)
| -rw-r--r-- | archivers/pigz/Makefile | 16 | ||||
| -rw-r--r-- | archivers/pigz/files/patch-Makefile | 9 |
2 files changed, 13 insertions, 12 deletions
diff --git a/archivers/pigz/Makefile b/archivers/pigz/Makefile index e6d735fc918a..15e2e3c7dc7a 100644 --- a/archivers/pigz/Makefile +++ b/archivers/pigz/Makefile @@ -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 diff --git a/archivers/pigz/files/patch-Makefile b/archivers/pigz/files/patch-Makefile deleted file mode 100644 index a7686e98d0f5..000000000000 --- a/archivers/pigz/files/patch-Makefile +++ /dev/null @@ -1,9 +0,0 @@ ---- ./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 -+all: dev - - - 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 |