Add a new bsd.pkg.defaults.mk file, derived from the old mk.conf.example.

This file is "included" automatically before <bsd.own.mk> includes
/etc/mk.conf, so that pkgsrc-wide default values are set.

It is now possible just to set values in mk.conf only where they differ
from the default, thereby easing the problems of updating mk.conf when
new values get added.

2 files changed, 1150 insertions, 1 deletions

diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
new file mode 100644
index 00000000000..20dba42538b
--- /dev/null
+++ b/mk/bsd.pkg.defaults.mk
@@ -0,0 +1,1140 @@
+# $NetBSD: bsd.pkg.defaults.mk,v 1.1 2001/09/18 21:30:05 agc Exp $
+#
+
+# A file providing defaults for pkgsrc and the packages collection.
+# See the NetBSD mk.conf(5) and packages(7) manual page for a full
+# description of all available options.
+#
+
+# ************************************************************************
+# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
+# ************************************************************************
+
+#MANZ=
+# gzip manual pages at installation time
+# Possible: defined, not defined
+# Default: not defined
+
+#MKCRYPTO= no
+# If not YES or yes, don't fetch, build or install crypto packages.
+# Possible: not defined, no
+# Default: yes
+
+#OBJMACHINE=
+# use machine-specific object directories, e.g.  work.i386, work.sparc
+# Possible: defined, not defined
+# Default: not defined
+
+#USETBL=
+# Run raw manual pages through tbl(1) before piping through troff(1)
+# when formatting manual pages.
+# Possible: defined, not defined
+# Default: not defined
+
+
+#
+# The following values are used to manage the packages collection as a whole.
+#
+
+#PKG_DEVELOPER=	yes
+# Run a sanity check that package developers want:
+#  * run check-shlibs to see that all binaries will find their libs
+# Possible: defined, not defined
+# Default: not defined
+
+#WRKOBJDIR=	/usr/tmp
+# build here instead of in pkgsrc
+# Possible: any path
+# Default: not defined
+
+LOCALBASE?=	/usr/pkg
+# Where non-X-based packages will be installed
+# Possible: any path
+# Default: /usr/pkg
+
+CROSSBASE?=	${LOCALBASE}/cross
+# Where "cross" category packages install
+# Possible: any path
+# Default: ${LOCALBASE}/cross
+
+X11BASE=	/usr/X11R6
+# Where X11 is installed on the system.
+# (and the default install path of X11 pkgs)
+# Possible: any path
+# Default: /usr/X11R6
+
+MOTIFBASE?=	/usr/X11R6
+# Where Motif is installed on the system.
+# Possible: any path
+# Default: /usr/X11R6
+
+DISTDIR?=	${PKGSRCDIR}/distfiles
+# Directory where original distribution
+# files are stored.
+# Possible: any path you like
+# Default: /usr/pkgsrc/distfiles
+
+#DIST_PATH=	/cdrom/0/distfiles:${HOME}/distfiles
+# colon-delimited list of directories in which to search for
+# ${DISTFILES} and ${PATCHFILES}.  If the requested file is not in any
+# of the directories in ${DIST_PATH}, it will be downloaded into
+# ${DISTDIR}.  If the requested file is in one of the directories in
+# ${DIST_PATH}, a symbolic link will be made to it from ${DISTDIR}. 
+# ${DIST_PATH} directories will will be searched before ${DISTDIR},
+# letting a CD hold the main distfiles archive, and local ${DISTDIR}
+# hold any updated distfiles, for example.
+# Possible:  any directories
+# Default: none
+
+PACKAGES?=       ${PKGSRCDIR}/packages
+# Store generated packages on a per-architecture base
+# Possible: any path you like
+# Default: /usr/pkgsrc/packages
+
+#PASSIVE_FETCH=
+# Use ftp(1) in passive mode, for use behind filtering firewalls. 
+# (Set by default in ftp(1) in NetBSD-current)
+# Possible: defined, not defined
+# Default: not defined
+
+PATCH_FUZZ_FACTOR?= -F0
+# Fuzz factor to use when applying patches.  Will only be applied when
+# using a patch(1) that understands -F.  This should be a "?="
+# setting, since package Makefiles may set this value, before
+# /etc/mk.conf is read.
+# Possible: "-Fn" where n is a number, none
+# Default: "-F0"
+
+#ACCEPTABLE_LICENSES=	fee-based-commercial-use no-commercial-use \
+# 			no-profit limited-redistribution shareware
+# Whitespace-delimited list of the types of license which are
+# acceptable for installation.  (apart from standard "free" licenses
+# such as Berkeley/CMU and GPL).  Possible values are presented below.
+#
+# Default: none
+
+#ACCEPTABLE_LICENSES+=	adobe-acrobat-license
+# Enable it if you accept the usage policy for Adobe Acrobat
+# and would like to build it.  see pkgsrc/print/acroread.
+#ACCEPTABLE_LICENSES+=	citrix_ica-license
+# Enable it if you accept the license proposed at
+# http://www.citrix.com/download/unix-downloads.htm
+# when you try to download the corresponding client to download and build
+# the package.
+#ACCEPTABLE_LICENSES+=	csound-license
+# Enable it if you accept the redistribution/use license for csound and would
+# like to build csound.  see pkgsrc/licenses/csound-license
+#ACCEPTABLE_LICENSES+=	fee-based-commercial-use
+# Enable it if you are okay to build/use third-party software, which require
+# fees for commercial use (i.e. you are willing to pay, or you are
+# non-commercial).
+#ACCEPTABLE_LICENSES+=	kermit-license
+# Enable it if you accept the redistribution license for ckermit and would
+# like to build ckermit.  see pkgsrc/licenses/kermit-license
+#ACCEPTABLE_LICENSES+=	limited-redistribution
+# Enable it if you are okay to build/use third-party software, which has
+# restriction on redistribution (i.e. you will obey the restriction on
+# redistribution it imposes).
+#ACCEPTABLE_LICENSES+=	maude-license
+# Enable it if you filled out and returned the license found at
+# http://maude.csl.sri.com/license/license.html
+# and want to build maude.
+#ACCEPTABLE_LICENSES+=	no-commercial-use
+# Enable it if you are okay to build/use third-party software, which is not
+# for commercial use (i.e. you are non-commerical)
+#ACCEPTABLE_LICENSES+=	no-profit
+# Enable it if you are okay to build/use third-party software, which is not
+# for for-profit use (i.e. you will use the software for non-profit purpose)
+#ACCEPTABLE_LICENSES+=	opera-license
+# Enable it if you accept the redistribution license for opera and would
+# like to build opera.  see pkgsrc/licenses/opera-license
+#ACCEPTABLE_LICENSES+=	palmos-sdk-license
+# Enable if you agree with the license for using the PalmOS SDK.
+# Used by pkgsrc/devel/palmos-includes. For the license, see
+# pkgsrc/licenses/palmos-sdk-license.
+#ACCEPTABLE_LICENSES+=	shareware
+# Enable it if you are okay to build/use shareware.
+#ACCEPTABLE_LICENSES+=	sun-jsdk20-license
+# Enable it if you accept the download license for Sun JSDK and would
+# like to build Sun JSDK.  see pkgsrc/lang/jdk.
+#ACCEPTABLE_LICENSES+= jdk13-license
+# Enable it if you accept the download license for Sun JDK1.3 and would
+# like to build Sun JDK13.  see pkgsrc/langun-jre13.
+#ACCEPTABLE_LICENSES+=	sun-swing-license
+# Enable it if you accept the download license for Sun's Swing (JFC) toolkit
+# and would like to build JFC.  see pkgsrc/x11/swing.
+#ACCEPTABLE_LICENSES+=	unarj-license
+# Enable it if you accept the license terms for the unarj archiver
+# and would like to build unarj.  see pkgsrc/archivers/unarj.
+#ACCEPTABLE_LICENSES+=	unrar-license
+# Enable it if you accept the license terms for the unrar archiver
+# and would like to build unrar.  see pkgsrc/archivers/unrar.
+#ACCEPTABLE_LICENSES+=	zoo-license
+# Enable it if you accept the license terms for the zoo archiver
+# and would like to build zoo.  see pkgsrc/archivers/zoo.
+#ACCEPTABLE_LICENSES+=	emiclock-license
+# Enable it if you accept the license terms for emiclock
+# and would like to build it.  see pkgsrc/time/emiclock.
+#ACCEPTABLE_LICENSES+=	nntpclnt-license
+# Enable it if you accept the license terms for nntpclnt
+# and would like to build nntpclnt.  see pkgsrc/news/nntpclnt.
+#ACCEPTABLE_LICENSES+=	trn-license
+# Enable it if you accept the license terms for trn
+# and would like to build trn.  see pkgsrc/news/trn.
+#ACCEPTABLE_LICENSES+=	cyrus-imapd-license
+# Enable it if you accept the license terms for cyrus-imapd
+# and would like to build cyrus-imapd.  see pkgsrc/mail/cyrus-imapd.
+#ACCEPTABLE_LICENSES+=	majordomo-license
+# Enable it if you accept the license terms for majordomo
+# and would like to build majordomo.  see pkgsrc/mail/majordomo.
+#ACCEPTABLE_LICENSES+=	mush-license
+# Enable it if you accept the license terms for mush
+# and would like to build mush.  see pkgsrc/mail/mush.
+#ACCEPTABLE_LICENSES+=	pine-license
+# Enable it if you accept the license terms for pine
+# and would like to build pine.  see pkgsrc/mail/pine.
+#ACCEPTABLE_LICENSES+=	mosaic-license
+# Enable it if you accept the license terms for mosaic
+# and would like to build mosaic.  see pkgsrc/www/Mosaic.
+#ACCEPTABLE_LICENSES+=	portsentry-license
+# Enable it if you accept the license terms for portsentry
+# and would like to build portsentry.  see pkgsrc/security/portsentry.
+#ACCEPTABLE_LICENSES+=	srp_client-license
+# Enable it if you accept the license terms for srp_client
+# and would like to build srp_client.  see pkgsrc/security/srp_client.
+#ACCEPTABLE_LICENSES+=	jdk-license
+# Enable it if you accept the license terms for jdk
+# and would like to build jdk.  see pkgsrc/lang/jdk.
+#ACCEPTABLE_LICENSES+=	IDEA-licence
+# Enable it if you accept the license terms for libidea
+# and would like to build libidea.  see pkgsrc/security/libidea.
+#ACCEPTABLE_LICENSES+=	amiwm-license
+# Enable it if you accept the license terms for amiwm
+# and would like to build amiwm.  see pkgsrc/wm/amiwm.
+#ACCEPTABLE_LICENSES+=	astrolog-license
+# Enable it if you accept the license terms for astrolog
+# and would like to build astrolog.  see pkgsrc/misc/astrolog.
+
+#SPECIFIC_PKGS=
+# Don't use the default of all packages (from the top-level of the
+# pkgsrc tree), and use the values of the definitions
+# SITE_SPECIFIC_PKGS, HOST_SPECIFIC_PKGS, GROUP_SPECIFIC_PKGS, and
+# USER_SPECIFIC_PKGS.
+# Possible: defined, not defined
+# Default: not defined
+
+#SITE_SPECIFIC_PKGS=
+# List of packages that are wanted for each host on the site.  Each
+# package in the list is of the form <category>/<package>.
+# Possible: any combination of packages
+# Default: not set
+
+#HOST_SPECIFIC_PKGS=
+# List of packages that are wanted for this particular host/machine. 
+# Each package in the list is of the form <category>/<package>.
+# Possible: any combination of packages
+# Default: not set
+
+#GROUP_SPECIFIC_PKGS=
+# List of packages that are wanted for this group of users.  Each
+# package in the list is of the form <category>/<package>.
+# Possible: any combination of packages
+# Default: not set
+
+#USER_SPECIFIC_PKGS=
+# List of packages that are wanted for this particular user.  Each
+# package in the list is of the form <category>/<package>.
+# Possible: any combination of packages
+# Default: not set
+
+#EXTRACT_USING_PAX=
+# Use pax(1) to extract archives, rather than GNU tar.
+# Possible: defined, not defined
+# Default: not defined
+
+#FAILOVER_FETCH=
+# Perform a checksum at "make fetch" time.  If the checksum doesn't
+# match the stored value, try to retrieve the file from the next site
+# in the list
+# Possible:  defined, not defined
+# Default: not defined
+
+#MASTER_SORT=        .ac.at .at .de .ch .se .fi .no
+# Whitespace delimited list of preferred download locations. 
+# MASTER_SITES will be reordered according to the hosts' address last
+# components.
+# Possible: list of domain name suffixes
+# Default: none
+
+#MASTER_SORT_REGEX=  ftp://.*/ 
+# Same as MASTER_SORT, but takes a regular expression for more
+# flexibility in matching.  Regexps defined here have higher priority
+# than MASTER_SORT.  This example would prefer ftp transfers over
+# anything else.
+# Possible: Regexps as in awk(1)
+# Default: none
+
+#PATCH_DEBUG=
+# Used to debug patches as they are applied
+# Possible: defined, not defined
+# Default: not defined
+
+#PKG_FC=
+# The Fortran compiler used to compile Fortran code contained in
+# packages.
+# Possible: any Fortran compiler
+# Default: none
+
+#PRE_ROOT_CMD=${CHMOD} -R o+w ${WRKDIR}
+# Command to be run by normal user, just before becoming root (see
+# SU_CMD) to install the package.  For example, the command shown
+# would allow root to write and modify files below ${WRKDIR}, if on an
+# NFS -noroot file system.
+# Possible: any shell commands
+# Default: none
+
+SU_CMD?=${SU} - root -c
+# Command to perform before "make install", if the user does not have
+# an effective uid of 0.  A possible substitute is "sudo -u root"
+# Possible: su, sudo, or priv, with appropriate arguments
+# Default: ${SU} - root -c
+
+FATAL_OBJECT_FMT_SKEW?=yes
+# If there is a pre-requisite package, which has a different object format
+# from that currently being used, halt execution. One (rare) situation where
+# it is possible for the difference to be harmless is where the pre-requisite
+# package provides an executable, not a library.
+# Possible: yes, no
+# Default: yes
+
+WARN_NO_OBJECT_FMT?=yes
+# Packages installed on a machine before OBJECT_FMT was added to the
+# BUILD_DEFS definitions (on 29th September 1999) cannot say which 
+# object format they are in.  This will cause a warning to be displayed. 
+# Set this to "no" to stop the warning message being shown.
+# Possible: yes, no
+# Default: yes 
+
+#SMART_MESSAGES=yes
+# Display the make(1) target, and the current stack of packages being built,
+# when displaying messages during package builds.
+# Possible: defined, not defined
+# Default: not defined
+
+#BINPKG_SITE=...
+# Whitespace seperated list of URLs for binary packages. Directories
+# "All" etc. are expected in the named place, variables "rel" and
+# "arch" are replaced with OS release ("1.5", ...) and architecture
+# ("mipsel", ...)
+# Possible: any ftp url, see above.
+# Default: ftp://ftp.netbsd.org/pub/NetBSD/packages/$${rel}/$${arch}
+
+#BIN_INSTALL_FLAGS=
+# List of flags passed to pkg_add(8) in the bin_install package.
+# Possible: -v, -u, etc. See pkg_add(8)
+# Default: (no option)
+
+#LOCALPATCHES=...
+# Directory where local patches are stored. See pkgsrc/Packages.txt.
+# Possible: Any local directory
+# Default: none
+
+#
+#	Definitions used only in the packages collection
+#
+
+#AMANDA_SMB=
+# Used in the amanda-client package to enable backup with smbclient
+# Possible: defined, not defined
+# Default: not defined
+
+AMANDA_USER?=	backup
+# Used in the amanda packages to specify the login user and group
+# responsible for backups
+# Possible: any user name
+# Default: backup
+
+AMANDA_VAR?=	/var/amanda
+# Specifies the directory in which amanda puts its logs and status
+# files. 
+# Default: /var/amanda
+
+#APACHE_CUSTOM_CFLAGS=
+# Extra CFLAGS to be passed to the compiler during the Apache build.
+# Possible: any legal compiler flags, e.g. -O6 -DHARD_SERVER_LIMIT=512
+# Default: not defined
+
+#APACHE_PERF_TUNING=	YES
+# Optimize for maximum Apache performance.
+# Possible: not defined, YES
+# Default: not defined
+
+#APACHE_SUEXEC=	YES
+# Enable support Switch User For Exec.  See
+# http://www.apache.org/docs/suexec.html for more informations.
+# Possible: not defined, YES
+# Default: not defined
+
+APACHE_SUEXEC_DOCROOT?=	${LOCALBASE}/share/httpd/htdocs                
+# Specifies the document space in which suexec will be allowed to work.      
+# Possible: Any valid directory                                              
+# Default: ${LOCALBASE}/share/httpd/htdocs                                   
+
+APACHE_SYSCONFDIR?=	${LOCALBASE}/etc/httpd
+# Specifies the location for Apache configuration files.
+# If your ${LOCALBASE} is shared between machines use /etc/httpd
+# or a similar directory that is local to each machine.
+# Possible: Any valid directory
+# Default: ${LOCALBASE}/etc/httpd
+
+APACHE_USER?=	www
+# Used in the apache package to specify the user allowed to execute
+# the `suexec' wrapper.
+# Possible: any user name
+# Default: www
+
+ARLA_CACHE?=	${LOCALBASE}/cache
+# Specifies the location of the cache used by arla. Should be on a local disk.
+# Default: ${LOCALBASE}/cache
+
+#AVIFILE_USE_QT=	YES
+# Enable support for qt2 in avifile-devel package. These utilities will be built
+# in addition to non-qt version: avi{bench,cat,make,recompress,type}.
+# aviplay (qt-based player that uses avifile libraries) will be built too,
+# but it has problems with threads and does not work yet.
+# Default: not defined
+
+#BASH_STATIC=	YES
+# Used in bash2 package to link it statically (for use as a root shell)
+# Possible: not defined, YES
+# Default: not defined
+
+#BATTLEBALL_USE_MESA=
+# Used in battleball to build in support for OpenGL/Mesa. Will use
+# Mesa-glx (rather than Mesa) if Mesa-glx is already installed.
+# Possible: not defined, YES
+# Default: not defined
+
+#BOOTSTRAP_EGCS=
+# Used in egcs-current package to set bootstrap compile (two-stage)
+# mode.
+# Possible: defined, not defined
+# Default: not defined
+
+#BULK_PREREQ=
+# Used during bulk package builds.  Packages listed in this variable are
+# assumed to be required to build all packages.  Only a very limited number
+# of packages belong in this variable.  An example of an appropriate package
+# is pkgtools/xpkgwedge.  Currently pkgtools/digest is always added to this
+# list.
+# Possible: category/pkg
+# Default: not defined
+
+CCLIENT_MBOX_FMT?=	unix
+# Used in imap-uw to set the default format used by c-client programs for new
+# mailbox creation.  Check the UW IMAP documentation for more details
+# regarding the pros and cons of the various mailbox formats.
+#
+# Possible: mbox, mbx, mh, mmdf, mtx, mx, news, phile, tenex, unix
+# Default: unix
+
+CUPS_GROUP?=	sys
+# Used in the cups package to specify the group to run CUPS commands as.
+# Possible: any group name
+# Default: sys
+
+CUPS_USER?=	lp
+# Used in the cups package to specify the user to run CUPS commands as
+# and to create temporary files in the /var/spool/cups/tmp directory.
+# Possible: any user name
+# Default: lp
+
+CYRUS_GROUP?=	mail
+# Used in the cyrus-imapd package to specify the group used for
+# installing setuid programs.
+# Possible: any group name
+# Default: mail
+
+CYRUS_USER?=	cyrus
+# Used in the cyrus-imapd package to specify the userid used for
+# installing setuid programs.
+# Possible: any user name
+# Default: cyrus
+
+#DEFAULT_IRC_SERVER=
+# Used in ircII to set the default irc server. 
+# Possible: see the list at
+# http://www.irchelp.org/irchelp/networks/servers/efnet.html
+# Default: not defined
+
+#DEFAULT_SERIAL_DEVICE=
+# Used to provide a default setting for the serial device for
+# various packages which communicate over the serial port.
+# Possible:  /dev/your_favorite_serial_device
+# Default: defaults for various machine_archs are set in mk/bsd.prefs.mk
+
+DELIVER_SUID?=	NO
+# Used to decide if deliver should be installed suid root.
+# Possible: YES, NO
+# Default: NO
+
+DT_LAYOUT?= US
+# Used by dt package to specify the keyboard layout.
+# Possible: US, FI, FR, GER, DV
+# Default: FI
+
+EMACS_USE_POP?= yes
+# Used by emacs package to determine whether pop support is enabled or not.
+# Possible: yes, no
+# Default: yes
+
+#EMACS_USE_X=
+# Used by emacs package to determine whether X support is enabled or not.
+# If defined, the value is directly passed as argument of --with-x.
+# If not defined, the configure script will configure automatically.
+# Possible: yes, no, not defined
+# Default: not defined
+
+#EMACS_USE_X_TOOLKIT=
+# Used by emacs package to determine what kind of toolkit support is enabled.
+# If defined, the value is directly passed as argument of --with-x-toolkit.
+# If not defined or defined to yes, the configure script will pick up an
+# appropriate one.  E.g, if X11R5 or later is found, lucid will be used.
+# Possible: yes, no, not defined, athena, lucid, motif
+# Default: not defined
+
+FETCHMAIL_USE_SSL?=	YES
+# Enable SSL in fetchmail (for pop and imap connections)
+# Possible: YES, NO
+# Default: YES
+
+FOX_USE_XUNICODE?=	YES
+# Used in fox to build in support for Unicode by XUnicode. See
+# http://www.ab.wakwak.com/~tino/jatk/fox/ (in japanese) for more information.
+# Possible: YES, NO
+# Default: YES
+
+INN_DATA_DIR?= /var/news
+# Used by inn to specify the data directory.
+# Possible: any path you like
+# Default: /var/news
+
+#IRRD_USE_PGP=
+# Used by irrd package to specify the version of PGP to use, if any.
+# Possible: 5, 2, not defined
+# Default: not defined
+# [XXX: configure will locate pgpv or pgp]
+
+#JB_FQHOSTNAME=
+# Used by jitterbug package to include the fully-qualified domain name
+# of the host.
+# Possible: defined, not defined
+# default: not defined
+
+JB_GROUP?=jitter
+# Used by jitterbug package for groupname
+# Possible: any valid groupname
+# Default: jitter
+
+JB_GROUPID?=509
+# Used by jitterbug package for gid of JB_USER.
+# Possible: any valid gid
+# Default: 509
+
+#JB_LOCALMAIL=
+# Used by jitterbug package as the mail alias to receive mail from
+# jitterbug
+# Possible: any valid mail alias
+# Default: none
+
+JB_PACKAGE?= test
+# Used by jitterbug to determine the type of package to be installed.
+# Possible: test, production
+# Default: test
+
+JB_USER?=jitter
+# Used by jitterbug package for username
+# Possible: any valid username
+# Default: jitter
+
+JB_USERID?=509
+# Used by jitterbug package for uid of JB_USER.
+# Possible: any valid uid
+# Default: 509
+
+JAKARTA_HOME?= ${JAVA_HOME}/jakarta
+# Used by the www/jakarta-tomcat package to choose an install location
+# Possible: any directory
+# Default: ${JAVA_HOME}/jakarta
+
+#JAVA_HOME=
+# Location for packages which install java code
+# Possible: any directory
+# Default: home of JVM chosen by ${PKG_JVM}
+
+JDK_HOME?= ${LOCALBASE}/java
+# Used by the lang/JDK package to choose an install location
+# Possible: any directory, e.g. /usr/jdk
+# Default: ${LOCALBASE}/java
+
+JSDK_HOME?= ${JAVA_HOME}/jsdk
+# Location for Java Servlet Development Kit installed by www/jsdk20
+# Possible: any directory
+# Default: ${JAVA_HOME}/jsdk
+
+#KERBEROS=
+# Used in many packages to specify use of a Kerberos (or compatible)
+# subsystem.  Requires Kerberos libraries in /usr/lib.
+# Possible: defined, not defined
+# Default: not defined
+
+#KERMIT_SUID_UUCP
+# If set to YES or yes, install kermit binary set-uid uucp. Permits an 
+# unprivileged user to access the serial ports, with default permissions
+# on the /dev/tty0* special files.
+# Possible: YES, yes, not defined
+# Default: not defined
+
+#KJS_USE_PCRE=
+# Used in kdelibs2 to determine if kjs (javascript) should use Perl
+# Compatible Regular Expressions (pcre)
+# Possible: yes, not defined
+# Default: not defined
+
+#KNEWS_DOMAIN_FILE=
+# Used in the knews package to set the domain name from the contents
+# of this file.
+# Possible: any valid path
+# Default: none
+
+#KNEWS_DOMAIN_NAME=
+# Used in the knews package to set the domain name.
+# Possible:  almost anything really, usually a FQDN.
+# Default: none
+
+#KTERM_USE_WALLPAPER=
+# Used in kterm package to support wallpaper
+# Possible: not defined, YES
+# Default: not defined
+
+#LAME_USE_GTK=
+# Used in lame package to compile in the graphical analyzer (which uses
+# GTK).
+# Possible: not defined, defined
+# Default: not defined
+
+#LIBWRAP_FWD=
+# Used in ssh package to make libwrap also compare against forwarded
+# connection attempts
+# Possible: not defined, YES
+# Default: not defined
+
+LINUX_LOCALES?=								\
+	 af ar bg br ca cs cy da de el en eo es et eu fi fo fr ga gl \
+	    he hr hu hy id is it ja ka kl ko lo lt lv nl no oc pl pt ro \
+	    ru sk sl sr sv th tr uk vi wa zh
+# Used in linux-locale package to install specify language(s)
+# Possible: af ar bg br ca cs cy da de el en eo es et eu fi fo fr ga gl \
+#	    he hr hu hy id is it ja ka kl ko lo lt lv nl no oc pl pt ro \
+#	    ru sk sl sr sv th tr uk vi wa zh
+# Default: all languages
+
+LPRNG_PRIV_PORTS?=	NO
+# Used by LPRng to require connections to be from privileged ports.
+# Possible: YES, or NO.
+# Default: NO
+
+LPRNG_SUID?=		YES
+# Used by LPRng to enable setuid installation of LPRng binaries.
+# Possible: YES, or NO.
+# Default: YES 
+
+LSOF_MORE_SECURE?=	0
+# Used in lsof to specify that non-root users can only view their own files
+# Possible:	0 (allow non-root users to view all open files), or
+#		1 (only allow root to view all open files)
+# Default: 0
+
+LYNX_SCREEN_LIB?=	slang
+# Used in lynx and lynx-current to set which screen library to use.
+# Possible: slang, ncurses, curses.
+# Default: slang
+
+#M68060=
+# Used mostly by packages (e.g.:  pgp2, ssh) with have fast
+# 68020/030/040 assembler routines for multiprecision arithmetic,
+# which use the 32/64bit mul/div instruction.  These instructions are
+# software emulated on the 68060, thus very slow.  Set to YES when
+# compiling for the 68060 cpu.
+# Possible: not defined, YES.
+# Default: not defined.
+
+MAJORDOMO_GROUP?= majordom
+# Used by the majordomo package as the groupid majordomo runs at.
+# Possible: any
+# Default: majordom
+
+MAJORDOMO_TMPDIR?= /var/tmp
+# Used by the majordomo package as the directory to store temp files.
+# Possible: any directory.
+# Default: /var/tmp
+
+MAJORDOMO_USER?= majordom
+# Used by majordomo package as the userid majordomo runs at.
+# Possible: any
+# Default: majordom
+
+MOTIF_TYPE?=lesstif
+# Used a hint to motif.buildlink.mk for which Motif-compatible installation
+# to use.  This value is ignored if MOTIFBASE is explicitly set.
+# Possible: openmotif, lesstif, dt (for Solaris only)
+# Default: lesstif
+
+#MTOOLS_ENABLE_FLOPPYD=
+# Used by the mtools package to determine whether or not the floppyd
+# program is installed. X11 libraries and header files are needed to
+# build floppyd and run floppyd.
+# Possible: defined, not defined
+# Default: not defined
+
+MUTT_USE_SSL?=	YES
+# Enable SSL in mutt (for pop and imap connections)
+# Possible: YES, NO
+# Default: YES
+
+NMH_EDITOR?= vi
+# default editor for use in nmh.
+# Possible: any editor.
+# Default: vi
+
+NMH_MTA?=	smtp
+# default MTA for use in nmh.
+# Possible: smtp or sendmail.
+# Default: smtp
+
+NMH_PAGER?= more
+# default pager for use in nmh.
+# Possible: any editor.
+# Default: more
+
+NS_ENCRYPTION?=	export
+# Used to decide if export or US version of Netscape should be
+# installed.
+# Possible: export, us
+# Default: export
+
+#NS_PREFERRED=
+# Used by netscape to determine preferred browser to open
+# Possible: not defined, communicator, navigator, mozilla
+# Default: not defined, which implies communicator
+
+#NS_NO_FLASH=
+# Used by navigator/communicator package to decide if flash should be
+# installed or not. By default, flash is installed.
+# Possible: not defined, defined
+# Default: not defined
+
+#NS_USE_BSDI=	YES
+# Used to decide if i386 BSDi Netscape binary should be used in preference 
+# to linux version.
+# Possible: not defined, YES
+# Default: not defined
+
+PALMOS_DEFAULT_SDK?=	3.5
+# Version of PalmOS SDK to use as default.
+# Possible: 1, 2, 3.1, 3.5
+# Default: 3.5
+
+PAPERSIZE?=	A4
+# Default paper size for packages.
+# Possible: A4, Letter, Letterdj.
+# Default: A4
+
+PGGROUP?=	pgsql
+# Used in postgresql package as the groupname of the database
+# administrator
+# Possible: any group name
+# Default: pgsql
+
+PGUSER?=	pgsql
+# Used in postgresql package as the username of the database admin
+# Possible: any user name
+# Default: pgsql
+
+PGHOME?=	${PREFIX}/${PGUSER}
+# Used in postgresql package as the home directory for the database
+# administrator
+# Possible: any valid location
+# Default: ${PREFIX}/${PGUSER}
+
+#PG_MB_ENCODING=	SQL_ASCII
+# Used to postgresql package to define the language encoding of the
+# backend server process.
+# Possible: SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL,
+#	LATIN1, LATIN2, LATIN3, LATIN4, LATIN5, KOI8, WIN, ALT
+# Default: undefined
+
+PHP_CONFDIR?=	${LOCALBASE}/etc
+# Specifies the location for PHP configuration files.
+# If your ${LOCALBASE} is shared between machines use /etc or a similar
+# directory that is local to each machine.
+# Possible: Any valid directory
+# Default: ${LOCALBASE}/etc
+
+PILRC_USE_GTK?=	YES
+# Use gtk+ in pilrc, needed for the UI previewer.
+# Possible: YES, NO
+# Default: YES
+
+#PINE_USE_LDAP=
+# Compile code into pine to use a LDAP server for an address book. 
+# Possible: undefined, YES
+# Default: undefined (support not compiled in)
+
+#PINFO_USE_NATIVE_CURSES=
+# Used in pinfo to use NetBSD native curses, rather than ncurses.
+# Only works on NetBSD-1.5 and newer.
+# Possible: YES, not defined
+# Default: not defined
+
+#PKG_JVM=
+# Used to choose a java virtual machine for packages which use Java.
+# Possible: jdk, sun-jdk, kaffe (kaffe currently has some problems)
+# Default: jdk on NetBSD/i386, kaffe elsewhere
+
+#POPTOP_USE_MPPE=
+# Used in poptop package to specify the use of the mppe-ppp package
+# in preference to the standard ppp
+# Possible: defined, not defined
+# Default: not defined
+
+#POSTFIX_PCRE=YES
+# Add support for Perl Compatible Regular Expressions.
+# Possible: YES, not defined
+# Default: not defined
+
+#POSTFIX_VERP=YES
+# Add support for Variable Envelope Return Paths.
+# Possible: YES, not defined
+# Default: not defined
+
+PRIV_CONF_DIR?=${LOCALBASE}/etc
+# Specify the parent of the directory for pkgsrc/security/priv
+# package's configuration data.
+# Possible: Any valid directory
+# Default: ${LOCALBASE}/etc
+
+#PROCMAIL_MAILSPOOLHOME=.MailBox
+# To default user mailboxes to their home directory,
+# specify the name of the mailbox file.
+# Possible: Any valid filename, not defined
+# Default: not defined
+
+PROCMAIL_TRUSTED_IDS?=0
+# To allow all users to use the "-f" switch set this to 0.
+# Possible: A list of users, terminated by a zero.
+# Default: see Makefile
+
+.if exists(/usr/bin/ssh)
+PVM_SSH?=	/usr/bin/ssh
+.else
+PVM_SSH?=	${LOCALBASE}/bin/ssh
+.endif
+# Specify the rsh/ssh program used by pvm to communicate between
+# systems.
+# Possible:  Any rsh/ssh program.
+# Default:   /usr/bin/ssh if it exists, otherwise ${LOCALBASE}/bin/ssh
+
+QPOPPER_FAC?= LOCAL1
+# Used by qpopper package as the default syslog facility.
+# Possible: syslog(3)'s facility string without preceding "LOG_".
+# Default: LOCAL1
+
+QPOPPER_USER?= pop
+# Used by qpopper package as the owner of apop database and qpopauth
+# command runs at.
+# Possible: any
+# Default: pop
+
+#QPOPPER_SERVERMODE=
+# Used in qpopper package to enable server mode.
+# Possible: defined, not defined
+# Default: not defined
+
+RASMOL_DEPTH?= 8
+# Used in rasmol package to choose display depth to compile the package
+# for, since it only supports one at a time.
+# Possible: 8, 16, 32
+# Default: 8
+
+#SAMBA_WITH_CUPS=
+# Used in the samba package to compile in native support for the UNIX IPP
+# implementation, CUPS.
+# Possible: defined, not defined
+# Default: not defined
+
+#SDL_USE_NAS=
+# Used in SDL package to enable use of the network audio system
+# Possible: defined, not defined
+# Default: not defined
+
+SDIST_PAWD?= pwd
+# If you are using amd you'll want to use pawd instead of pwd to derive
+# the current working directory.
+# Possible: pawd, pwd
+# Default: pwd
+
+#SERIAL_DEVICES=
+# Used to provide a default setting for all the serial devices for
+# various packages which communicate over the serial port.
+# Possible:  /dev/your_favorite_serial_device0 /dev/your_favorite_serial_device1 ...
+# Default: defaults for various machine_archs are set in mk/bsd.prefs.mk
+
+#SPARC_TARGET_ARCH= sparcv7
+# Select SPARC target architecture under Solaris.
+# Possible: sparcv7, sparcv8 or sparcv9.
+# Default: sparcv7
+
+#SQUID_CONFIGURE_ARGS=
+# Used in squid package to set build configuration options.
+# Possible: see "configure --help"
+# Default: --enable-cachemgr-hostname=localhost
+#          --enable-icmp
+#          --enable-ipf-transparent
+#          --enable-snmp
+
+SSH_CONF_DIR?= /etc
+# Used in ssh and openssh to set the configuration directory.
+# Possible: any valid directory
+# Default: /etc
+
+SSH_RSHPATH?= /usr/bin/rsh
+# Used in ssh to specify standard rsh path
+# Possible: path to rsh binary
+# Default: /usr/bin/rsh
+
+SSH_SUID?= NO
+# Used in ssh to enable setuid installation of "ssh" binary.
+# Possible: YES, or NO.
+# Default: NO
+
+SSYNC_PAWD?= pwd
+# If you are using amd you'll want to use pawd instead of pwd to derive
+# the current working directory.
+# Possible: pawd, pwd
+# Default: pwd
+
+TIN_USE_INN_SPOOL?= NO
+# Used to enable reading directly in an inn spool.
+# Possible: YES, or NO.
+# Default: NO
+
+#TEAPOP_WITHOUT_VPOP=
+# Compile teapop without virtual domain support
+# Possible: defined, not defined
+# Default: not defined
+
+#TEAPOP_WITHOUT_APOP=
+# Compile teapop without apop support
+# Possible: defined, not defined
+# Default: not defined
+
+#TEXMFSITE=
+# Used in TeXfamily package which depends on teTeX package to specify
+# site-local texmf configuration.
+# Since teTeX package uses ${PREFIX}/share/texmf directory, TeXfamily
+# package uses ${PREFIX}/share/texmf.local.  Therefore, though you can
+# use /usr/local/share/texmf as TEXMFSITE, it causes a conflict if you
+# set ${PREFIX} to /usr/local.  Use another path in such a case.
+# Possible: any valid path
+# Default: none
+
+USE_CANNA?= YES
+# Used in kinput2 and nvi-m17n to enable Canna kana-kanji converter
+# support.
+# Possible: YES, or NO.
+# Default: YES
+
+USE_CRYPTO?=	YES
+# Used in speakfreely to choose support for encrypted connections.
+# Possible: YES, or NO.
+# Default: YES
+
+USE_DB2= NO
+# Used in sendmail to build with database library 2.x from the db package.
+# Possible: YES, or NO.
+# Default: NO
+
+#USE_GIF=
+# Enable GIF support in qt1.  (disabled per default due to licensing
+# problems; future revisions might have no support at all)
+# Also used by tiff-library to enable LZW compression support.
+# Possible: defined, not defined
+# Default: not defined
+
+#USE_GLX=
+# Use Mesa-glx instead of Mesa
+# Possible: not defined, YES
+# Default: not defined
+
+USE_IDEA?=	NO
+# Used in gnupg, speakfreely, and ssh to choose whether to compile using
+# the patented IDEA encryption algorithm.
+# Possible: YES, or NO.
+# Default: package-dependent
+
+#USE_INET6=
+# Enable IPv6 support on certain packages.  It is safer to leave it undefined
+# in mk.conf and obey the default.  Reasons:
+# - it is just fine to use IPv6-ready packages on top of non-IPv6 kernel
+#   (assuming that you have IPv6-ready headers and libraries)
+# - it may cause some trouble to use a package compiled with USE_INET6=NO,
+#   on top of IPv6-ready kernel
+# Possible: not defined, NO, YES
+# Default: YES on IPv6-ready userland, not defined otherwise
+
+#USE_INN=
+# Used in nn and trn to specify use of "inn" instead of "nntpclnt"
+# package to provide "inews" binary.
+# Possible: not defined, YES
+# Default: not defined
+
+#USE_PAM=
+# Used to specify optional support for PAM authentication
+# Possible: defined, not defined
+# Default: not defined
+
+#USE_RSAREF2=
+# Used in openssl to specify use of the RSA reference package instead of
+# the built-in code for the RSA algorithm. (Not recommended!)
+# Possible: YES, or NO.
+# Default: not defined.
+
+USE_SJ3= YES
+# Used in kinput2 to enable SJ3 kana-kanji converter support.
+# Possible: YES, or NO.
+# Default: YES
+
+#USE_SOCKS=
+# Used to specify SOCKS firewall support
+# Set this to the version of socks necessary.
+# Possible: 4, 5, not defined
+# Default: not defined
+
+USE_WNN4= YES
+# Used in kinput2 to enable FreeWnn (a.k.a.  Wnn4) kana-kanji
+# converter support.
+# Possible: YES, or NO.
+# Default: YES
+
+#USE_XFACE=
+# Used in xemacs package to build in support for xface
+# (pkgsrc/mail/face)
+# Possible: not defined, YES
+# Default: not defined
+
+VTUN_SYSCONFDIR?=	${LOCALBASE}/etc
+# Specifies the location for vtund.conf, the configuration file.
+# If your ${LOCALBASE} is shared between machines use /etc or
+# a similar directory that is local to each machine.
+# Possible: Any valid directory
+# Default: ${LOCALBASE}/etc
+
+WINDOWMAKER_OPTIONS?= gnome kde openlook
+# Options for building windowmaker package. Used to add support for
+# GNOME, KDE or OPEN LOOK(tm) and to avoid redundancies with KDE.
+# Possible: gnome, kde, openlook, lite
+# Default: gnome kde openlook
+
+WINDOWMAKER_THEMES?=	FreeBSD-theme
+# Used in wm-themes package to specify the themes which will be
+# installed.
+# Possible: see http://wm.themes.org/
+# Default: FreeBSD-theme
+
+XAW_TYPE?=standard
+# Used in various packages to specify that libXaw is used.
+# Possible: standard, 3d, xpm
+# Default: standard
+
+#ZIP_ENCRYPTION=
+# Add encryption code to zip1
+# Possible: defined, not defined
+# Default: not defined
+
+#ZSH_STATIC=
+# Build statically linked zsh binary - recommended if used as a login shell
+# Possible: defined, not defined
+# Default: not defined
+
+
+#
+#	Overrides for faster or cheaper sites.
+#
+#	Refer to http://www.netbsd.org/Sites/net.html or /usr/doc/MIRRORS
+#	for information on determining the location of NetBSD mirror sites.
+#
+
+# Australia (AARNET).  Swap order of ftp.au.netbsd.org and
+# ftp2.au.netbsd.org if your link to University of Queensland is
+# cheaper/faster than your link to RMIT University (Melbourne).
+#
+#MASTER_SITE_XCONTRIB=	ftp://mirror.aarnet.edu.au/X11/contrib/
+#MASTER_SITE_GNU=	ftp://mirror.aarnet.edu.au/gnu/
+#MASTER_SITE_PERL_CPAN=	ftp://mirror.aarnet.edu.au/perl/CPAN/modules/by-module/
+#MASTER_SITE_TEX_CTAN=	ftp://mirror.aarnet.edu.au/tex-archive/
+#MASTER_SITE_SUNSITE=	ftp://mirror.aarnet.edu.au/sunsite.unc.edu/
+#MASTER_SITE_BACKUP=	\
+#	ftp://ftp.au.netbsd.org/pub/NetBSD/packages/distfiles/ \
+#	ftp://ftp2.au.netbsd.org/pub/NetBSD/packages/distfiles/
+
+# Austria
+#
+#MASTER_SITE_XCONTRIB=	ftp://ftp.at.netbsd.org/hci/X11/contrib/
+#MASTER_SITE_GNU=	ftp://ftp.at.netbsd.org/gnu/gnusrc/
+#MASTER_SITE_PERL_CPAN=	ftp://ftp.at.netbsd.org/languages/perl/CPAN/modules/by-module/
+#MASTER_SITE_TEX_CTAN=	ftp://ftp.at.netbsd.org/publishing/tex/CTAN/
+#MASTER_SITE_SUNSITE=	ftp://ftp.univie.ac.at/systems/linux/sunsite/
+#MASTER_SITE_BACKUP=	ftp://ftp.at.netbsd.org/opsys/NetBSD/packages/distfiles/
+
+# Denmark
+#
+#MASTER_SITE_GNU=	ftp://ftp.sunsite.auc.dk/pub/gnu/
+#MASTER_SITE_PERL_CPAN=	ftp://ftp.sunsite.auc.dk/pub/languages/perl/CPAN/modules/by-module/
+#MASTER_SITE_TEX_CTAN=	ftp://ftp.sunsite.auc.dk/pub/tex/ctan/
+#MASTER_SITE_SUNSITE=	ftp://ftp.sunsite.auc.dk/mirrors/sunsite.unc.edu/pub/Linux/
+#MASTER_SITE_BACKUP=	ftp://ftp.dk.netbsd.org/pub/NetBSD/packages/distfiles/
+
+# Finland
+#
+#MASTER_SITE_XCONTRIB=	ftp://ftp.funet.fi/pub/X11/contrib/
+#MASTER_SITE_GNU= 	ftp://ftp.funet.fi/pub/gnu/gnu/
+#MASTER_SITE_PERL_CPAN=	\
+#	ftp://ftp.funet.fi/pub/languages/perl/CPAN/modules/by-module/
+#MASTER_SITE_TEX_CTAN=	ftp://ftp.funet.fi/pub/TeX/CTAN/
+#MASTER_SITE_SUNSITE=	\
+#	ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/
+#MASTER_SITE_BACKUP=	\
+#	ftp://ftp.fi.netbsd.org/pub/NetBSD/packages/distfiles/
+
+# Japan
+#
+#MASTER_SITE_XCONTRIB=	ftp://ftp.ring.gr.jp/pub/X/opengroup/contrib/
+#MASTER_SITE_GNU=	ftp://ftp.ring.gr.jp/pub/GNU/
+#MASTER_SITE_PERL_CPAN=	ftp://ftp.ring.gr.jp/pub/lang/perl/CPAN/modules/by-module/
+#MASTER_SITE_TEX_CTAN=	ftp://ftp.ring.gr.jp/pub/text/CTAN/
+#MASTER_SITE_SUNSITE=	ftp://sunsite.sut.ac.jp/pub/archives/linux/sunsite-unc/
+#MASTER_SITE_BACKUP=	\
+#	ftp://ftp.ring.gr.jp/pub/NetBSD/packages/distfiles/ \
+#	ftp://ftp.jp.netbsd.org/pub/NetBSD/packages/distfiles/
+
+# United Kingdom
+#
+#MASTER_SITE_XCONTRIB=	ftp://sunsite.org.uk/Mirrors/ftp.x.org/contrib/
+#MASTER_SITE_GNU=	ftp://sunsite.org.uk/packages/gnu/
+#MASTER_SITE_PERL_CPAN=	ftp://sunsite.org.uk/packages/perl/CPAN/modules/by-module/
+#MASTER_SITE_TEX_CTAN=	ftp://sunsite.org.uk/packages/tex/uk-tex/
+#MASTER_SITE_SUNSITE=	ftp://sunsite.org.uk/Mirrors/sunsite.unc.edu/pub/Linux/
+#MASTER_SITE_BACKUP=	ftp://sunsite.org.uk/packages/NetBSD/packages/distfiles/ \
+#	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
+
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 94bf42d46b5..f8b16dbc437 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.58 2001/08/24 09:00:44 abs Exp $
+# $NetBSD: bsd.prefs.mk,v 1.59 2001/09/18 21:30:06 agc Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -93,6 +93,15 @@ LOWER_ARCH?=		${MACHINE_GNU_ARCH}
 MACHINE_PLATFORM?=	${OPSYS}-${OS_VERSION}-${MACHINE_ARCH}
 MACHINE_GNU_PLATFORM?=	${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
 
+# include the defaults file
+.if exists(${.CURDIR}/../../mk/bsd.pkg.defaults.mk)
+.include "${.CURDIR}/../../mk/bsd.pkg.defaults.mk"
+.elif exists(${.CURDIR}/../mk/bsd.pkg.defaults.mk)
+.include "${.CURDIR}/../mk/bsd.pkg.defaults.mk"
+.elif exists(${.CURDIR}/mk/bsd.pkg.defaults.mk)
+.include "${.CURDIR}/mk/bsd.pkg.defaults.mk"
+.endif
+
 # Needed on NetBSD and SunOS (zoularis) to prevent an "install:" target
 # from being created in bsd.own.mk.
 NEED_OWN_INSTALL_TARGET=no