Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 98B767A319 for ; Wed, 4 Jan 2017 15:43:53 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 497478569B; Wed, 4 Jan 2017 15:43:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CE11985694 for ; Wed, 4 Jan 2017 15:43:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Vm8PX5LoPqE0 for ; Wed, 4 Jan 2017 15:43:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D481D84CBD for ; Wed, 4 Jan 2017 15:43:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D2AA3FBA6; Wed, 4 Jan 2017 15:43:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_14835446313730" MIME-Version: 1.0 Date: Wed, 4 Jan 2017 15:43:51 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/archivers/lz4 To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20170104154351.D2AA3FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_14835446313730 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Wed Jan 4 15:43:51 UTC 2017 Modified Files: pkgsrc/archivers/lz4: Makefile PLIST distinfo pkgsrc/archivers/lz4/patches: patch-lib_Makefile patch-programs_Makefile Log Message: Update archivers/lz4 to 1.7.5. - lz4hc : new high compression mode : levels 10-12 compress more and slower - lz4cat : fix : works with relative path (#284) and stdin (#285) - cli : fix minor notification when using -r recursive mode - API : lz4frame : LZ4F_frameBound(0) gives upper bound of *flush() and *End() operations - doc : markdown version of man page - build : Makefile : fix make -jX lib+exe concurrency - build : cmake : improvements by Michal Gorny To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/lz4/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/lz4/PLIST cvs rdiff -u -r1.9 -r1.10 pkgsrc/archivers/lz4/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/archivers/lz4/patches/patch-lib_Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/archivers/lz4/patches/patch-programs_Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_14835446313730 Content-Disposition: inline Content-Length: 10717 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/lz4/Makefile diff -u pkgsrc/archivers/lz4/Makefile:1.8 pkgsrc/archivers/lz4/Makefile:1.9 --- pkgsrc/archivers/lz4/Makefile:1.8 Wed Dec 7 21:34:58 2016 +++ pkgsrc/archivers/lz4/Makefile Wed Jan 4 15:43:51 2017 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2016/12/07 21:34:58 fhajny Exp $ +# $NetBSD: Makefile,v 1.9 2017/01/04 15:43:51 fhajny Exp $ -DISTNAME= lz4-1.7.4.2 +DISTNAME= lz4-1.7.5 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GITHUB:=lz4/} Index: pkgsrc/archivers/lz4/PLIST diff -u pkgsrc/archivers/lz4/PLIST:1.7 pkgsrc/archivers/lz4/PLIST:1.8 --- pkgsrc/archivers/lz4/PLIST:1.7 Wed Dec 7 21:34:58 2016 +++ pkgsrc/archivers/lz4/PLIST Wed Jan 4 15:43:51 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2016/12/07 21:34:58 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.8 2017/01/04 15:43:51 fhajny Exp $ bin/lz4 bin/lz4c bin/lz4cat @@ -9,7 +9,7 @@ include/lz4hc.h lib/liblz4.a lib/liblz4.so lib/liblz4.so.1 -lib/liblz4.so.1.7.4 +lib/liblz4.so.${PKGVERSION} lib/pkgconfig/liblz4.pc man/man1/lz4.1 man/man1/lz4c.1 Index: pkgsrc/archivers/lz4/distinfo diff -u pkgsrc/archivers/lz4/distinfo:1.9 pkgsrc/archivers/lz4/distinfo:1.10 --- pkgsrc/archivers/lz4/distinfo:1.9 Wed Dec 7 21:34:58 2016 +++ pkgsrc/archivers/lz4/distinfo Wed Jan 4 15:43:51 2017 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2016/12/07 21:34:58 fhajny Exp $ +$NetBSD: distinfo,v 1.10 2017/01/04 15:43:51 fhajny Exp $ -SHA1 (lz4-1.7.4.2.tar.gz) = ce5fdcb24016312d8932b78f91dc857da9433272 -RMD160 (lz4-1.7.4.2.tar.gz) = 6a3c781f094f99adc5a11542ff0f2b75ab63c579 -SHA512 (lz4-1.7.4.2.tar.gz) = 24fc8615767bc9d3e11f9dbe4e6d6d63bf7e9c8fb782e1d58063df221b6e6fe3a6ea4cc49a25d9500d35f2dd9c5a80ea3f352c52282aa0e1a373e277d2a00072 -Size (lz4-1.7.4.2.tar.gz) = 200956 bytes +SHA1 (lz4-1.7.5.tar.gz) = a710a7d45beb0951806d2b98f0c1739107e97c14 +RMD160 (lz4-1.7.5.tar.gz) = ff25713033480dead389241f572f327cb6afe175 +SHA512 (lz4-1.7.5.tar.gz) = b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295 +Size (lz4-1.7.5.tar.gz) = 208019 bytes SHA1 (patch-Makefile) = 8519985405e6f2c0ef63cc39129b00c9867382f9 -SHA1 (patch-lib_Makefile) = a1de969ed0beb64859937c375ba6f2111d055fb6 -SHA1 (patch-programs_Makefile) = 67bc0a21bb24d8ab86b5c060e3f9311c556fe228 +SHA1 (patch-lib_Makefile) = 016fbc604e6c121fd2eb9d3aba5be40373c6de60 +SHA1 (patch-programs_Makefile) = 1bf3864515a1276cbad516ebd519caa918b847b2 Index: pkgsrc/archivers/lz4/patches/patch-lib_Makefile diff -u pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.3 pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.4 --- pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.3 Wed Dec 7 21:34:58 2016 +++ pkgsrc/archivers/lz4/patches/patch-lib_Makefile Wed Jan 4 15:43:51 2017 @@ -1,8 +1,8 @@ -$NetBSD: patch-lib_Makefile,v 1.3 2016/12/07 21:34:58 fhajny Exp $ +$NetBSD: patch-lib_Makefile,v 1.4 2017/01/04 15:43:51 fhajny Exp $ Make portable. Unlock install target. Use pkgsrc install scripts. ---- lib/Makefile.orig 2016-11-22 20:34:17.000000000 +0000 +--- lib/Makefile.orig 2017-01-03 05:09:52.000000000 +0000 +++ lib/Makefile @@ -31,9 +31,9 @@ # ################################################################ @@ -17,14 +17,19 @@ Make portable. Unlock install target. Us LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT) LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT)) LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) -@@ -107,31 +107,27 @@ clean: +@@ -107,11 +107,6 @@ clean: @echo Cleaning library completed --#------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD, Hurd and --#FreeBSD targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD)) +-#----------------------------------------------------------------------------- +-# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets +-#----------------------------------------------------------------------------- +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) +- + ifneq (,$(filter $(shell uname),SunOS)) + INSTALL ?= ginstall + else +@@ -134,26 +129,26 @@ INSTALL_DATA ?= $(INSTALL) -m 644 liblz4.pc: liblz4.pc.in Makefile @echo creating pkgconfig @@ -39,28 +44,30 @@ Make portable. Unlock install target. Us $< >$@ install: lib liblz4.pc -- @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ -- @install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) -+ $(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ -+ $(BSD_INSTALL_LIB) -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) - @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) - @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) -- @install -m 644 liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ -+ $(BSD_INSTALL_DATA) -m 644 liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ +- @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ +- @$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/ ++ @$(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ ++ @$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/ + @echo Installing libraries ifeq ($(BUILD_STATIC),yes) -- @install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a -+ $(BSD_INSTALL_DATA) -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a +- @$(INSTALL_LIB) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a ++ @$(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a endif -- @install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h -- @install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h -- @install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h -+ $(BSD_INSTALL_DATA) -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h -+ $(BSD_INSTALL_DATA) -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h -+ $(BSD_INSTALL_DATA) -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h +- @$(INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) ++ @$(BSD_INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) + @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) + @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) + @echo Installing includes +- @$(INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h +- @$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h +- @$(INSTALL_DATA) lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ++ @$(BSD_INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h ++ @$(BSD_INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ++ @$(BSD_INSTALL_DATA) lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h @echo lz4 static and shared libraries installed uninstall: -@@ -145,4 +141,3 @@ uninstall: +@@ -167,4 +162,3 @@ uninstall: @$(RM) $(DESTDIR)$(INCLUDEDIR)/lz4frame.h @echo lz4 libraries successfully uninstalled Index: pkgsrc/archivers/lz4/patches/patch-programs_Makefile diff -u pkgsrc/archivers/lz4/patches/patch-programs_Makefile:1.6 pkgsrc/archivers/lz4/patches/patch-programs_Makefile:1.7 --- pkgsrc/archivers/lz4/patches/patch-programs_Makefile:1.6 Wed Dec 7 21:34:58 2016 +++ pkgsrc/archivers/lz4/patches/patch-programs_Makefile Wed Jan 4 15:43:51 2017 @@ -1,44 +1,53 @@ -$NetBSD: patch-programs_Makefile,v 1.6 2016/12/07 21:34:58 fhajny Exp $ +$NetBSD: patch-programs_Makefile,v 1.7 2017/01/04 15:43:51 fhajny Exp $ Unlock install target. Use pkgsrc install scripts. ---- programs/Makefile.orig 2016-11-22 20:34:17.000000000 +0000 +--- programs/Makefile.orig 2017-01-03 05:09:52.000000000 +0000 +++ programs/Makefile -@@ -30,7 +30,7 @@ +@@ -108,11 +108,6 @@ preview-man: clean-man man + man ./lz4.1 + + +-#----------------------------------------------------------------------------- +-# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets +-#----------------------------------------------------------------------------- +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) +- + unlz4: lz4 + ln -s lz4 unlz4 + +@@ -130,11 +125,7 @@ PREFIX ?= /usr/local DESTDIR ?= - PREFIX ?= /usr/local - BINDIR := $(PREFIX)/bin --MANDIR := $(PREFIX)/share/man/man1 -+MANDIR := $(PREFIX)/$(PKGMANDIR)/man1 - LZ4DIR := ../lib - VOID := /dev/null - -@@ -80,20 +80,16 @@ clean: - @echo Cleaning completed + BINDIR ?= $(PREFIX)/bin +-ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS)) +-MANDIR ?= $(PREFIX)/man/man1 +-else +-MANDIR ?= $(PREFIX)/share/man/man1 +-endif ++MANDIR ?= $(PREFIX)/$(PKGMANDIR)/man1 --#------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD, Hurd and --#FreeBSD targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD)) + INSTALL_PROGRAM ?= $(INSTALL) -m 755 + INSTALL_SCRIPT ?= $(INSTALL) -m 755 +@@ -143,13 +134,13 @@ INSTALL_MAN ?= $(INSTALL) -m 644 install: lz4$(EXT) lz4c$(EXT) @echo Installing binaries -- @install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ -- @install -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT) -+ $(BSD_INSTALL_PROGRAM_DIR) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ -+ $(BSD_INSTALL_PROGRAM) -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT) - @ln -sf lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4cat$(EXT) - @ln -sf lz4$(EXT) $(DESTDIR)$(BINDIR)/unlz4$(EXT) -- @install -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT) -+ $(BSD_INSTALL_PROGRAM) -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT) +- @$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ +- @$(INSTALL_PROGRAM) lz4 $(DESTDIR)$(BINDIR)/lz4 ++ @$(BSD_INSTALL_PROGRAM_DIR) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ ++ @$(BSD_INSTALL_PROGRAM) lz4 $(DESTDIR)$(BINDIR)/lz4 + @ln -sf lz4 $(DESTDIR)$(BINDIR)/lz4cat + @ln -sf lz4 $(DESTDIR)$(BINDIR)/unlz4 +- @$(INSTALL_PROGRAM) lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c ++ @$(BSD_INSTALL_PROGRAM) lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c @echo Installing man pages -- @install -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1 -+ $(BSD_INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1 +- @$(INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1 ++ @$(BSD_INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1 @ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4c.1 @ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4cat.1 @ln -sf lz4.1 $(DESTDIR)$(MANDIR)/unlz4.1 -@@ -110,4 +106,3 @@ uninstall: +@@ -166,4 +157,3 @@ uninstall: @$(RM) $(DESTDIR)$(MANDIR)/unlz4.1 @echo lz4 programs successfully uninstalled --_----------=_14835446313730--