tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lzip-compressed distfiles



Hello,

GNU project has apparently switched to lzip as default compression method;
OK to commit this?

Index: mk/extract/bsd.extract-vars.mk
===================================================================
RCS file: /vol/1/cvsup/pkgsrc/mk/extract/bsd.extract-vars.mk,v
retrieving revision 1.15
diff -u -r1.15 bsd.extract-vars.mk
--- mk/extract/bsd.extract-vars.mk      12 Apr 2013 12:38:14 -0000      1.15
+++ mk/extract/bsd.extract-vars.mk      21 Aug 2013 11:03:07 -0000
@@ -53,6 +53,9 @@
     !empty(EXTRACT_ONLY:M*.tbz2)
 USE_TOOLS+=    bzcat
 .endif
+.if !empty(EXTRACT_ONLY:M*.lz)
+USE_TOOLS+=    lzip
+.endif
 .if !empty(EXTRACT_ONLY:M*.lzma)
 USE_TOOLS+=    xzcat
 .endif
Index: mk/extract/extract
===================================================================
RCS file: /vol/1/cvsup/pkgsrc/mk/extract/extract,v
retrieving revision 1.15
diff -u -r1.15 extract
--- mk/extract/extract  28 Feb 2013 18:26:22 -0000      1.15
+++ mk/extract/extract  21 Aug 2013 11:07:49 -0000
@@ -108,6 +108,7 @@
 : ${GEM:="gem unpack"}
 : ${GZCAT:="gzip -cd"}
 : ${LHA:=lha}
+: ${LZCAT:="lzip -cd"}
 : ${MKDIR:=mkdir}
 : ${PAX:=pax}
 : ${RM:=rm}
@@ -184,6 +185,7 @@
 *.gz|*.tgz|*.z)                        _cformat=gzip ;;
 *.7z)                          _cformat=7z ;;
 *.bz2|*.tbz|*.tbz2|*.bz)       _cformat=bzip ;;
+*.lz)                          _cformat=lzip ;;
 *.lzma)                                _cformat=lzma ;;
 *.xz)                          _cformat=xz ;;
 *.Z)                           _cformat=compress ;;
@@ -198,6 +200,7 @@
 gzip|compress) decompress_cat="${GZCAT}" ;;
 7z)            decompress_cat="${P7ZA_SO}" ;;
 bzip)          decompress_cat="${BZCAT}" ;;
+lzip)          decompress_cat="${LZCAT}" ;;
 lzma)          decompress_cat="${XZCAT}" ;;
 xz)            decompress_cat="${XZCAT}" ;;
 none)          decompress_cat="${CAT}" ;;
@@ -206,7 +209,7 @@
# Derive the format of the archive based on the file extension.
 case "$distfile" in
-*.tar.gz|*.tgz|*-tar.gz|*_tar.gz|*.tar.bz2|*.tbz|*.tbz2|*.tar.lzma|*.tar.xz|*.tar.Z|*.tar.z|*.tar|*.tar.bz|*.tar.7z)
+*.tar.gz|*.tgz|*-tar.gz|*_tar.gz|*.tar.bz2|*.tbz|*.tbz2|*.tar.lz|*.tar.lzma|*.tar.xz|*.tar.Z|*.tar.z|*.tar|*.tar.bz|*.tar.7z)
                _format=tar ;;
 *.cpio|*.cpio.gz|*.cpio.bz2)
                _format=cpio ;;
Index: mk/tools/replace.mk
===================================================================
RCS file: /vol/1/cvsup/pkgsrc/mk/tools/replace.mk,v
retrieving revision 1.262
diff -u -r1.262 replace.mk
--- mk/tools/replace.mk 12 Sep 2013 10:48:51 -0000      1.262
+++ mk/tools/replace.mk 25 Sep 2013 19:01:10 -0000
@@ -584,6 +584,17 @@
 .  endif
 .endif
+.if !defined(TOOLS_IGNORE.lzip) && !empty(_USE_TOOLS:Mlzip)
+.  if !empty(PKGPATH:Marchivers/lzip)
+MAKEFLAGS+=                    TOOLS_IGNORE.lzip=
+.  elif !empty(_TOOLS_USE_PKGSRC.lzip:M[yY][eE][sS])
+TOOLS_DEPENDS.lzcat?=          lzip>=1.14:../../archivers/lzip
+TOOLS_CREATE+=                 lzip
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.lzip=lzip
+TOOLS_PATH.lzip=               ${TOOLS_PREFIX.lzip}/bin/lzip
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.lzcat) && !empty(_USE_TOOLS:Mlzcat)
 .  if !empty(PKGPATH:Marchivers/xz)
 MAKEFLAGS+=                    TOOLS_IGNORE.lzcat=
--
Sergey Svishchev

Attachment: pgp1MlZ5jtZWs.pgp
Description: PGP signature



Home | Main Index | Thread Index | Old Index