Mon Jul 30 07:03:46 2012 UTC ()
+ Change the AMANADA_USER to 'amandabackup' to be consistent with other
  packages (and because I think its a good idea).
+ Remove legacy varable AMANDA_SMB.


(sbd)
diff -r1.214 -r1.215 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.214 -r1.215 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2012/07/09 15:44:06 1.214
+++ pkgsrc/mk/defaults/mk.conf 2012/07/30 07:03:46 1.215
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.214 2012/07/09 15:44:06 wiz Exp $ 1# $NetBSD: mk.conf,v 1.215 2012/07/30 07:03:46 sbd 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
@@ -588,33 +588,27 @@ WARN_NO_OBJECT_FMT?=yes @@ -588,33 +588,27 @@ WARN_NO_OBJECT_FMT?=yes
588# Directory where local patches are stored. See pkgsrc/doc/pkgsrc.txt. 588# Directory where local patches are stored. See pkgsrc/doc/pkgsrc.txt.
589# Possible: Any local directory 589# Possible: Any local directory
590# Default: none 590# Default: none
591 591
592# 592#
593# Definitions used only in the packages collection 593# Definitions used only in the packages collection
594# 594#
595 595
596#ACROREAD_FONTPATH?= ${PREFIX}/lib/X11/fonts/TTF 596#ACROREAD_FONTPATH?= ${PREFIX}/lib/X11/fonts/TTF
597# Colon separated list of additional directories for acroread7 to 597# Colon separated list of additional directories for acroread7 to
598# look in for TTF/Type1 fonts. 598# look in for TTF/Type1 fonts.
599# Default: ${PREFIX}/lib/X11/fonts/TTF 599# Default: ${PREFIX}/lib/X11/fonts/TTF
600 600
601#AMANDA_SMB= 601AMANDA_USER?= amandabackup
602# Used in amanda-client and amanda-dev-client to enable backup with 
603# smbclient. 
604# Possible: defined, not defined 
605# Default: not defined 
606 
607AMANDA_USER?= backup 
608# Used in the amanda packages to specify the login user and group 602# Used in the amanda packages to specify the login user and group
609# responsible for backups. 603# responsible for backups.
610# Possible: any user name 604# Possible: any user name
611# Default: backup 605# Default: backup
612 606
613AMANDA_TMP?= /tmp/amanda 607AMANDA_TMP?= /tmp/amanda
614# Specifies the directory in which amanda puts its debug and temporary 608# Specifies the directory in which amanda puts its debug and temporary
615# files. 609# files.
616# Default: /tmp/amanda 610# Default: /tmp/amanda
617 611
618AMANDA_VAR?= ${VARBASE}/amanda 612AMANDA_VAR?= ${VARBASE}/amanda
619# Specifies the directory in which amanda puts its logs and status 613# Specifies the directory in which amanda puts its logs and status
620# files. 614# files.