diff options
| author | joerg <joerg@pkgsrc.org> | 2012-03-19 12:34:12 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-03-19 12:34:12 +0000 |
| commit | 3fa6844b90128e447a14b987ba3a0092109b8aa3 (patch) | |
| tree | a3955afe4cc63c2b002bc7b453f7fdc618bce538 /mk/defaults | |
| parent | 32c8d39ca597eba9cb78a81fb767883d72a98142 (diff) | |
| download | pkgsrc-3fa6844b90128e447a14b987ba3a0092109b8aa3.tar.gz | |
Drop imake-check logic from X11 components' builtin.mk.
Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge.
Always install man pages, not cat pages when using imake.
Unify the various imake PLIST variables in preparation for dropping.
Adjust xbattbar for the new expectations.
Diffstat (limited to 'mk/defaults')
| -rw-r--r-- | mk/defaults/mk.conf | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 7a0f08a2295..6171147f3fb 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.204 2012/02/24 13:36:20 obache Exp $ +# $NetBSD: mk.conf,v 1.205 2012/03/19 12:34:16 joerg Exp $ # # This file provides default values for variables that may be overridden @@ -300,14 +300,6 @@ PKGMANDIR?= man # # See also: PKGINFODIR -# USE_XPKGWEDGE?= yes -# Whether we should use xpkgwedge or not to install all packages into -# ${LOCALBASE}. -# Possible: yes, no -# This is not set here as X11_TYPE=modular does not use USE_XPKGWEDGE -# at all and the existence of xpkgwedge in the system overrides the -# user setting. - BSDSRCDIR?= /usr/src # Where the NetBSD src module source tree is located # used in the emulators/plex86, emulators/vmware-module{,3}, net/arla, @@ -695,9 +687,8 @@ BIND_USER?= named #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. +# of packages belong in this variable. +# Currently pkgtools/digest is always added to this list. # Possible: category/pkg # Default: not defined |