summaryrefslogtreecommitdiff
path: root/mk/bsd.prefs.mk
AgeCommit message (Collapse)AuthorFilesLines
2005-12-29X11BASE defaults to /usr/openwin on Solaris, but only when using themarkd1-3/+5
native X11_TYPE. Allow X11BASE to default correctly on Solaris when X11_TYPE= XFree86 or xorg.
2005-12-28Set PATH if not already set at the top of bsd.prefs.mk, just beforeabs1-1/+6
using it in a test to set _MAKE. With this change pkgsrc works on NetBSD/i386 3.0 to build with an empty environment (env -i sh). Tested with my ~100 favourite server packages. Does not affect the case when PATH is already set. To have a per OPSYS default path the include of platform/${OPSYS}.mk will probably need to be at the top of bsd.prefs.mk - arguably it should be there already. There are bound to be assumptions made by some packages which will be broken by an empty env, but the bulk of pkgsrc and in particular the infrastructure works fine.
2005-12-05Applied all quoting fixes found by "pkglint --autofix".rillig1-17/+17
2005-12-02Remove handling for obsolete USE_SOCKS variable.wiz1-3/+3
2005-11-28Prefixed the definitions for the pkgtools with ${SETENV}. Now it isrillig1-7/+7
possible to use these commands in shell programs by assigning the output of `make show-var VARNAME=PKG_DELETE` to a shell variable.
2005-11-24Properly quote _PKG_DBDIR.rillig1-3/+3
2005-11-23Per request, back out all the SKIP_AUDIT_PACKAGES changes.erh1-3/+1
bsd.pkg.mk:1.1758-1.1752 bsd.prefs.mk:1.210 bulk/build:1.79 defaults/mk.conf:1.93-1.92
2005-11-16Improve the handling of allowed vulnerabilities. Instead of the singleerh1-1/+3
ALLOW_VULNERABLE_PACKAGES settings that applies to all packages, there can now be per-package lists of allowed vulnerability ids: ALLOW_VULNERABILITIES.<pkgname>=<space separated list of vulnids> To avoid duplication of code, audit-packages is now used to do these checks. It can be skipped altogether by setting: SKIP_AUDIT_PACKAGES=yes
2005-11-14Removed trailing white-space.rillig1-2/+2
2005-11-13Reverted the change that moved the definition of MANINSTALL from mk.conf torillig1-6/+1
bsd.prefs.mk. Alistair has told me that Stoned had told him that MANINSTALL actually belongs to mk.conf.
2005-11-10Moved default definition of MANINSTALL from defaults/mk.conf torillig1-1/+6
bsd.prefs.mk, as it is not intended to be set in mk.conf.
2005-11-10Moved the PKG_INSTALLATION_TYPES variable from defaults/mk.conf torillig1-1/+11
bsd.prefs.mk as it is not intended to be set in mk.conf.
2005-11-10Added a comment that <bsd.own.mk> includes MAKECONF or /etc/mk.conf, sorillig1-1/+2
that a "grep -wr mk\\.conf" will show the user where to find more information.
2005-11-09Moved the X11ROOT_PREFIX and X11BASE setting to mk/bsd.prefs.mk;reed1-1/+17
removed from mk/defaults/mk.conf. This was needed in parts of tests of allowing a platform/${OPSYS}.mk define is X11_TYPE.
2005-11-01Abstract [LOWER_]OS_VERSION into a ${...:sh} construct, so that other OStv1-8/+24
blocks can override it without running the commands at all. Move Interix [LOWER_]OS_VERSION speedup hack into bsd.prefs.mk, since it must happen early at runtime. While here, speed up the OS_VERSION calculation slightly for OSF1.
2005-11-01Sort OPSYS pre-<sys.mk> settings section by OPSYS name.tv1-59/+60
2005-11-01Shorten the GNU_ARCH list by using a fallthrough variable expressiontv1-14/+4
for MACHINE_GNU_ARCH.
2005-08-16Don't add inet6 to PKG_DEFAULT_OPTIONS, it is a user settabledillo1-3/+1
variable. mk/defaults/obsolete.mk takes care of converting USE_INET6 to inet6 option. Bug noted by schmonz.
2005-07-28Start documenting variables.wiz1-1/+6
2005-07-19Don't bother defining a temporary _PKGSRC_USE_TOOLS variable that doesn'tjlam1-3/+3
actually increase readability by much.
2005-07-16There is still one small but important distinction between some of thejlam1-1/+4
tools listed in USE_TOOLS -- some of them are required by the pkgsrc infrastructure in variable assignment statements that look like: VARIABLE!= ${AWK} ... These tools are actually *required* by pkgsrc to be installed on the system before it can even work (bootstrap situation). For these tools, only override the "TOOL" name representing the tool if we're really using the pkgsrc version of the tool. We accomplish this by adding a new :pkgsrc modifier that is appended to these tools listed in USE_TOOLS. We also list these tools in bsd.prefs.mk so that all packages pick them up fairly early on.
2005-07-15Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by makingjlam1-5/+4
PKGSRC_USE_TOOLS go away. There is now only a single USE_TOOLS variable that specifies all of the tools we need to build/run the package.
2005-06-14Require xpkgwedge>=1.13 when used as a build dependency so that thejlam1-2/+1
correct make(1) program is invoked by pkgxmkmf.
2005-06-01Include bsd.makevars.mk in bsd.prefs.mk instead of bsd.pkg.mk. Thisjlam1-1/+4
allows the saved make variables to be re-set whenever bsd.prefs.mk is included, and is a shortcut for the common case where a Makefile includes both.
2005-05-22Remove the old tools framework and references to _USE_NEW_TOOLS.jlam1-14/+1
2005-05-14Replaced .ifdef with .if defined() and .ifnded with .if !defined(). Thisrillig1-6/+6
will allow better error checking.
2005-05-13Make _USE_NEW_TOOLS default to "yes" to turn on using the new toolsjlam1-2/+2
framework. This has been tested by successfully building a meta-package that pulled in 81 dependencies during the installation.
2005-05-10Make a distinction between the tools that pkgsrc needs and the toolsjlam1-3/+6
that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-09Teach bsd.pkg.mk to create a phase-specific "makevars.mk" file thatjlam1-1/+2
caches variable definitions that were computed by make. These variables are specified by listing them in MAKE_VARS, e.g., .if !defined(FOO) FOO!= very_time_consuming_command .endif MAKE_VARS+= FOO bsd.pkg.mk will include only the one generated during the most recent phase. A particular phase's makevars.mk file consists of variable definitions that are a superset of all of the ones produced in previous phases of the build. The caching is useful because bsd.pkg.mk invokes make recursively, which in the example above has the potential to run the very time-consuming command each time unless we cause FOO to be defined for the sub-make processes. We don't cache via MAKE_FLAGS because MAKE_FLAGS isn't consistently applied to every invocation of make, and also because MAKE_FLAGS can overflow the maximum length of a make variable very quickly if we add many values to it. One important and desirable property of variables cached via MAKE_VARS is that they only apply to the current package, and not to any dependencies whose builds may have been triggered by the current package. The makevars.mk files are generated by new targets fetch-vars, extract-vars, patch-vars, etc., and these targets are built during the corresponding real-* target to ensure that they are being invoked with PKG_PHASE set to the proper value. Also, remove the variables cache file that bsd.wrapper.mk was generating since the new makevars.mk files provide the same functionality at a higher level. Change all WRAPPER_VARS definitions that were used by the old wrapper-phase cache file into MAKE_VARS definitions.
2005-05-02* Push the imake- and xmkmf-handling into the new tools framework.jlam1-1/+7
* Get rid of an explicit check for ${_IMAKE_MAKE} == ${GMAKE} in bsd.pkg.mk to check for whether we need to depend on gmake or not. Instead, we now note in Linux.mk that packages that need imake will also need to use gmake by setting _IMAKE_TOOLS+=gmake. * Push the definition of MAKE_PROGRAM from bsd.pkg.mk into make.mk where it's closer to related code.
2005-05-02Remove the need for ${FIND} in the top-level make.jlam1-2/+2
2005-04-30net/qmail has been taught to not need expr and wc in the top-level make.jlam1-2/+2
2005-04-30Split replace.mk into two parts, one of which is included by bsd.prefs.mkjlam1-1/+14
to provide "TOOL" definitions for tools used by a top-level make process (usually because it uses them in a != variable definition). This allows USE_TOOLS to be defined before bsd.prefs.mk is included by a package Makefile, where USE_TOOLS lists the additional (non-default) tools that are required to build the package. Also, drop the fallback to existing "TOOL" definitions because we now have TOOLS_PLATFORM.* for each platform in pkgsr/mk/tools/tools.*.mk.
2005-04-08Per discussion on tech-pkg, use USE_X11 (not USE_IMAKE) to add X11BASE/bin;tv1-2/+2
and put LOCALBASE/bin later in the variable (so it shows up *earlier* in the resultant $PATH).
2005-03-24USE_BUILDLINK3 is no longer optional (and cannot be turned off). Per mailtv1-6/+1
to tech-pkg: ===== * USE_BUILDLINK3=YES will be unconditional. (In fact, USE_BUILDLINK3 will be ignored altogether by mk/; but see below.) * NO_BUILDLINK and NO_WRAPPER will be ignored by mk/. If a build happens, these phases will happen. * The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER. If no build happens, those phases are not needed. * NO_TOOLS will be ignored by mk/. The tools phase, which provides much more than just the C compiler, will always happen regardless of package. This will make metapackage builds only slightly slower, in trade for far less user error.
2005-02-19define GNU_ARCH for rs6000 and set OBJECT_FMT correctly for AIX.grant1-5/+6
2005-02-17add bits for AIX to correctly set MACHINE_ARCH and OS_VERSION, so thatgrant1-1/+20
MACHINE_GNU_PLATFORM is set to something sane. tested with AIX 4.3.3 and 5.1.
2005-02-11Migrate several USE_* logic blocks, previously sprinkled liberallytv1-3/+1
throughout bsd.pkg.mk, to labelled blocks in bsd.pkg.use.mk.
2005-01-27Cleanup: wrapper-defs.mk is no longer optional; remove its conditional.tv1-5/+4
(...and if it were optional, it should have been an .sinclude anyway.) Sanity: If mk/platform/${OPSYS}.mk is missing, don't assume NetBSD is it. pkgsrc now depends on a valid platform file for an OS, so require it. (Still includes NetBSD.mk, but sets PKG_FAIL_REASON.)
2005-01-27Move the PREPEND_PATH for LOCALBASE/bin (and optionally X11BASE/bin) to atv1-1/+4
spot that will come before compiler.mk (in bsd.prefs.mk). Previously, LOCALBASE/bin was appearing earlier in the path than work/.<compiler>/bin, which could cause the Wrong Thing to happen.
2004-11-20add framework support for Tru64 and the Compaq C compiler.grant1-1/+9
patches provided by Tobias Nygren <tnn at netilium dot org> with minor changes by me.
2004-10-31Add DragonFlyBSD support, provided by Todd Willey on tech-pkg.wiz1-1/+13
2004-10-20Added missing /martti1-2/+2
2004-10-19Translate MACHINE_ARCH and LOWER_ARCH from ppc to powerpc in the case ofben1-2/+3
Linux, to be more consistent with other platforms.
2004-10-07Make PKGSRCDIR a read-only value. This avoids problems where the userjlam1-4/+5
decides to set PKGSRCDIR to a relative path as seen in several old PRs and which prompted the original switch to make PKGSRCDIR private in revision 1.881 of bsd.pkg.mk.
2004-10-07Remove _PKGSRCDIR now that we have PKGSRCDIR (as per previous commit).jlam1-2/+1
2004-10-07* Make PKGSRC_TOPDIR a private variable by renaming it to _PKGSRC_TOPDIR,jlam1-15/+19
as it's only used internally by bsd.prefs.mk. * Make _PKGSRCDIR a public variable by renaming it to PKGSRCDIR. Also, generate its value from ${_PKGSRC_TOPDIR} so it's less fragile than the old method of stripping off the last two components of ${.CURDIR}. PKGSRCDIR may now be used after bsd.prefs.mk is defined. * Change all references to _PKGSRCDIR to PKGSRCDIR.
2004-10-06Climb up the directory tree to find the top, instead of guessing wherejlam1-5/+5
the top and searching on the way down. Thanks Gavan!
2004-10-06Reorganize some of the files under pkgsrc/mk:jlam1-7/+7
(1) defs.${OPSYS}.mk --> platform/${OPSYS}.mk. The "platform" subdirectory is where all of the ${OPSYS}-specific infrastructure logic should reside. (2) bsd.pkg.defaults.mk --> defaults/mk.conf bsd.pkg.obsolete.mk --> defaults/obsolete.mk Renaming bsd.pkg.defaults.mk to defaults/mk.conf is to mimic the way that NetBSD has /etc/rc.conf as well as /etc/defaults/rc.conf, where the latter is a full list of user-settable variables, and the two files share the same name to reinforce the fact /etc/defaults/rc.conf can be directly copied in place as /etc/rc.conf. This is the same relationship shared by defaults/mk.conf and /etc/mk.conf.
2004-09-27Move some wrapper definitions into a separate file wrapper-defs.mk that isjlam1-1/+6
included by bsd.prefs.mk. This allows the following variables to be used before bsd.wrapper.mk is included: WRAPPER_DIR WRAPPER_SRCDIR WRAPPER_BINDIR WRAPPER_SHELL WRAPPER_TMPDIR