CVS commit: src/external/zlib/pigz/bin/pigz
Module Name:src
Committed By: christos
Date: Tue Apr 7 17:48:13 UTC 2015
Modified Files:
src/external/zlib/pigz/bin/pigz: Makefile
Log Message:
From: Joachim Henke
In -current, build.sh fails due to missing zless/zless.1. The attached
patch brings external/zlib/pigz/bin/pigz/Makefile in sync with
usr.bin/gzip/Makefile, which fixes the build.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/zlib/pigz/bin/pigz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/zlib/pigz/bin/pigz/Makefile
diff -u src/external/zlib/pigz/bin/pigz/Makefile:1.8 src/external/zlib/pigz/bin/pigz/Makefile:1.9
--- src/external/zlib/pigz/bin/pigz/Makefile:1.8 Sun Jun 15 13:54:55 2014
+++ src/external/zlib/pigz/bin/pigz/Makefile Tue Apr 7 13:48:13 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/06/15 17:54:55 tls Exp $
+# $NetBSD: Makefile,v 1.9 2015/04/07 17:48:13 christos Exp $
.include bsd.own.mk
@@ -33,7 +33,8 @@ MLINKS+= pigz.1 gzip.1 \
pigz.1 zcat.1 \
zdiff.1 zcmp.1 \
zgrep.1 zegrep.1 \
- zgrep.1 zfgrep.1
+ zgrep.1 zfgrep.1 \
+ zmore.1 zless.1
LINKS+= ${BINDIR}/pigz ${BINDIR}/gzip \
${BINDIR}/pigz ${BINDIR}/gunzip \
@@ -41,7 +42,8 @@ LINKS+= ${BINDIR}/pigz ${BINDIR}/gzip \
${BINDIR}/pigz ${BINDIR}/zcat \
${BINDIR}/zdiff ${BINDIR}/zcmp \
${BINDIR}/zgrep ${BINDIR}/zegrep \
- ${BINDIR}/zgrep ${BINDIR}/zfgrep
+ ${BINDIR}/zgrep ${BINDIR}/zfgrep \
+ ${BINDIR}/zmore ${BINDIR}/zless
.endif
.include bsd.prog.mk
CVS commit: src/external/zlib/pigz/bin/pigz
Module Name:src
Committed By: tls
Date: Sun Jun 15 17:54:55 UTC 2014
Modified Files:
src/external/zlib/pigz/bin/pigz: Makefile
Log Message:
Update pigz to 2.3.1
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/zlib/pigz/bin/pigz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/zlib/pigz/bin/pigz/Makefile
diff -u src/external/zlib/pigz/bin/pigz/Makefile:1.7 src/external/zlib/pigz/bin/pigz/Makefile:1.8
--- src/external/zlib/pigz/bin/pigz/Makefile:1.7 Thu May 26 12:56:27 2011
+++ src/external/zlib/pigz/bin/pigz/Makefile Sun Jun 15 17:54:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/05/26 12:56:27 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/15 17:54:55 tls Exp $
.include bsd.own.mk
@@ -12,10 +12,14 @@ PROG= pigz
SRCS= pigz.c yarn.c
MAN= pigz.1
+# pigz 2.3.1 brings zopfli support
+SRCS+= deflate.c blocksplitter.c tree.c lz77.c cache.c hash.c util.c \
+ squeeze.c katajainen.c
+
.if !defined(HOSTPROG)
DPADD= ${LIBM} ${LIBPTHREAD}
.endif
-LDADD= -lz -lpthread
+LDADD= -lm -lz -lpthread
.if ${MKPIGZGZIP} != no
# these ones are from mrg's gzip
@@ -43,7 +47,7 @@ LINKS+= ${BINDIR}/pigz ${BINDIR}/gzip \
.include bsd.prog.mk
DIST= ${NETBSDSRCDIR}/external/zlib/pigz/dist
-.PATH: ${DIST}
+.PATH: ${DIST} ${DIST}/zopfli
.if ${MKPIGZGZIP} != no
GZIPDIST= ${NETBSDSRCDIR}/usr.bin/gzip
CVS commit: src/external/zlib/pigz/bin/pigz
Module Name:src
Committed By: lukem
Date: Tue Nov 9 00:11:37 UTC 2010
Modified Files:
src/external/zlib/pigz/bin/pigz: Makefile
Log Message:
Don't set DPADD for HOSTPROGs
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/zlib/pigz/bin/pigz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/zlib/pigz/bin/pigz/Makefile
diff -u src/external/zlib/pigz/bin/pigz/Makefile:1.5 src/external/zlib/pigz/bin/pigz/Makefile:1.6
--- src/external/zlib/pigz/bin/pigz/Makefile:1.5 Sat Jun 19 07:33:58 2010
+++ src/external/zlib/pigz/bin/pigz/Makefile Tue Nov 9 00:11:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/06/19 07:33:58 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/09 00:11:37 lukem Exp $
.include bsd.own.mk
@@ -10,7 +10,9 @@
SRCS= pigz.c yarn.c
MAN= pigz.1
+.if !defined(HOSTPROG)
DPADD= ${LIBM} ${LIBPTHREAD}
+.endif
LDADD= -lz -lpthread
.if ${MKPIGZGZIP} != no
CVS commit: src/external/zlib/pigz/bin/pigz
Module Name:src
Committed By: mrg
Date: Sat Jun 19 07:33:58 UTC 2010
Modified Files:
src/external/zlib/pigz/bin/pigz: Makefile
Log Message:
kill the broken !HOSTPROG segment.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/zlib/pigz/bin/pigz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/zlib/pigz/bin/pigz/Makefile
diff -u src/external/zlib/pigz/bin/pigz/Makefile:1.4 src/external/zlib/pigz/bin/pigz/Makefile:1.5
--- src/external/zlib/pigz/bin/pigz/Makefile:1.4 Sat Jun 19 03:50:31 2010
+++ src/external/zlib/pigz/bin/pigz/Makefile Sat Jun 19 07:33:58 2010
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/06/19 03:50:31 mrg Exp $
-
-.ifndef HOSTPROG
+# $NetBSD: Makefile,v 1.5 2010/06/19 07:33:58 mrg Exp $
.include bsd.own.mk
@@ -42,25 +40,8 @@
DIST= ${NETBSDSRCDIR}/external/zlib/pigz/dist
.PATH: ${DIST}
+
.if ${MKPIGZGZIP} != no
GZIPDIST= ${NETBSDSRCDIR}/usr.bin/gzip
.PATH: ${GZIPDIST}
.endif
-
-.else # HOSTPROG
-
-SRCS= pigz.c
-
-HOST_LDFLAGS= -lz
-
-#HAVE_PTHREAD_H!= if echo '#include pthread.h' | ${HOST_CC} -E - /dev/null; then echo yes; else echo no; fi
-HAVE_PTHREAD_H?= yes
-
-.if ${HAVE_PTHREAD_H} != no
-SRCS+= yarn.c
-HOST_LDFLAGS+= -lpthread
-.else
-HOST_CPPFLAGS+= -DNOTHREAD
-.endif
-
-.endif # HOSTPROG
CVS commit: src/external/zlib/pigz/bin/pigz
Module Name:src
Committed By: mrg
Date: Thu Jun 17 06:10:44 UTC 2010
Added Files:
src/external/zlib/pigz/bin/pigz: Makefile
Log Message:
cross build infrastructure for pigz.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/zlib/pigz/bin/pigz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/zlib/pigz/bin/pigz/Makefile
diff -u /dev/null src/external/zlib/pigz/bin/pigz/Makefile:1.1
--- /dev/null Thu Jun 17 06:10:44 2010
+++ src/external/zlib/pigz/bin/pigz/Makefile Thu Jun 17 06:10:44 2010
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2010/06/17 06:10:44 mrg Exp $
+
+NOMAN= 1
+
+PROG= pigz
+SRCS= pigz.c yarn.c
+
+LDADD+= -lz -lpthread
+DPADD+= ${LIBM} ${LIBPTHREAD}
+
+.include bsd.prog.mk
+
+DIST= ${NETBSDSRCDIR}/external/zlib/pigz/dist
+.PATH: ${DIST}
