Sun Apr 16 14:38:21 2017 UTC ()
Pullup ticket #5261 - requested by sevan
mk/defaults/mk.conf: bugfix

Revisions pulled up:
- mk/defaults/mk.conf                                           1.273

---
   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Sun Apr  9 20:44:41 UTC 2017

   Modified Files:
           pkgsrc/mk/defaults: mk.conf

   Log Message:
   xz is a valid compression algorithm.


(bsiegert)
diff -r1.271 -r1.271.2.1 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.271 -r1.271.2.1 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2017/03/21 13:04:14 1.271
+++ pkgsrc/mk/defaults/mk.conf 2017/04/16 14:38:21 1.271.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.271 2017/03/21 13:04:14 schmonz Exp $ 1# $NetBSD: mk.conf,v 1.271.2.1 2017/04/16 14:38:21 bsiegert Exp $
2# 2#
3 3
4# This file provides default values for variables that may be overridden 4# This file provides default values for variables that may be overridden
5# in the MAKECONF file, which is /etc/mk.conf by default. 5# in the MAKECONF file, which is /etc/mk.conf by default.
6# 6#
7# Note: This file is included after the MAKECONF file, so you cannot query 7# Note: This file is included after the MAKECONF file, so you cannot query
8# these default values in the MAKECONF using the ".if" and ".for" 8# these default values in the MAKECONF using the ".if" and ".for"
9# preprocessing directives. 9# preprocessing directives.
10 10
11# ************************************************************************ 11# ************************************************************************
12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS. 12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
13# ************************************************************************ 13# ************************************************************************
14 14
@@ -95,27 +95,27 @@ GZIP?= -9 @@ -95,27 +95,27 @@ GZIP?= -9
95# certificate to use when signing packages with an X509 certificate. 95# certificate to use when signing packages with an X509 certificate.
96# Possible: pathname to the X509 certificate, not defined 96# Possible: pathname to the X509 certificate, not defined
97# Default: not defined 97# Default: not defined
98 98
99.if ${PKG_DEVELOPER:Uno} != "no" 99.if ${PKG_DEVELOPER:Uno} != "no"
100PATCH_DEBUG?= 100PATCH_DEBUG?=
101.endif 101.endif
102# Used to debug patches as they are applied 102# Used to debug patches as they are applied
103# Possible: defined, not defined 103# Possible: defined, not defined
104# Default: not defined 104# Default: not defined
105 105
106PKG_COMPRESSION?= gzip 106PKG_COMPRESSION?= gzip
107# Compression algorithm for binary packages. 107# Compression algorithm for binary packages.
108# Possible: gzip, bzip2, none 108# Possible: gzip, bzip2, xz, none
109# Default: gzip 109# Default: gzip
110# Supersedes the PKG_SUFX option and keeps the name consistent. 110# Supersedes the PKG_SUFX option and keeps the name consistent.
111 111
112PKGSRC_LOCKTYPE?= none 112PKGSRC_LOCKTYPE?= none
113# The type of locking that will be done if competing processes 113# The type of locking that will be done if competing processes
114# attempt to do work on one package directory simultaneously. 114# attempt to do work on one package directory simultaneously.
115# 115#
116# Possible values: 116# Possible values:
117# * none: No locking takes place at all. 117# * none: No locking takes place at all.
118# * once: When the lock has already been aquired by another 118# * once: When the lock has already been aquired by another
119# process, the current process is terminated. 119# process, the current process is terminated.
120# * sleep: When the lock has already been acquired by another 120# * sleep: When the lock has already been acquired by another
121# process, the current process will sleep for PKGSRC_SLEEPSECS 121# process, the current process will sleep for PKGSRC_SLEEPSECS