The NetBSD Project

CVS log for pkgsrc/mk/bsd.prefs.mk

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / mk

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.403 / (download) - annotate - [select for diffs], Sun Jan 6 12:51:45 2019 UTC (2 months, 2 weeks ago) by bsiegert
Branch: MAIN
CVS Tags: HEAD
Changes since 1.402: +5 -1 lines
Diff to previous 1.402 (colored)

bsd.prefs.mk: set OS_VARIANT=Microsoft if used under WSL.

WSL is Windows Services for Linux, aka "bash on Ubuntu on Windows".
Some packages need to differentiate plain Linux and running on WSL.

Patch from David Weller-Fahy via PR pkg/53806.

Revision 1.402 / (download) - annotate - [select for diffs], Mon Nov 12 14:22:58 2018 UTC (4 months, 1 week ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2018Q4-base, pkgsrc-2018Q4
Changes since 1.401: +15 -1 lines
Diff to previous 1.401 (colored)

mk: Add CTF infrastructure support.

Platform support is determined by _OPSYS_SUPPORTS_CTF from mk/platform, the
user enables support by setting PKGSRC_USE_CTF=yes, and packages can
explicitly disable support with CTF_SUPPORTED=no or skip certain files with
CTF_FILES_SKIP.

The path to ctfconvert is configured via TOOLS_PLATFORM.ctfconvert.

If all of the requisite variables are enabled, a compiler-specific debug flag
is passed via the wrappers to ensure we have DWARF information to convert,
_INSTALL_UNSTRIPPED is explicitly defined to avoid binaries being stripped
prior to conversion, and the conversion is performed during the install stage.

It is recommended that users who enable the feature also set STRIP_DEBUG=yes
to reduce the final binary size once the conversion has been performed.

This has been used for the past year in Joyent SmartOS builds.  FreeBSD is
marked as supported but is untested.

Revision 1.401 / (download) - annotate - [select for diffs], Mon Oct 29 01:50:00 2018 UTC (4 months, 3 weeks ago) by sevan
Branch: MAIN
Changes since 1.400: +3 -1 lines
Diff to previous 1.400 (colored)

Minix 3 is ELF based

Revision 1.400 / (download) - annotate - [select for diffs], Sun Oct 28 18:41:41 2018 UTC (4 months, 3 weeks ago) by sevan
Branch: MAIN
Changes since 1.399: +1 -2 lines
Diff to previous 1.399 (colored)

libcompat_minix was removed some years back and minlib does not exist as a
linkable library in 3.4RC6 so don't try to link against these.

Revision 1.399 / (download) - annotate - [select for diffs], Sun Oct 28 18:08:15 2018 UTC (4 months, 3 weeks ago) by sevan
Branch: MAIN
Changes since 1.398: +2 -2 lines
Diff to previous 1.398 (colored)

Minix runs on platforms besides x86, match GNU config.guess.

Revision 1.398 / (download) - annotate - [select for diffs], Mon Jul 16 19:53:53 2018 UTC (8 months, 1 week ago) by maya
Branch: MAIN
CVS Tags: pkgsrc-2018Q3-base, pkgsrc-2018Q3
Changes since 1.397: +2 -3 lines
Diff to previous 1.397 (colored)

mips64 is more likely not 64bit.

Revision 1.397 / (download) - annotate - [select for diffs], Wed May 23 11:26:54 2018 UTC (10 months ago) by maya
Branch: MAIN
CVS Tags: pkgsrc-2018Q2-base, pkgsrc-2018Q2
Changes since 1.396: +25 -1 lines
Diff to previous 1.396 (colored)

Describe some of the security mitigation flags and their impact

Revision 1.396 / (download) - annotate - [select for diffs], Mon Jan 15 09:35:45 2018 UTC (14 months, 1 week ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2018Q1-base, pkgsrc-2018Q1
Changes since 1.395: +19 -13 lines
Diff to previous 1.395 (colored)

mk: Introduce *_SUPPORTED variables for security features.

Using variables such as PKGSRC_USE_SSP in package Makefiles to disable SSP does
not work due to the parsing order in bsd.prefs.mk.  Even if it did, it's not a
good idea to mix user and package settable variables, and would cause issues in
complex packages where bsd.prefs.mk is included early (e.g. Makefile.common).

Packages can now set {MKPIE,MKREPRO,FORTIFY,RELRO,SSP,STACK_CHECK}_SUPPORTED=no
to correctly disable security features if necessary.

Revision 1.395 / (download) - annotate - [select for diffs], Sun Nov 12 13:34:14 2017 UTC (16 months, 1 week ago) by khorben
Branch: MAIN
CVS Tags: pkgsrc-2017Q4-base, pkgsrc-2017Q4
Changes since 1.394: +7 -1 lines
Diff to previous 1.394 (colored)

Add initial support for building packages reproducibly

It currently tackles two problems:
- gcc(1) hard-coding full paths in debugging information (with one
  caveat at the moment)
- ar(1) hard-coding user IDs in archive headers

This allows packages built from the same tree and options to produce
identical results bit by bit. This option should be combined with ASLR
and PKGSRC_MKPIE to avoid predictable address offsets for attackers
attempting to exploit security vulnerabilities.

This is still disabled by default, and only supports NetBSD so far.

As discussed on tech-pkg@

Revision 1.394 / (download) - annotate - [select for diffs], Fri Nov 3 18:07:40 2017 UTC (16 months, 2 weeks ago) by bsiegert
Branch: MAIN
Changes since 1.393: +7 -1 lines
Diff to previous 1.393 (colored)

Support OS_VARIANT on Linux, support ChromeOS.

This adds a detection for Chrome OS and Chromium OS based on /etc/lsb-release,
which sets LOWER_VENDOR, like for other Linux distros. It also sets OS_VARIANT
to the value of LOWER_VENDOR, so we can have conditionals for ChromeOS. It is
missing some things that are silently assumed to be part of Linux base
systems, such as POSIX attr support, NIS and more.

ok jperkin@

Revision 1.393 / (download) - annotate - [select for diffs], Sun Jul 9 14:30:07 2017 UTC (20 months, 2 weeks ago) by khorben
Branch: MAIN
CVS Tags: pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-
Changes since 1.392: +7 -1 lines
Diff to previous 1.392 (colored)

Register support for PKGSRC_USE_STACK_CHECK

This adds -fstack-check to the CFLAGS (with GCC on NetBSD x86). Only
tested on NetBSD/amd64 so far.

Disabled by default.

Revision 1.392 / (download) - annotate - [select for diffs], Thu Jun 1 02:15:10 2017 UTC (21 months, 3 weeks ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2017Q2-base, pkgsrc-2017Q2
Changes since 1.391: +8 -1 lines
Diff to previous 1.391 (colored)

Provide switch to activate new frameworks to replace "pkginstall".

If ${_USE_NEW_PKGINSTALL} is "yes", then use the new "pkgtasks",
"init", and "pkgformat/pkg"-scripts frameworks instead of the
existing "pkginstall" framework.

Revision 1.391 / (download) - annotate - [select for diffs], Wed May 31 22:55:01 2017 UTC (21 months, 3 weeks ago) by jlam
Branch: MAIN
Changes since 1.390: +4 -1 lines
Diff to previous 1.390 (colored)

Move detection of shared library type into the platform file.

Only four platforms, all BSDs, need to resolve "ELF/a.out" into
either ELF or a.out.  Calculate it directly in the platform file
and return the value in ${_OPSYS_SHLIB_TYPE} and export that value
in bsd.prefs.mk as ${SHLIB_TYPE}.

Instead of requiring the file(1) tool, we can expect the base
system of those BSDs to have /usr/bin/file, so make use of it
directly.

Revision 1.390 / (download) - annotate - [select for diffs], Sun Apr 16 23:12:37 2017 UTC (23 months, 1 week ago) by khorben
Branch: MAIN
Changes since 1.389: +3 -3 lines
Diff to previous 1.389 (colored)

Add granularity to PKGSRC_USE_FORTIFY and PKGSRC_USE_RELRO

The new options are, for FORTIFY:
  "no"     Do not pass any flags for FORTIFY
  "weak"   Pass -D_FORTIFY_SOURCE=1
  "strong" Pass -D_FORTIFY_SOURCE=2

This allows users to reduce the level of FORTIFY specified if necessary
or desired. The previous setting as "yes" is now equivalent to "strong"
(the default when enabling).

The new options are, for RELRO:
  "no"      Do not pass any flags for RELRO
  "partial" Pass -Wl,-z,relro
  "full"    Pass -Wl,-z,relro -Wl,-z,now

This allows users to reduce the level of RELRO specified if necessary or
desired. The previous setting as "yes" is now equivalent to "full" (the
default when enabling).

This is intended to match the changes committed by jperkin@ (for SSP)
after our discussion a (long) while back.

No functional change intended (with the settings supported so far).

Revision 1.389 / (download) - annotate - [select for diffs], Wed Feb 1 09:55:07 2017 UTC (2 years, 1 month ago) by sevan
Branch: MAIN
CVS Tags: pkgsrc-2017Q1-base, pkgsrc-2017Q1
Changes since 1.388: +3 -3 lines
Diff to previous 1.388 (colored)

powerpc64le is little endian.

Revision 1.388 / (download) - annotate - [select for diffs], Thu Oct 27 10:31:05 2016 UTC (2 years, 4 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2016Q4-base, pkgsrc-2016Q4
Changes since 1.387: +8 -3 lines
Diff to previous 1.387 (colored)

Add support for enabling cwrappers automatically.  USE_CWRAPPERS now defaults
to "auto", which will enable cwrappers if the _OPSYS_SUPPORTS_CWRAPPERS
platform variable is set to "yes".

Switch over to cwrappers by default for Darwin, Linux, and SunOS (except when
using the sunpro compiler).

Revision 1.387 / (download) - annotate - [select for diffs], Mon Jun 13 13:26:42 2016 UTC (2 years, 9 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2
Changes since 1.386: +2 -2 lines
Diff to previous 1.386 (colored)

Change PKGSRC_USE_SSP to a quad option.  The options are now:

   "no"     Do not pass any stack protection flags (the default)
   "yes"    Pass -fstack-protector
   "strong" Pass -fstack-protector-strong
   "all"    Pass -fstack-protector-all

This allows users to configure the level of stack smashing protection they
require, and ensures consistent behaviour across platforms.  Users running
on NetBSD who previously used the option will need to change "yes" to "all"
to match the previous default configuration for that platform.

While here use _WRAP_EXTRA_ARGS to ensure the flag gets passed regardless
of whether the package honours CFLAGS, and support additional wrappers.

Discussed a while back with khorben, and used in production for the SmartOS
2016Q1 package sets with the "strong" option.

Revision 1.386 / (download) - annotate - [select for diffs], Sun Apr 17 08:13:09 2016 UTC (2 years, 11 months ago) by jperkin
Branch: MAIN
Changes since 1.385: +2 -2 lines
Diff to previous 1.385 (colored)

Revert part of the MACHINE_ARCH cleanup that resulted in the Linux/x86_64
triplet reporting as x86_64-pc-linux.  Go back to the previous triplet of
x86_64-unknown-linux which matches what config.guess outputs.

Revision 1.385 / (download) - annotate - [select for diffs], Sun Apr 10 15:58:02 2016 UTC (2 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.384: +3 -10 lines
Diff to previous 1.384 (colored)

Remove support for USE_DESTDIR=no.

Revision 1.384 / (download) - annotate - [select for diffs], Sun Apr 10 15:10:12 2016 UTC (2 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.383: +1 -7 lines
Diff to previous 1.383 (colored)

Remove last glue for PKG_DESTDIR_SUPPORT=none.

Revision 1.383 / (download) - annotate - [select for diffs], Sun Apr 10 15:08:39 2016 UTC (2 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.382: +4 -9 lines
Diff to previous 1.382 (colored)

Drop support for PKG_DESTDIR_SUPPORT=none.

Revision 1.382 / (download) - annotate - [select for diffs], Thu Mar 17 16:02:23 2016 UTC (3 years ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2016Q1-base, pkgsrc-2016Q1
Changes since 1.381: +5 -1 lines
Diff to previous 1.381 (colored)

Since the MACHINE_ARCH cleanup, the bootstrap for i386-on-x86_64 Linux has
been broken due to NATIVE_MACHINE_ARCH no longer being set to x86_64.  Fix
this by introducing HOST_MACHINE_ARCH which refers to the underlying host
architecture rather than bmake's native architecture, thus differentiating
between cross-compiling and multilib.

This is currently only set on Linux as the only OPSYS which currently
requires such a test, but can be expanded to other OPSYS as necessary.

Revision 1.381 / (download) - annotate - [select for diffs], Fri Mar 11 23:54:08 2016 UTC (3 years ago) by khorben
Branch: MAIN
Changes since 1.380: +8 -13 lines
Diff to previous 1.380 (colored)

Re-arrange support for FORTIFY/MKPIE/RELRO/SSP

- No _GCC_* anything in mk/bsd.prefs.mk;
- No compiler flags in platform files.

Tested again on NetBSD/amd64, with and without cwrappers, with the same
outcome.

With feedback from jperkin@

Revision 1.380 / (download) - annotate - [select for diffs], Fri Mar 11 23:03:31 2016 UTC (3 years ago) by khorben
Branch: MAIN
Changes since 1.379: +30 -1 lines
Diff to previous 1.379 (colored)

Add support for a number of security features

- Revisit (and rename) support for FORTIFY as PKGSRC_USE_FORTIFY (instead
  of PKGSRC_USE_FORT) for easier support outside NetBSD/gcc;
- PKGSRC_USE_SSP is no longer enabled by default when PKGSRC_USE_FORTIFY
  is enabled;
- PKGSRC_MKPIE builds executables as PIE (to leverage userland ASLR)
- PKGSRC_USE_RELRO builds with a read-only GOT to prevent some exploits
  from functioning.

Tested on NetBSD/amd64 by myself, in every combination, with and without
pkgtools/cwrappers. MKPIE is not supported at the moment with cwrappers.
Also, MKPIE is known to still break a number of packages when enabled (and
actually supported).

Tested on SunOS by jperkin@, thank you!

As discussed on tech-pkg@, the default behavior is not changed, except
where noted above.

ok bsiegert@

Revision 1.379 / (download) - annotate - [select for diffs], Fri Mar 11 05:42:35 2016 UTC (3 years ago) by tnn
Branch: MAIN
Changes since 1.378: +2 -2 lines
Diff to previous 1.378 (colored)

let's do just "Solaris" instead of "Oracle"

The only current use of this is pbulk's subject line, and Solaris 11.3
makes more sense than Oracle 11.3.

Revision 1.378 / (download) - annotate - [select for diffs], Fri Mar 11 04:58:51 2016 UTC (3 years ago) by tnn
Branch: MAIN
Changes since 1.377: +5 -2 lines
Diff to previous 1.377 (colored)

for SunOS, assume that OS_VARIANT is Oracle if no match on other variants
for OmniOS, stop processing /etc/release after the first line

Revision 1.377 / (download) - annotate - [select for diffs], Thu Mar 10 16:58:19 2016 UTC (3 years ago) by jperkin
Branch: MAIN
Changes since 1.376: +1 -7 lines
Diff to previous 1.376 (colored)

Remove _OPSYS_WHOLE_ARCHIVE_FLAG and _OPSYS_NO_WHOLE_ARCHIVE_FLAG, these
variables are unused and in at least one case were completely wrong anyway.

Revision 1.376 / (download) - annotate - [select for diffs], Sun Jan 24 16:14:44 2016 UTC (3 years, 2 months ago) by jperkin
Branch: MAIN
Changes since 1.375: +5 -104 lines
Diff to previous 1.375 (colored)

Attempt to bring sanity to how ABI and MACHINE_ARCH are set.

Previously there were at least 5 different ways MACHINE_ARCH could be set,
some statically and some at run time, and in many cases these settings
differed, leading to issues at pkg_add time where there was conflict
between the setting encoded into the package and that used by pkg_install.

Instead, move to a single source of truth where the correct value based on
the host and the chosen (or default) ABI is determined in the bootstrap
script.  The value can still be overridden in mk.conf if necessary, e.g.
for cross-compiling.

ABI is now set by default and if unset a default is calculated based on
MACHINE_ARCH.  This fixes some OS, e.g. Linux, where the wrong default was
previously chosen.

As a result of the refactoring there is no need for LOWER_ARCH, with
references to it replaced by MACHINE_ARCH.  SPARC_TARGET_ARCH is also
removed.

Revision 1.375 / (download) - annotate - [select for diffs], Tue Jan 12 19:55:41 2016 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.374: +2 -2 lines
Diff to previous 1.374 (colored)

Added keyword "platform" for "bmake help"

Revision 1.374 / (download) - annotate - [select for diffs], Sun Dec 27 12:37:29 2015 UTC (3 years, 2 months ago) by joerg
Branch: MAIN
Changes since 1.373: +2 -1 lines
Diff to previous 1.373 (colored)

Make USE_DESTDIR != yes an error.

Revision 1.373 / (download) - annotate - [select for diffs], Sat Nov 7 20:00:19 2015 UTC (3 years, 4 months ago) by sevan
Branch: MAIN
CVS Tags: pkgsrc-2015Q4-base, pkgsrc-2015Q4
Changes since 1.372: +4 -4 lines
Diff to previous 1.372 (colored)


With OpenBSD/amd64 & Bitrig/amd64 switched to using MACHINE_ARCH=x86_64,
amd64 no longer needs to be accounted for specifically.
Remove redundant references.


Reviewed by wiz@

Revision 1.372 / (download) - annotate - [select for diffs], Sat Nov 7 19:53:49 2015 UTC (3 years, 4 months ago) by sevan
Branch: MAIN
Changes since 1.371: +7 -2 lines
Diff to previous 1.371 (colored)


Add the necessary logic for setting Bitrig/amd64 to Bitrig/x86_64.
Switch to using arch(1) to populate $LOWER_ARCH on Bitrig

Reviewed by wiz@

Revision 1.371 / (download) - annotate - [select for diffs], Sat Nov 7 13:35:44 2015 UTC (3 years, 4 months ago) by sevan
Branch: MAIN
Changes since 1.370: +12 -1 lines
Diff to previous 1.370 (colored)


Add the necessary logic for setting OpenBSD/amd64 to OpenBSD/x86_64.

Reviewed by wiz@

Revision 1.370 / (download) - annotate - [select for diffs], Sat Oct 17 01:50:46 2015 UTC (3 years, 5 months ago) by sevan
Branch: MAIN
Changes since 1.369: +2 -1 lines
Diff to previous 1.369 (colored)


Add the mapping for amd64 to its GNU architecture name x86_64.
Needed for switching OpenBSD/amd64 & Bitrig/amd64 to x86_64.

Reviewed by wiz@

Revision 1.369 / (download) - annotate - [select for diffs], Tue Sep 8 12:07:55 2015 UTC (3 years, 6 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2015Q3-base, pkgsrc-2015Q3
Changes since 1.368: +3 -1 lines
Diff to previous 1.368 (colored)

Ensure OBJECT_FMT is set to ELF on Linux rather than relying on the NetBSD
MAHCINE_ARCH settings in bsd.own.mk.  Fixes at least Sevan's arm64 host.

Revision 1.368 / (download) - annotate - [select for diffs], Tue Sep 8 11:36:34 2015 UTC (3 years, 6 months ago) by jperkin
Branch: MAIN
Changes since 1.367: +1 -23 lines
Diff to previous 1.367 (colored)

Remove NetBSD 0.x and 1.x settings, these have long since been unsupported.

Revision 1.367 / (download) - annotate - [select for diffs], Sat Jul 25 15:11:09 2015 UTC (3 years, 8 months ago) by sevan
Branch: MAIN
Changes since 1.366: +3 -1 lines
Diff to previous 1.366 (colored)

Introduce $LOWER_VARIANT_VERSION, this is used to store version info for variant
Operating Systems.
For SmartOS, store the result from running uname -v & trimming the joyent_
prefix.
For OmniOS, store the result from processing /etc/release with awk(1)


Reviewed by joerg@ bsiegert@

Revision 1.366 / (download) - annotate - [select for diffs], Sat Jul 4 16:18:38 2015 UTC (3 years, 8 months ago) by joerg
Branch: MAIN
Changes since 1.365: +1 -3 lines
Diff to previous 1.365 (colored)

Remove USE_X11BASE and X11PREFIX.

Revision 1.365 / (download) - annotate - [select for diffs], Thu Jun 4 15:48:46 2015 UTC (3 years, 9 months ago) by sevan
Branch: MAIN
CVS Tags: pkgsrc-2015Q2-base, pkgsrc-2015Q2
Changes since 1.364: +8 -1 lines
Diff to previous 1.364 (colored)

Introduce preliminary support for Bitrig to pkgsrc
Initial patchset to add support by rodent@
Further adjustments made based on feedback by joerg@
Tested by myself with numerous bulkbuilds thanks to Patrick Wildt @ Bitrig

Reviewed by bsiegert@ joerg@ wiz@

Revision 1.364 / (download) - annotate - [select for diffs], Wed Apr 29 14:23:23 2015 UTC (3 years, 10 months ago) by jperkin
Branch: MAIN
Changes since 1.363: +8 -1 lines
Diff to previous 1.363 (colored)

Introduce _USE_CWRAPPERS logic to ensure consistency, USE_CWRAPPERS could
differ between a package and user setting, resulting in incorrect WRAPPER_*
values being set from wrapper-defs.mk.

Revision 1.363 / (download) - annotate - [select for diffs], Mon Apr 27 10:33:49 2015 UTC (3 years, 10 months ago) by tnn
Branch: MAIN
Changes since 1.362: +12 -6 lines
Diff to previous 1.362 (colored)

correct MACHINE_ARCH and compiler flags for HP-UX 64-bit ABI

Revision 1.362 / (download) - annotate - [select for diffs], Sun Apr 19 01:37:55 2015 UTC (3 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.361: +3 -1 lines
Diff to previous 1.361 (colored)

Specify safer WRKSRC for meta packages. As they don't extract files,
they won't create the subdirectory either. Since the SUBST targets try
to change to WRKSRC first, they fail. This is seen with meta packages
depending on Freetype2 when using X11_TYPE=native.

Revision 1.361 / (download) - annotate - [select for diffs], Sat Mar 14 17:37:19 2015 UTC (4 years ago) by sevan
Branch: MAIN
CVS Tags: pkgsrc-2015Q1-base, pkgsrc-2015Q1
Changes since 1.360: +3 -1 lines
Diff to previous 1.360 (colored)

OS X Tiger & prior used X11 from XFree86 project which is installed in
/usr/X11R6, set X11BASE to this location on those versions.

Reviewed by wiz@

Revision 1.360 / (download) - annotate - [select for diffs], Tue Feb 24 13:26:34 2015 UTC (4 years, 1 month ago) by riastradh
Branch: MAIN
Changes since 1.359: +2 -2 lines
Diff to previous 1.359 (colored)

Fix typo: NATIVE_MACHINE_ARCH, not NATIVE-MACHINE_ARCH.  Thanks, prlw1!

Revision 1.359 / (download) - annotate - [select for diffs], Mon Feb 16 10:43:36 2015 UTC (4 years, 1 month ago) by jperkin
Branch: MAIN
Changes since 1.358: +3 -3 lines
Diff to previous 1.358 (colored)

Put back SCO LOWER_OPSYS changes.

Revision 1.358 / (download) - annotate - [select for diffs], Sat Feb 14 05:01:32 2015 UTC (4 years, 1 month ago) by riastradh
Branch: MAIN
Changes since 1.357: +26 -4 lines
Diff to previous 1.357 (colored)

Accommodate an -eabi{,hf} suffix in MACHINE_GNU_PLATFORM.

This is necessary to match what NetBSD `build.sh tools' generates for
cross-compiler toolchains on earm.

Also, split APPEND_ELF into APPEND_ELF and NATIVE_APPEND_ELF, so we
don't get a spurious netbsdelf in NATIVE_MACHINE_GNU_PLATFORM when
cross-compiling on amd64 for earm.

Revision 1.357 / (download) - annotate - [select for diffs], Sun Feb 1 11:33:08 2015 UTC (4 years, 1 month ago) by obache
Branch: MAIN
Changes since 1.356: +3 -3 lines
Diff to previous 1.356 (colored)

Revert "Move version part from LOWWER_OPSYS to LOWER_OPSYS_VERSUFFIX for sco.",
proposed/discussed is required for such changes.

Revision 1.356 / (download) - annotate - [select for diffs], Thu Jan 1 09:00:28 2015 UTC (4 years, 2 months ago) by dholland
Branch: MAIN
Changes since 1.355: +4 -2 lines
Diff to previous 1.355 (colored)

Add a bunch of missing LP64PLATFORMS after reviewing the list in NetBSD's
build.sh:
	*-*-aarch64{,eb}
	*-*-ia64
	*-*-mips64{eb,el}
	*-*-powerpc64
	*-*-riscv64

Revision 1.355 / (download) - annotate - [select for diffs], Thu Jan 1 08:57:23 2015 UTC (4 years, 2 months ago) by dholland
Branch: MAIN
Changes since 1.354: +21 -1 lines
Diff to previous 1.354 (colored)

Add BIGENDIANPLATFORMS and LITTLEENDIANPLATFORMS, like LP64PLATFORMS, for
restricting broken packages.

Revision 1.354 / (download) - annotate - [select for diffs], Thu Jan 1 06:06:06 2015 UTC (4 years, 2 months ago) by dholland
Branch: MAIN
Changes since 1.353: +4 -4 lines
Diff to previous 1.353 (colored)

Add support for BROKEN_ON_PLATFORM and BROKEN_EXCEPT_ON_PLATFORM, as per
discussion on tech-pkg.

BROKEN_ON_PLATFORM and NOT_FOR_PLATFORM are the same, except that
(now) BROKEN_ON_PLATFORM sets PKG_FAIL_REASON and NOT_FOR_PLATFORM
sets PKG_SKIP_REASON. BROKEN_EXCEPT_FOR_PLATFORM and ONLY_FOR_PLATFORM
correspond in the same way.

The idea is that going forward we will distinguish unbuildable
packages that theoretically ought to be fixed (these are BROKEN) from
packages where it doesn't make sense to build (these are NOT_FOR)...
examples of the former include most non-64-bit-clean packges; examples
of the latter include OS-specific language bindings.

A general review of the uses of NOT_FOR_PLATFORM and ONLY_FOR_PLATFORM
(converting many of them to BROKEN...) is coming up.

Similarly, a general review of the uses of PKG_FAIL_REASON and
PKG_SKIP_REASON is coming up.

For this to become useful, pbulk needs to be taught to report failing
and skipped packages differently - the idea is that failing packages
should be reported up front and skipped packages don't need to be. This
has not been done yet, but one set of things at a time...

Revision 1.353 / (download) - annotate - [select for diffs], Tue Dec 30 15:13:19 2014 UTC (4 years, 2 months ago) by wiz
Branch: MAIN
Changes since 1.352: +1 -25 lines
Diff to previous 1.352 (colored)

Remove pkg_views support, second part: infrastructure.

Revision 1.352 / (download) - annotate - [select for diffs], Sun Dec 7 06:22:52 2014 UTC (4 years, 3 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2014Q4-base, pkgsrc-2014Q4
Changes since 1.351: +2 -2 lines
Diff to previous 1.351 (colored)

undefined PKGSRC_KEEP_BIN_PKGS must not be evaluated unconditionally.

Revision 1.351 / (download) - annotate - [select for diffs], Sat Dec 6 23:28:18 2014 UTC (4 years, 3 months ago) by agc
Branch: MAIN
Changes since 1.350: +9 -1 lines
Diff to previous 1.350 (colored)

Add a new definition, PKGSRC_KEEP_BIN_PKGS, which defaults to "no".
This definition controls whether the binary package which is built
during package installation will be copied to pkgsrc/packages/All.

To retain binary packages in pkgsrc/packages/All, set

	PKGSRC_KEEP_BIN_PKGS=yes

in environment or MAKECONF. If this is not set, binary packages
will not be preserved after their WRKDIR is removed. This may not
be what you want.

To preserve the status quo since 2013/05/22, and just delete the
binary package after it's built, the default for PKGSRC_KEEP_BIN_PKGS
is "no", or it can be explicitly set.

As reviewed on tech-pkg.

Revision 1.350 / (download) - annotate - [select for diffs], Sat Nov 29 06:03:02 2014 UTC (4 years, 3 months ago) by obache
Branch: MAIN
Changes since 1.349: +3 -3 lines
Diff to previous 1.349 (colored)

Move version part from LOWWER_OPSYS to LOWER_OPSYS_VERSUFFIX for sco.

Revision 1.349 / (download) - annotate - [select for diffs], Tue Nov 18 23:36:07 2014 UTC (4 years, 4 months ago) by joerg
Branch: MAIN
Changes since 1.348: +23 -4 lines
Diff to previous 1.348 (colored)

Sync MACHINE_ARCH -> GNU_ARCH mapping table with NetBSD. Most noticable
change outside ARM is going to i486 as platform name for x86.

Revision 1.348 / (download) - annotate - [select for diffs], Thu Aug 14 11:08:37 2014 UTC (4 years, 7 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2014Q3-base, pkgsrc-2014Q3
Changes since 1.347: +1 -4 lines
Diff to previous 1.347 (colored)

Split SMF handling across bsd.pkg.mk and bsd.prefs.mk.  Should fix issues
with packages which include bsd.prefs.mk before setting SMF variables.

Revision 1.347 / (download) - annotate - [select for diffs], Tue May 6 14:48:06 2014 UTC (4 years, 10 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2014Q2-base, pkgsrc-2014Q2
Changes since 1.346: +9 -1 lines
Diff to previous 1.346 (colored)

Move INIT_SYSTEM to bsd.prefs.mk, allowing it to be tested in
package Makefiles when packages perform custom rc.d handling.

Revision 1.346 / (download) - annotate - [select for diffs], Mon May 5 21:26:31 2014 UTC (4 years, 10 months ago) by ryoon
Branch: MAIN
Changes since 1.345: +3 -2 lines
Diff to previous 1.345 (colored)

Add amd64 to LP64PLATFORMS, OpenBSD returns amd64 instead of x86_64
No objection on public mailinglist.

Revision 1.345 / (download) - annotate - [select for diffs], Mon Apr 7 17:25:16 2014 UTC (4 years, 11 months ago) by asau
Branch: MAIN
Changes since 1.344: +3 -1 lines
Diff to previous 1.344 (colored)

Define OBJECT_FMT for FreeBSD.
Ignore long time obsolete FreeBSD 1-3 and consider FreeBSD ELF-only.

Revision 1.344 / (download) - annotate - [select for diffs], Fri Mar 14 22:05:18 2014 UTC (5 years ago) by ryoon
Branch: MAIN
CVS Tags: pkgsrc-2014Q1-base, pkgsrc-2014Q1
Changes since 1.343: +14 -1 lines
Diff to previous 1.343 (colored)

Add SCO OpenServer 5 and 6 support, 6 support is not tested yet.

Revision 1.343 / (download) - annotate - [select for diffs], Fri Mar 7 14:52:12 2014 UTC (5 years ago) by jperkin
Branch: MAIN
Changes since 1.342: +2 -2 lines
Diff to previous 1.342 (colored)

Detect newer RedHat distributions.

Revision 1.342 / (download) - annotate - [select for diffs], Sat Feb 22 09:40:52 2014 UTC (5 years, 1 month ago) by ryoon
Branch: MAIN
Changes since 1.341: +2 -2 lines
Diff to previous 1.341 (colored)

Use .elif, not .else if

Revision 1.341 / (download) - annotate - [select for diffs], Thu Feb 20 21:27:43 2014 UTC (5 years, 1 month ago) by jperkin
Branch: MAIN
Changes since 1.340: +3 -1 lines
Diff to previous 1.340 (colored)

Support X11BASE?=/usr for native X11 on RedHat and derivatives.

Revision 1.340 / (download) - annotate - [select for diffs], Fri Feb 14 07:43:46 2014 UTC (5 years, 1 month ago) by obache
Branch: MAIN
Changes since 1.339: +3 -1 lines
Diff to previous 1.339 (colored)

tell wget as a tool.

Revision 1.339 / (download) - annotate - [select for diffs], Thu Dec 19 23:50:29 2013 UTC (5 years, 3 months ago) by tron
Branch: MAIN
CVS Tags: pkgsrc-2013Q4-base, pkgsrc-2013Q4
Changes since 1.338: +11 -1 lines
Diff to previous 1.338 (colored)

Improve support for HTTPS master site URLs:
As the default fetch program "tnftp" (in "pkgsrc" and all released
versions of NetBSD) doesn't support HTTPS prefer "fetch" (DragonFlyBSD,
FreeBSD and Minix) or Curl (CygWin, Linux, Mac OS X, Solaris) if available.

Change during pkgsrc-freeze approved by Greg Troxel and Thomas Klausner.

Revision 1.338 / (download) - annotate - [select for diffs], Thu Sep 12 11:01:47 2013 UTC (5 years, 6 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2013Q3-base, pkgsrc-2013Q3
Changes since 1.337: +3 -1 lines
Diff to previous 1.337 (colored)

Introduce CATMAN_SECTION_SUFFIX which if set to 'yes' will ensure that
catman pages are installed with a suffix which matches their section
instead of the default '.0'.

Enable it by default on SunOS, which requires that particular layout.

Revision 1.337 / (download) - annotate - [select for diffs], Fri Jul 19 14:29:16 2013 UTC (5 years, 8 months ago) by ryoon
Branch: MAIN
Changes since 1.336: +3 -1 lines
Diff to previous 1.336 (colored)

Set OS_VARIANT for OmniOS.

* OmniOS (SunOS variant) is shipped with readline 6.2. OS_VARIANT=OmniOS
  will be used by devel/readline/buildlink3.mk.

Revision 1.336 / (download) - annotate - [select for diffs], Sun Apr 28 13:21:47 2013 UTC (5 years, 10 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2013Q2-base, pkgsrc-2013Q2
Changes since 1.335: +5 -1 lines
Diff to previous 1.335 (colored)

Introduce COMPILER_INCLUDE_DIRS, COMPILER_LIB_DIRS and SYSTEM_DEFAULT_RPATH.
default value are _OPSYS_INCLUDE_DIRS, _OPSYS_LIB_DIRS and _OPSYS_DEFAULT_RPATH,
defined in mk/platform/${OPSYS}.mk.
(maybe defined with compiler/development tools specific variables).

Revision 1.335 / (download) - annotate - [select for diffs], Wed Apr 3 13:45:49 2013 UTC (5 years, 11 months ago) by obache
Branch: MAIN
Changes since 1.334: +4 -2 lines
Diff to previous 1.334 (colored)

normalize LOWER_ARCH i?86 for Cygwin, same as Linux.

Revision 1.334 / (download) - annotate - [select for diffs], Fri Mar 1 00:07:46 2013 UTC (6 years ago) by tcort
Branch: MAIN
CVS Tags: pkgsrc-2013Q1-base, pkgsrc-2013Q1
Changes since 1.333: +6 -1 lines
Diff to previous 1.333 (colored)

bsd.prefs.mk: add definitions for Minix. PR pkg/45046 OK by agc.

Revision 1.333 / (download) - annotate - [select for diffs], Sat Feb 23 02:59:56 2013 UTC (6 years, 1 month ago) by obache
Branch: MAIN
Changes since 1.332: +2 -2 lines
Diff to previous 1.332 (colored)

native X11BASE=/usr on Cygwin.

Revision 1.332 / (download) - annotate - [select for diffs], Fri Feb 15 09:19:17 2013 UTC (6 years, 1 month ago) by obache
Branch: MAIN
Changes since 1.331: +2 -1 lines
Diff to previous 1.331 (colored)

set Cygwin kernel name to OS_VARIANT for further usage.

Revision 1.331 / (download) - annotate - [select for diffs], Sun Feb 10 12:25:17 2013 UTC (6 years, 1 month ago) by obache
Branch: MAIN
Changes since 1.330: +11 -2 lines
Diff to previous 1.330 (colored)

Add preference for Cygwin.

Revision 1.329.2.1 / (download) - annotate - [select for diffs], Thu Jan 24 11:16:37 2013 UTC (6 years, 2 months ago) by spz
Branch: pkgsrc-2012Q4
Changes since 1.329: +5 -2 lines
Diff to previous 1.329 (colored) next main 1.330 (colored)

Pullup ticket #4035 - requested by tron
mk/bsd.prefs.mk: build fix for MacOS

Revisions pulled up:
- mk/bsd.prefs.mk                                               1.330

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Jan 23 17:02:24 UTC 2013

   Modified Files:
   	pkgsrc/mk: bsd.prefs.mk

   Log Message:
   X11 (from the Xquartz distribution) gets installed under "/opt/X11" under
   Mac OS X Mountain Lion. "/usr/X11" is only a symbolic link. Use the correct
   path because buidlink3 will otherwise filter out "-I/opt/X11/include" which
   causes build failures of e.g. the "cairo" package.


   To generate a diff of this commit:
   cvs rdiff -u -r1.329 -r1.330 pkgsrc/mk/bsd.prefs.mk

Revision 1.330 / (download) - annotate - [select for diffs], Wed Jan 23 17:02:23 2013 UTC (6 years, 2 months ago) by tron
Branch: MAIN
Changes since 1.329: +5 -2 lines
Diff to previous 1.329 (colored)

X11 (from the Xquartz distribution) gets installed under "/opt/X11" under
Mac OS X Mountain Lion. "/usr/X11" is only a symbolic link. Use the correct
path because buidlink3 will otherwise filter out "-I/opt/X11/include" which
causes build failures of e.g. the "cairo" package.

Revision 1.329 / (download) - annotate - [select for diffs], Sat Dec 15 21:21:27 2012 UTC (6 years, 3 months ago) by markd
Branch: MAIN
CVS Tags: pkgsrc-2012Q4-base
Branch point for: pkgsrc-2012Q4
Changes since 1.328: +5 -1 lines
Diff to previous 1.328 (colored)

Set X11_ENCODINGSDIR correctly for builtin case as well as modular.

Revision 1.328 / (download) - annotate - [select for diffs], Sun Dec 9 20:21:18 2012 UTC (6 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.327: +2 -2 lines
Diff to previous 1.327 (colored)

Update X11_ENCODINGSDIR for fonts/encodings change.
From markd.

Revision 1.327 / (download) - annotate - [select for diffs], Tue Aug 14 17:16:07 2012 UTC (6 years, 7 months ago) by asau
Branch: MAIN
CVS Tags: pkgsrc-2012Q3-base, pkgsrc-2012Q3
Changes since 1.326: +2 -2 lines
Diff to previous 1.326 (colored)

Make "user-destdir" the default PKG_DESTDIR_SUPPORT value
since this is the general case these days and other cases are exceptions.
This simplifies development and prevents making some mistakes.

Revision 1.326 / (download) - annotate - [select for diffs], Tue Aug 14 15:27:07 2012 UTC (6 years, 7 months ago) by asau
Branch: MAIN
Changes since 1.325: +6 -6 lines
Diff to previous 1.325 (colored)

Introduce explicit name for no staged installation support: "none".
Keep "none" a default value for PKG_DESTDIR_SUPPORT for now.

Revision 1.325 / (download) - annotate - [select for diffs], Fri Jul 27 09:44:31 2012 UTC (6 years, 7 months ago) by jperkin
Branch: MAIN
Changes since 1.324: +2 -2 lines
Diff to previous 1.324 (colored)

Set default ABI on Solaris for SPARC too.

Revision 1.324 / (download) - annotate - [select for diffs], Mon Jul 2 15:49:41 2012 UTC (6 years, 8 months ago) by jperkin
Branch: MAIN
Changes since 1.323: +10 -1 lines
Diff to previous 1.323 (colored)

Introduce OS_VARIANT.  This variable can be used to differentiate operating
systems which share the same base system but offer contrasting environments,
for example the various illumos forks which all identify as "SunOS 5.11".

Detect SmartOS and set OS_VARIANT accordingly.

Revision 1.323 / (download) - annotate - [select for diffs], Thu Jun 14 21:57:37 2012 UTC (6 years, 9 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2012Q2-base, pkgsrc-2012Q2
Changes since 1.322: +2 -1 lines
Diff to previous 1.322 (colored)

Set a default Solaris/x86 ABI, restores previous behaviour when bootstrap
is ran without --abi.

Revision 1.322 / (download) - annotate - [select for diffs], Mon Jun 11 09:36:02 2012 UTC (6 years, 9 months ago) by jperkin
Branch: MAIN
Changes since 1.321: +6 -3 lines
Diff to previous 1.321 (colored)

Set MACHINE_ARCH=x86_64 when ABI=64 on Solaris/x86, required for packages
such as devel/gmp which do their own ABI determination.

Full clean bulk build with this change:

  http://mail-index.netbsd.org/pkgsrc-bulk/2012/06/11/msg008920.html

looks good.

Revision 1.321 / (download) - annotate - [select for diffs], Mon Mar 19 12:34:15 2012 UTC (7 years ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2012Q1-base, pkgsrc-2012Q1
Changes since 1.320: +17 -17 lines
Diff to previous 1.320 (colored)

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.

Revision 1.320 / (download) - annotate - [select for diffs], Tue Jan 17 20:43:25 2012 UTC (7 years, 2 months ago) by sbd
Branch: MAIN
Changes since 1.319: +1 -8 lines
Diff to previous 1.319 (colored)

Simplfy the MACHINE_ARCH/LOWER_ARCH settings on Linux.

1) Set LOWER_ARCH to the filtered uname -m output.
2) Set MACHINE_ARCH to LOWER_ARCH.
3) Brace LOWER_ARCH in a !defined block add it to MAKEFLAGS.

Revision 1.319 / (download) - annotate - [select for diffs], Mon Nov 28 00:00:49 2011 UTC (7 years, 3 months ago) by jmcneill
Branch: MAIN
CVS Tags: pkgsrc-2011Q4-base, pkgsrc-2011Q4
Changes since 1.318: +3 -1 lines
Diff to previous 1.318 (colored)

for X11_TYPE=native, default X11BASE to /usr/X11R7 on NetBSD if
X11FLAVOUR is "Xorg", so it is set right even when x* sets aren't installed

ok joerg

Revision 1.318 / (download) - annotate - [select for diffs], Wed Oct 26 16:01:14 2011 UTC (7 years, 5 months ago) by hans
Branch: MAIN
Changes since 1.317: +2 -2 lines
Diff to previous 1.317 (colored)

Add the minor number of the OS version to LOWER_OPSYS_VERSUFFIX.
Configure scripts tend to use it to distinguish different SunOS
versions.

Revision 1.317 / (download) - annotate - [select for diffs], Sat Oct 15 00:23:08 2011 UTC (7 years, 5 months ago) by reed
Branch: MAIN
Changes since 1.316: +3 -3 lines
Diff to previous 1.316 (colored)

Rename "flavor" to "pkgformat".

This is from Anton Panev's GSoC 2011 project to add RPM and DPKG
support to pkgsrc. (I am not adding that further support in this
commit.)

This is just a rename of the existing functionality. Now it will
be easy to test the GSoC work by simply putting in a single
directory (such as "rpm" or "deb"). See
http://addpackageforma.sourceforge.net/ for some details.

This is from Anton's CVS, but I made some minor changes:

- changed plural pkgformats to singular pkgformat (to be consistent)

- fixed a few places (in comments) that were missed

- catch up on some additions to flavor not in the pkgforma cvs:
PKGSRC_SETENV and _flavor-destdir-undo-replace and
undo-destdir-replace-install.

Revision 1.316 / (download) - annotate - [select for diffs], Sat Sep 10 16:30:02 2011 UTC (7 years, 6 months ago) by abs
Branch: MAIN
CVS Tags: pkgsrc-2011Q3-base, pkgsrc-2011Q3
Changes since 1.315: +2 -2 lines
Diff to previous 1.315 (colored)

From "What platforms work with X11_TYPE=native" thread on pkgsrc-users.

Based on the responses I'm going to switch the default X11_TYPE to
be modular, and override in platform/*.mk files as required. The
new values will be:

Changed - from native to modular
- FreeBSD
- FreeMiNT
- Linux

Changed - older versions switched from native to modular
- NetBSD - native for NetBSD-4 and later

Native (unchanged)  - should probably be switched to modular
- AIX
- BSDOS
- IRIX
- Interix
- MirBSD
- UnixWare

Native (unchanged)
- Darwin - for Leopard (10.5) and later
- OpenBSD.mk
- SunOS.mk

Modular (unchanged)
- DragonFly
- HPUX
- Haiku
- OSF1

I'd like to encourage anyone using X11 apps on any platforms other
than NetBSD, Darwin, DragonFly, FreeBSD, Linux, FreeMiNT, HPUX,
Haiku or OSF1 to speak up, whether they are happy with native or
having to set modular.

Revision 1.315 / (download) - annotate - [select for diffs], Thu Sep 8 20:17:15 2011 UTC (7 years, 6 months ago) by abs
Branch: MAIN
Changes since 1.314: +2 -2 lines
Diff to previous 1.314 (colored)

Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to ${SETENV} -i
to santise environment

Revision 1.314 / (download) - annotate - [select for diffs], Thu Apr 7 08:08:45 2011 UTC (7 years, 11 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2011Q2-base, pkgsrc-2011Q2
Changes since 1.313: +6 -7 lines
Diff to previous 1.313 (colored)

Make USE_DESTDIR=yes default, and warn if a package is not converted
to destdir yet. Based on a patch by Greg Troxel.

Revision 1.313 / (download) - annotate - [select for diffs], Mon Jan 31 08:18:44 2011 UTC (8 years, 1 month ago) by sbd
Branch: MAIN
CVS Tags: pkgsrc-2011Q1-base, pkgsrc-2011Q1
Changes since 1.312: +2 -2 lines
Diff to previous 1.312 (colored)

Remove the unneeded backslashes from the AIX OS_VERSION setting.
Closes PR/44421.

Revision 1.312 / (download) - annotate - [select for diffs], Sun Jan 23 19:07:25 2011 UTC (8 years, 2 months ago) by agc
Branch: MAIN
Changes since 1.311: +13 -1 lines
Diff to previous 1.311 (colored)

Add support for MirBSD to pkgsrc.  Patches from Benny Siegert and
Thorsten Glaser.

Revision 1.311 / (download) - annotate - [select for diffs], Tue Aug 24 19:08:28 2010 UTC (8 years, 7 months ago) by bad
Branch: MAIN
CVS Tags: pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3
Changes since 1.310: +3 -3 lines
Diff to previous 1.310 (colored)

I'm fed up with having to waste time because PKG_DEVELOPER is "special" and
can't be disabled by setting it to "no" like the other variables.
Besides, flavor/pkg/metadata.mk has been expecting for a long time that "no"
is a valid value.

Make PKG_DEVELOPER DWIM.

Revision 1.310 / (download) - annotate - [select for diffs], Wed May 19 09:12:15 2010 UTC (8 years, 10 months ago) by sbd
Branch: MAIN
CVS Tags: pkgsrc-2010Q2-base, pkgsrc-2010Q2
Changes since 1.309: +2 -1 lines
Diff to previous 1.309 (colored)

Add BUILTIN_PKGS with the "builtin" package names to the build information.

E.g if readline 6.0 and ncurses 5.7 are part of the system we get:
BUILTIN_PKGS=readline-6.0 ncurses-5.7

Revision 1.309 / (download) - annotate - [select for diffs], Fri Apr 30 03:29:55 2010 UTC (8 years, 10 months ago) by sbd
Branch: MAIN
Changes since 1.308: +3 -1 lines
Diff to previous 1.308 (colored)

Make all packages that set OSVERSION_SPECIFIC depends on pkgtools/osabi.

Also include a note about changes to OS_VERSION in bsd.prefs.mk

Revision 1.308 / (download) - annotate - [select for diffs], Sun Apr 18 21:51:49 2010 UTC (8 years, 11 months ago) by sbd
Branch: MAIN
Changes since 1.307: +3 -3 lines
Diff to previous 1.307 (colored)

Set NATIVE_MACHINE_GNU_PLATFORM & MACHINE_GNU_PLATFORM using
NATIVE_MACHINE_GNU_ARCH & MACHINE_GNU_ARCH respectively.

Fixes PR pkg/43147.

Revision 1.307 / (download) - annotate - [select for diffs], Sat Feb 6 11:40:22 2010 UTC (9 years, 1 month ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2010Q1-base, pkgsrc-2010Q1
Changes since 1.306: +7 -1 lines
Diff to previous 1.306 (colored)

Set LOWER_VENDOR=pc for Haiku/i386.

Revision 1.306 / (download) - annotate - [select for diffs], Fri Jan 29 17:20:51 2010 UTC (9 years, 1 month ago) by joerg
Branch: MAIN
Changes since 1.305: +5 -1 lines
Diff to previous 1.305 (colored)

Enable USE_DESTDIR by default for PKG_DEVELOPER.

Revision 1.305 / (download) - annotate - [select for diffs], Fri Jan 29 17:20:27 2010 UTC (9 years, 1 month ago) by joerg
Branch: MAIN
Changes since 1.304: +1 -6 lines
Diff to previous 1.304 (colored)

Retire USE_DESTDIR=full workaround.

Revision 1.304 / (download) - annotate - [select for diffs], Sun Jan 17 08:04:32 2010 UTC (9 years, 2 months ago) by dholland
Branch: MAIN
Changes since 1.303: +2 -2 lines
Diff to previous 1.303 (colored)

minor English usage nit

Revision 1.303 / (download) - annotate - [select for diffs], Sat Jan 16 02:16:35 2010 UTC (9 years, 2 months ago) by obache
Branch: MAIN
Changes since 1.302: +3 -1 lines
Diff to previous 1.302 (colored)

Add support of SSD/Linux.
 * ROOT_GROUP=wheel, fixes PR#42073.
 * LOWER_VENDOR=ssd
 * adjust paths for some tools

Revision 1.302 / (download) - annotate - [select for diffs], Wed Jan 6 18:21:44 2010 UTC (9 years, 2 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2009Q4-base, pkgsrc-2009Q4
Changes since 1.301: +8 -1 lines
Diff to previous 1.301 (colored)

Add LP64PLATFORMS, a list of patterns for 64bit systems.
This allows easily disabling software that is not 64bit clean.

Revision 1.301 / (download) - annotate - [select for diffs], Sun Dec 13 08:19:45 2009 UTC (9 years, 3 months ago) by obache
Branch: MAIN
Changes since 1.300: +9 -5 lines
Diff to previous 1.300 (colored)

Interix>=5.2 have libc.so.5.2, but no higer revision exists.
So gave up to detect OS_VERSION with shlib version if libc.so.5.2 exists.

Revision 1.300 / (download) - annotate - [select for diffs], Thu Sep 24 17:24:13 2009 UTC (9 years, 6 months ago) by tron
Branch: MAIN
CVS Tags: pkgsrc-2009Q3-base, pkgsrc-2009Q3
Changes since 1.299: +11 -6 lines
Diff to previous 1.299 (colored)

Unconditionally set the default ABI to 32-Bit for Mac OS X Snow Leopard.
There are too many third party applications which don't build using
the 64-Bit ABI at the moment.

Approved by Alistair Crooks.

Revision 1.299 / (download) - annotate - [select for diffs], Tue Sep 22 19:19:29 2009 UTC (9 years, 6 months ago) by hasso
Branch: MAIN
Changes since 1.298: +5 -1 lines
Diff to previous 1.298 (colored)

Workaround for amd64 vs x86_64 mess on DragonFly as well.

Revision 1.298 / (download) - annotate - [select for diffs], Tue Sep 22 09:17:50 2009 UTC (9 years, 6 months ago) by tron
Branch: MAIN
Changes since 1.297: +13 -1 lines
Diff to previous 1.297 (colored)

Try again to fix Mac OS X Snow Leopard ABI issue (32-bit vs. 64-bit):
1.) Always set the "ABI" variable.
2.) Default to 64-bit mode if the machine is able to run 64-bit binaries.
    This seems to match the default behavior of Xcode (Apple's toolchain).
3.) Set "LOWER_ARCH" so it automatically evalutes to the correct value
    based on the ABI we are compiling for, not on based on the kernel
    the machine is running. This even works properly if the ABI is
    set in "/etc/mk.conf" or on the command line.

Thanks a lot to OBATA Akio for providing the crucial hint to get
this working properly.

Revision 1.297 / (download) - annotate - [select for diffs], Mon Sep 21 15:28:03 2009 UTC (9 years, 6 months ago) by tron
Branch: MAIN
Changes since 1.296: +1 -19 lines
Diff to previous 1.296 (colored)

Revert last change. It doesn't work properly because the "ABI" setting
is not defined that early as we have included neither "bsd.own.mk"
nor "mk.conf" yet.

We unfortunately cannot make these adjustments later because "bsd.own.mk"
and "mk.conf" would be processed with an incorrect value for
"MACHINE_ARCH".

Revision 1.296 / (download) - annotate - [select for diffs], Mon Sep 21 10:56:08 2009 UTC (9 years, 6 months ago) by tron
Branch: MAIN
Changes since 1.295: +19 -1 lines
Diff to previous 1.295 (colored)

Try to fix Mac OS X Snow Leopard ABI issue (32-bit vs. 64-bit):
1.) Always set the "ABI" variable.
2.) Default to 64-bit mode if the machine is able to run 64-bit binaries.
    This seems to match the default behavior of Xcode (Apple's toolchain).
3.) Set "LOWER_ARCH" based on the ABI we are compiling for, not on
    based on the kernel the machine is running.

The "gnupg" package now builds for the 64-Bit API without extra tricks.

Revision 1.295 / (download) - annotate - [select for diffs], Sun Sep 13 13:28:46 2009 UTC (9 years, 6 months ago) by tron
Branch: MAIN
Changes since 1.294: +3 -2 lines
Diff to previous 1.294 (colored)

Add support for X.org bundled with Mac OS X Snow Leopard.

Revision 1.294 / (download) - annotate - [select for diffs], Sat May 23 23:48:44 2009 UTC (9 years, 10 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2009Q2-base, pkgsrc-2009Q2
Changes since 1.293: +5 -1 lines
Diff to previous 1.293 (colored)

For developer mode, warn about packages without destdir support.

Revision 1.293 / (download) - annotate - [select for diffs], Tue May 19 09:33:53 2009 UTC (9 years, 10 months ago) by wiz
Branch: MAIN
Changes since 1.292: +2 -2 lines
Diff to previous 1.292 (colored)

Fix previous:
Actually check what you want to check -- both for "yes" and "no", not
only for "no".

Revision 1.292 / (download) - annotate - [select for diffs], Sun May 17 23:44:53 2009 UTC (9 years, 10 months ago) by joerg
Branch: MAIN
Changes since 1.291: +4 -1 lines
Diff to previous 1.291 (colored)

Sanity check that USE_DESTDIR is either yes or no after downgrading
USE_DESTDIR=full. This makes setting USE_DESTDIR=full on the command
line an explicit error as side effect.

Revision 1.291 / (download) - annotate - [select for diffs], Sat May 9 14:59:08 2009 UTC (9 years, 10 months ago) by joerg
Branch: MAIN
Changes since 1.290: +7 -6 lines
Diff to previous 1.290 (colored)

Make USE_DESTDIR=full the default value and retire the option.

Revision 1.290 / (download) - annotate - [select for diffs], Wed Apr 8 23:03:14 2009 UTC (9 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.289: +2 -1 lines
Diff to previous 1.289 (colored)

Clear USE_LANGUAGES for meta packages.

Revision 1.289 / (download) - annotate - [select for diffs], Wed Apr 8 23:02:03 2009 UTC (9 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.288: +2 -1 lines
Diff to previous 1.288 (colored)

Disable CHECK_PERMS by default for meta-packages.

Revision 1.288 / (download) - annotate - [select for diffs], Sun Oct 5 21:36:34 2008 UTC (10 years, 5 months ago) by cube
Branch: MAIN
CVS Tags: pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4
Changes since 1.287: +3 -1 lines
Diff to previous 1.287 (colored)

Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.

Revision 1.286.6.2 / (download) - annotate - [select for diffs], Wed Sep 24 17:47:29 2008 UTC (10 years, 6 months ago) by cube
Branch: cube-native-xorg
Changes since 1.286.6.1: +3 -1 lines
Diff to previous 1.286.6.1 (colored) to branchpoint 1.286 (colored) next main 1.287 (colored)

Pull-up 1.287 for MacOS X support.

Revision 1.287 / (download) - annotate - [select for diffs], Tue Sep 16 11:40:10 2008 UTC (10 years, 6 months ago) by tron
Branch: MAIN
CVS Tags: pkgsrc-2008Q3-base, pkgsrc-2008Q3
Changes since 1.286: +3 -1 lines
Diff to previous 1.286 (colored)

X11 is located in "/usr/X11" under Mac OS X Leopard, "/usr/X11R6" is just
a symlink. Use the correct directory because the buildlink framework will
otherwise remove compiler options like "-I/usr/X11/include/pixman-1".

Revision 1.286.6.1 / (download) - annotate - [select for diffs], Sat Sep 13 05:05:16 2008 UTC (10 years, 6 months ago) by cube
Branch: cube-native-xorg
Changes since 1.286: +3 -1 lines
Diff to previous 1.286 (colored)

Detect X11BASE as /usr/X11R7.  From John Nemeth.

Revision 1.286 / (download) - annotate - [select for diffs], Sun Jun 22 16:25:32 2008 UTC (10 years, 9 months ago) by tnn
Branch: MAIN
CVS Tags: pkgsrc-2008Q2-base, pkgsrc-2008Q2, cwrapper, cube-native-xorg-base
Branch point for: cube-native-xorg
Changes since 1.285: +2 -5 lines
Diff to previous 1.285 (colored)

Simplify the logic that avoids using compat_headers during bootstrap.

Revision 1.285 / (download) - annotate - [select for diffs], Mon Jun 16 15:10:48 2008 UTC (10 years, 9 months ago) by joerg
Branch: MAIN
Changes since 1.284: +4 -1 lines
Diff to previous 1.284 (colored)

Make it more explicit that PKG_DESTDIR_SUPPORT and as side effect
META_PACKAGE must be set before including bsd.prefs.mk.

Revision 1.284 / (download) - annotate - [select for diffs], Thu Jun 12 01:09:02 2008 UTC (10 years, 9 months ago) by joerg
Branch: MAIN
Changes since 1.283: +19 -1 lines
Diff to previous 1.283 (colored)

Move META_PACKAGE logic from bsd.pkg.mk to bds.prefs.mk, otherwise it
can't define destdir support.

Revision 1.283 / (download) - annotate - [select for diffs], Sat May 24 03:40:35 2008 UTC (10 years, 10 months ago) by tnn
Branch: MAIN
Changes since 1.282: +3 -3 lines
Diff to previous 1.282 (colored)

Adjust path for compat_headers.

Revision 1.282 / (download) - annotate - [select for diffs], Thu May 22 15:48:13 2008 UTC (10 years, 10 months ago) by tnn
Branch: MAIN
Changes since 1.281: +1 -6 lines
Diff to previous 1.281 (colored)

Daniel Horecki pointed out on irc that all USE_INET6 references have been
purged from pkgsrc-wip, so remove the support code for that.

Revision 1.281 / (download) - annotate - [select for diffs], Wed Apr 16 12:28:48 2008 UTC (10 years, 11 months ago) by tnn
Branch: MAIN
Changes since 1.280: +3 -2 lines
Diff to previous 1.280 (colored)

Avoid pulling in pkgtools/posix_headers when bootstrapping on HP-UX.

Revision 1.280 / (download) - annotate - [select for diffs], Thu Feb 21 04:23:58 2008 UTC (11 years, 1 month ago) by tnn
Branch: MAIN
CVS Tags: pkgsrc-2008Q1-base, pkgsrc-2008Q1
Changes since 1.279: +1 -4 lines
Diff to previous 1.279 (colored)

Kill _OPSYS_NEEDS_XPKGWEDGE. It was only used by two platforms and they
will default to USE_XPKGWEDGE anyway.

Revision 1.279 / (download) - annotate - [select for diffs], Thu Feb 7 16:43:18 2008 UTC (11 years, 1 month ago) by tnn
Branch: MAIN
Changes since 1.278: +4 -2 lines
Diff to previous 1.278 (colored)

Fix a miss that made the hpux bootstrap erronously pull in posix_headers.

Revision 1.278 / (download) - annotate - [select for diffs], Wed Feb 6 18:23:47 2008 UTC (11 years, 1 month ago) by tnn
Branch: MAIN
Changes since 1.277: +2 -2 lines
Diff to previous 1.277 (colored)

Recognise Solaris/xen as i386

Revision 1.277 / (download) - annotate - [select for diffs], Tue Jan 29 13:04:05 2008 UTC (11 years, 1 month ago) by tnn
Branch: MAIN
Changes since 1.276: +3 -11 lines
Diff to previous 1.276 (colored)

Simplify LOWER_OS_VERSION handling by using the :tl modifier.

Revision 1.276 / (download) - annotate - [select for diffs], Wed Jan 16 03:16:39 2008 UTC (11 years, 2 months ago) by tnn
Branch: MAIN
Changes since 1.275: +7 -1 lines
Diff to previous 1.275 (colored)

Provide a mechanism for enabling use of pkgtools/posix_headers.

Revision 1.275 / (download) - annotate - [select for diffs], Sat Jan 12 14:40:21 2008 UTC (11 years, 2 months ago) by joerg
Branch: MAIN
Changes since 1.274: +4 -1 lines
Diff to previous 1.274 (colored)

If LOWER_ARCH is x86_64 on Linux, force it for MACHINE_ARCH as well.
On a Core 2 Xeon, it breaks a lot of things otherwise as it ends up as
something like "Intel(R) Core(R)".

Revision 1.274 / (download) - annotate - [select for diffs], Fri Jan 4 01:46:24 2008 UTC (11 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.273: +6 -6 lines
Diff to previous 1.273 (colored)

Made the .include directives simpler, since the directory of the
including file is always the first in the search path.

Revision 1.273 / (download) - annotate - [select for diffs], Wed Oct 17 10:37:43 2007 UTC (11 years, 5 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2007Q4-base, pkgsrc-2007Q4
Changes since 1.272: +2 -3 lines
Diff to previous 1.272 (colored)

Accept all licenses in DEFAULT_ACCEPTABLE_LICENSES if the user is only
using the += operator, not the simple = operator, in mk.conf. That way
we can mark packages as having open source licenses without disturbing
the users.

Revision 1.272 / (download) - annotate - [select for diffs], Tue Oct 16 11:51:21 2007 UTC (11 years, 5 months ago) by tnn
Branch: MAIN
Changes since 1.271: +5 -3 lines
Diff to previous 1.271 (colored)

The previous commit needs all platforms to be correct about
separating LOWER_OPSYS and LOWER_OPSYS_VERSUFFIX, since numbers are now
removed from LOWER_OPSYS when forming MACHINE_GNU_PLATFORM.
Fix the remaining to platforms: Interix and IRIX.

Revision 1.271 / (download) - annotate - [select for diffs], Tue Oct 16 11:34:16 2007 UTC (11 years, 5 months ago) by tnn
Branch: MAIN
Changes since 1.270: +8 -6 lines
Diff to previous 1.270 (colored)

OSF1 and HPUX: Separate the version component from ${LOWER_OPSYS}
into ${LOWER_OPSYS_VERSUFFIX}.
When assigning GNU_MACHINE_PLATFORM, strip numerical characters from
LOWER_OPSYS. (final component is eg. osf5.1 not osf15.1)

Revision 1.270 / (download) - annotate - [select for diffs], Sat Oct 13 19:38:53 2007 UTC (11 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.269: +3 -1 lines
Diff to previous 1.269 (colored)

Ignore post-hyphen parts of the Linux kernel version similiar to
DragonFly and FreeBSD. It seems like Linux people love those...
This addresses the first part of PR 37100.

Revision 1.269 / (download) - annotate - [select for diffs], Fri Oct 5 21:03:39 2007 UTC (11 years, 5 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2007Q3-base, pkgsrc-2007Q3
Changes since 1.268: +6 -1 lines
Diff to previous 1.268 (colored)

I often want to know which directories pkgsrc is using.

Revision 1.268 / (download) - annotate - [select for diffs], Tue Sep 11 18:16:38 2007 UTC (11 years, 6 months ago) by abs
Branch: MAIN
Changes since 1.267: +2 -2 lines
Diff to previous 1.267 (colored)

+USE_INET6?=${IPV6_READY} rather than =, so it can be overidden

Revision 1.267 / (download) - annotate - [select for diffs], Fri Sep 7 22:12:14 2007 UTC (11 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.266: +8 -9 lines
Diff to previous 1.266 (colored)

Convert packages that test and use USE_INET6 to use the options framework
and to support the "inet6" option instead.

Remaining usage of USE_INET6 was solely for the benefit of the scripts
that generate the README.html files.  Replace:

	BUILD_DEFS+=	USE_INET6
with
	BUILD_DEFS+=	IPV6_READY

and teach the README-generation tools to look for that instead.

This nukes USE_INET6 from pkgsrc proper.  We leave a tiny bit of code
to continue to support USE_INET6 for pkgsrc-wip until it has been nuked
from there as well.

Revision 1.266 / (download) - annotate - [select for diffs], Fri Sep 7 21:55:44 2007 UTC (11 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.265: +4 -1 lines
Diff to previous 1.265 (colored)

Add a "system features" framework that will eventually be used to
automatically supply missing "basic" headers and libraries from an
older system, e.g. IRIX 5.x or Interix or AIX, etc.

Example usage:

    USE_FEATURES+=      snprintf glob regex

For now, we just pull in libnbcompat to supply the missing bits.

Revision 1.265 / (download) - annotate - [select for diffs], Fri Aug 17 20:27:30 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.264: +2 -11 lines
Diff to previous 1.264 (colored)

Remove infrastructure side of Xorg 6.9 support. Begin to simplify
some of the cases of X11_TYPE usage -- it will stay with modular|native,
so don't bother with keeping the separation in the tool list.

Revision 1.264 / (download) - annotate - [select for diffs], Wed Aug 15 13:25:47 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.263: +16 -15 lines
Diff to previous 1.263 (colored)

Move APPENDELF definition after the reassigning of MACHINE_ARCH.
This allows cross-compiling of x86_64 from i386.

Revision 1.263 / (download) - annotate - [select for diffs], Mon Aug 13 09:03:41 2007 UTC (11 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.262: +35 -23 lines
Diff to previous 1.262 (colored)

Replaced the comment at the beginning of the file with a useful one. It
explains which variables can be used in the mk.conf file.

Removed the definition of CUT, since it is no longer used.

Revision 1.262 / (download) - annotate - [select for diffs], Mon Aug 13 07:42:10 2007 UTC (11 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.261: +5 -4 lines
Diff to previous 1.261 (colored)

Fixed joerg's failed try to support invoking make(1) as ./make or similar.
It had failed in the devel/ directory, since devel/bmake exists there.

Revision 1.261 / (download) - annotate - [select for diffs], Thu Aug 2 18:19:31 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.260: +23 -1 lines
Diff to previous 1.260 (colored)

Add core of the infrastructure support for cross-compilation.

- USE_CROSS_COMPILATION activates it, CROSS_DESTDIR specifies root of
  the target filesystem
- derive _CROSS_DESTDIR from CROSS_DESTDIR or MAKEOBJDIR
- buildlink3.mk prefixes the files to symlink with _CROSS_DESTDIR
- compiler/gcc.mk knows about the target prefix (e.g. i386--netbsdelf)
- PKG_DBDIR is prefixed with _CROSS_DESTDIR
- package-install and bin-install are not called with su
- install and strip are redirected to the tool version
- links for the target specific ar, as, ld, nm, objdump, ranlib and
  strip are added
- compiler wrapper detect if linking is requested or not
- special command sinks for CPP and CC/CXX add the cross-compile magic:
  - modify include dirs to get the target /usr/include
  - modify linker dirs and runpath to use target /usr/lib at link time,
    but keep correct rpath entries

Supported-by: Google SoC 2007
Basic tests by he@ on Sparc. Review from jlam@.

Revision 1.260 / (download) - annotate - [select for diffs], Wed Aug 1 16:14:17 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.259: +14 -7 lines
Diff to previous 1.259 (colored)

Begin adding some of the basic, non-intrusive pieces of the
cross-compile support.

- NATIVE_MACHINE_GNU_ARCH, NATIVE_LOWER_ARCH, NATIVE_MACHINE_ARCH,
  NATIVE_MACHINE_PLATFORM and NATIVE_MACHINE_GNU_PLATFORM work
  like the counterpars without NATIVE_ prefix. Expansion of
  NATIVE_LOWER_ARCH and NATIVE_MACHINE_ARCH is enforced early,
  so that MACHINE_ARCH can be overriden in mk.conf to specify the
  target architecture.
- Provide a default of NO for USE_CROSS_COMPILE. This will be the
  main switch to activate cross-compiling and adding it now makes
  it possible to merge more of the patches for specific packages.
- Set --build and --host when cross-compiling, the former using the
  just added variable NATIVE_MACHINE_GNU_PLATFORM.

Supported-by: Google SoC 2007
Looks good: jlam@

Revision 1.259 / (download) - annotate - [select for diffs], Wed Aug 1 12:21:56 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.258: +4 -2 lines
Diff to previous 1.258 (colored)

Define PKGPATH earlier so that mk.conf can use it.
Requested by David Brownlee on tech-pkg.

Revision 1.258 / (download) - annotate - [select for diffs], Mon Jul 30 14:10:36 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.257: +2 -2 lines
Diff to previous 1.257 (colored)

Compute OS_VERSION on AIX directly using make substitution instead of
forking a shell and sed.

Revision 1.257 / (download) - annotate - [select for diffs], Mon Jul 30 14:07:07 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.256: +3 -3 lines
Diff to previous 1.256 (colored)

Use variable substitution instead of calling external cut to
compute LOWER_OPSYS_VERSUFFIX.

Revision 1.256 / (download) - annotate - [select for diffs], Sun Jul 29 18:27:05 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.255: +4 -1 lines
Diff to previous 1.255 (colored)

Allow the code to resolve the make path to deal with a strictly
local path. E.g. running make as ./make now works.

Revision 1.255 / (download) - annotate - [select for diffs], Sun Jul 29 13:17:57 2007 UTC (11 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.254: +1 -7 lines
Diff to previous 1.254 (colored)

Remove explicit include of sys.mk, which has been made redundant by
jlam's include of bsd.own.mk in June 2002.

Revision 1.254 / (download) - annotate - [select for diffs], Sun Jul 29 05:19:41 2007 UTC (11 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.253: +6 -1 lines
Diff to previous 1.253 (colored)

* Add new emulator framework in pkgsrc/mk/emulator that handles all
  binary-only packages that require binary "emulation" on the native
  operating system.  Please see pkgsrc/mk/emulator/README for more
  details.

* Teach the plist framework to automatically use any existing
  PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition.

* Convert all of the binary-only packages in pkgsrc to use the
  emulator framework.  Most of them have been tested to install and
  deinstall correctly.  This involves the following cleanup actions:

    * Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM}
      more consistently.

    * Simplify packages by using default INSTALL and DEINSTALL scripts
      instead of custom INSTALL/DEINSTALL code.

    * Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc.
      Packages only need to state exactly which emulations they support,
      and the framework handles any i386-on-x86_64 or sparc-on-sparc64
      uses.

    * Remove "USE_NATIVE_LINUX" from pkgsrc.  The framework will
      automatically detect when the package is installing on Linux.

  Specific changes to packages include:

    * Bump the PKGREVISIONs for all of the suse100* and suse91* packages
      due to changes in the +INSTALL/+DEINSTALL scripts used in all
      of the packages.

    * Remove pkgsrc/emulators/suse_linux, which is unused by any
      packages.

    * cad/lc -- remove custom code to create the distinfo file for
	all supported platforms; just use "emul-fetch" and "emul-distinfo"
	instead.

    * lang/Cg-compiler -- install the shared libraries under ${EMULDIR}
	instead of ${PREFIX}/lib so that compiled programs will find
	the shared libraries.

    * mail/thunderbird-bin-nightly -- update to latest binary
	distributions for supported platforms.

    * multimedia/ns-flash -- update Linux version to 9.0.48 as the
	older version is no longer available for interactive fetch.

    * security/uvscan -- set LD_LIBRARY_PATH explicitly so that
	it's not necessary to install library symlinks into
	${EMULDIR}/usr/local/lib.

    * www/firefox-bin-flash -- update Linux version to 9.0.48 as the
	older version is no longer available for interactive fetch.

Revision 1.253 / (download) - annotate - [select for diffs], Fri Jul 20 22:40:56 2007 UTC (11 years, 8 months ago) by joerg
Branch: MAIN
Changes since 1.252: +1 -9 lines
Diff to previous 1.252 (colored)

Kill code to catch Zoularis installations. It is three years old and
anyone still having such an old installation has other issues like nbawk
anyway.

Revision 1.252 / (download) - annotate - [select for diffs], Tue Jul 17 09:20:18 2007 UTC (11 years, 8 months ago) by joerg
Branch: MAIN
Changes since 1.251: +2 -1 lines
Diff to previous 1.251 (colored)

Drop trailing components like -RELEASE for FreeBSD like we do for
DragonFly. This fixes the version number of lsof as side effect.

Revision 1.251 / (download) - annotate - [select for diffs], Tue May 29 14:48:49 2007 UTC (11 years, 9 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2007Q2-base, pkgsrc-2007Q2
Changes since 1.250: +3 -1 lines
Diff to previous 1.250 (colored)

Add some more keywords, so that one can grep for "mk.conf" and find the
relevant code that loads the configuration.

Revision 1.250 / (download) - annotate - [select for diffs], Mon May 7 22:16:04 2007 UTC (11 years, 10 months ago) by rillig
Branch: MAIN
Changes since 1.249: +2 -2 lines
Diff to previous 1.249 (colored)

On Cygwin, OS_VERSION contains special characters, so it needs the :Q
operator. An example version is 1.5.24(0.156/4/2).

Revision 1.249 / (download) - annotate - [select for diffs], Tue Apr 17 19:45:35 2007 UTC (11 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.248: +2 -2 lines
Diff to previous 1.248 (colored)

Fix last commit to really save forks at mentioned by rillig@:
OPSYS needs to be evaluated in-place, so use :=.

Revision 1.248 / (download) - annotate - [select for diffs], Tue Apr 17 10:48:29 2007 UTC (11 years, 11 months ago) by tnn
Branch: MAIN
Changes since 1.247: +2 -2 lines
Diff to previous 1.247 (colored)

Save a fork() by not invoking the 'tr' utility.
XXX: the OS_VERSION stuff could use a similar cleanup, replacing
tr A-Z a-z occurences with the make :tl modifier.

Revision 1.247 / (download) - annotate - [select for diffs], Sat Apr 14 14:17:49 2007 UTC (11 years, 11 months ago) by tnn
Branch: MAIN
Changes since 1.246: +17 -3 lines
Diff to previous 1.246 (colored)

Teach pkgsrc about HP-UX.

Revision 1.246 / (download) - annotate - [select for diffs], Wed Apr 11 19:09:24 2007 UTC (11 years, 11 months ago) by tnn
Branch: MAIN
Changes since 1.245: +3 -1 lines
Diff to previous 1.245 (colored)

Set correct OBJECT_FMT on OSF1.

Revision 1.245 / (download) - annotate - [select for diffs], Thu Mar 1 18:21:31 2007 UTC (12 years ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2007Q1-base, pkgsrc-2007Q1, jlam-pkgviews-base, jlam-pkgviews
Changes since 1.244: +1 -2 lines
Diff to previous 1.244 (colored)

Remove unused SCRIPTDIR variable.

Revision 1.244 / (download) - annotate - [select for diffs], Fri Feb 16 16:09:23 2007 UTC (12 years, 1 month ago) by tonio
Branch: MAIN
Changes since 1.243: +5 -1 lines
Diff to previous 1.243 (colored)

Make sure MACHINE_ARCH is set to x86_64 for FreeBSD-amd64

Revision 1.243 / (download) - annotate - [select for diffs], Wed Dec 27 14:29:45 2006 UTC (12 years, 3 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2006Q4-base, pkgsrc-2006Q4
Changes since 1.242: +10 -11 lines
Diff to previous 1.242 (colored)

Move USE_XPKGWEDGE handling to bsd.prefs.mk. The logic depends on
X11_TYPE and some other settings which can overriden by the platform
defaults. This has the nice side effect of simplifying the handling
in bsd.prefs.mk. Discussed with and reviewed by wiz@. Keep the
documentation for USE_XPKGWEDGE in defaults/mk.conf as suggested by
salo@.

Revision 1.242 / (download) - annotate - [select for diffs], Wed Dec 20 01:04:46 2006 UTC (12 years, 3 months ago) by joerg
Branch: MAIN
Changes since 1.241: +5 -2 lines
Diff to previous 1.241 (colored)

For modular Xorg disable xpkgwedge (will be made a hard error later).
Don't add ${X11BASE}/bin to PATH, don't include mk/x11.buildlink3.mk
when USE_X11BASE is set and don't use BUILDLINK_X11_DIR and related
magic.

OKed by wiz@

Revision 1.241 / (download) - annotate - [select for diffs], Mon Oct 9 12:25:44 2006 UTC (12 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.240: +37 -1 lines
Diff to previous 1.240 (colored)

Main infrastructure for DESTDIR support.

Packages may set PKG_DESTDIR_SUPPORT to either "destdir" or
"user-destdir" to flag support for this, following the same
rules as PKG_INSTALLATION_TYPES (e.g. define before first include
of bsd.prefs.mk).

The user activates it via USE_DESTDIR. When set to "yes",
packages with "user-destdir" are handled as "destdir".
The installation of the package will not go to ${LOCALBASE},
but a subdirectory of ${WRKDIR} instead. pre/post install scripts are
not run and the package is not registered either. A binary package
can be created instead to be installed normally with pkg_add.

For "user-destdir" packages, everything is run as normal user and
ownership is supposed to be correctled by pkg_create later. Since
the current pkg_install code uses pax and it doesn't allow overwriting
owners, this does not work yet.

For "destdir" packages, installation, packaging and cleaning is run as
root.

This commit does not change the handling of DEPENDS_TARGET or
bin-install to allow recursive usage.

Revision 1.240 / (download) - annotate - [select for diffs], Mon Oct 9 11:59:08 2006 UTC (12 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.239: +3 -1 lines
Diff to previous 1.239 (colored)

Add variable to control whether the install target is run as root.

Revision 1.239 / (download) - annotate - [select for diffs], Mon Oct 9 11:44:06 2006 UTC (12 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.238: +6 -1 lines
Diff to previous 1.238 (colored)

Add two variables to control whether make package and make clean
are run with elevated privileges. Remove MAKE_PACKAGE_AS_ROOT
for now, since it is not sure whether the functionality in the current
form will stay and developers should spend time on the destdir support
instead.

Revision 1.238 / (download) - annotate - [select for diffs], Fri Oct 6 14:51:36 2006 UTC (12 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.237: +5 -5 lines
Diff to previous 1.237 (colored)

Remove references to DESTDIR. LOCALBASE should not be altered that way,
since it is user settable and most of the time set by the user.
X11BASE follows the same reasons. For staged installations, we don't
want to register the package directly, so there's no need to prefix
PKG_DBDIR either.

Revision 1.237 / (download) - annotate - [select for diffs], Wed Sep 27 15:18:15 2006 UTC (12 years, 5 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2006Q3-base, pkgsrc-2006Q3
Changes since 1.236: +5 -9 lines
Diff to previous 1.236 (colored)

Remove XFree86.

Revision 1.236 / (download) - annotate - [select for diffs], Fri Sep 22 21:53:57 2006 UTC (12 years, 6 months ago) by joerg
Branch: MAIN
Changes since 1.235: +4 -1 lines
Diff to previous 1.235 (colored)

- Compute CHEKCK_FILES filter on the entries requested and keep it
  as tight as possible. Files we don't handle shouldn't be skipped.
- fonts.alias is not created automatically, so don't remove it.
- create fonts.encoding with mkfontdir using -e X11_ENCODINGSDIR.
  On platforms not following the X11R6 loayout this might need to
  be overriden.
- Fix type1inst calls.
- Modify packages which installed fonts.alias before to actually
  include it in the PLIST and bump the revisions accordingly.
- Modify xorg-fonts* packages to use FONTS_DIRS.* to build indices
  at run time.

Discussed with wiz and jlam.

Revision 1.235 / (download) - annotate - [select for diffs], Sun Sep 10 20:19:39 2006 UTC (12 years, 6 months ago) by schwarz
Branch: MAIN
Changes since 1.234: +2 -2 lines
Diff to previous 1.234 (colored)


cosmetic change

Revision 1.234 / (download) - annotate - [select for diffs], Sun Sep 10 20:14:43 2006 UTC (12 years, 6 months ago) by schwarz
Branch: MAIN
Changes since 1.233: +3 -1 lines
Diff to previous 1.233 (colored)


${X11BASE} can now be set to /usr, so just do so for IRIX and OSF1. No need
for any artificial symlinking any more in bootstrap.

Revision 1.233 / (download) - annotate - [select for diffs], Sat Aug 26 19:07:00 2006 UTC (12 years, 7 months ago) by schwarz
Branch: MAIN
Changes since 1.232: +3 -3 lines
Diff to previous 1.232 (colored)


spelling correction

Revision 1.232 / (download) - annotate - [select for diffs], Sat Aug 26 18:55:43 2006 UTC (12 years, 7 months ago) by schwarz
Branch: MAIN
Changes since 1.231: +2 -2 lines
Diff to previous 1.231 (colored)


X11_TYPE being undefined cannot occur thanks to the preceeding line

Revision 1.231 / (download) - annotate - [select for diffs], Thu Jul 27 21:46:45 2006 UTC (12 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.230: +7 -1 lines
Diff to previous 1.230 (colored)

Whenever we invoke a recursive make, we need to ensure that the proper
environment ${PKGSRC_MAKE_ENV} is also passed along.  Create a
convenience variable RECURSIVE_MAKE that does exactly this and that
can be used in place of MAKE when invoking make recursively.

Use RECURSIVE_MAKE everywhere in pkgsrc/mk that we invoke make
recursively.

Revision 1.230 / (download) - annotate - [select for diffs], Mon Jul 17 18:07:06 2006 UTC (12 years, 8 months ago) by wiz
Branch: MAIN
Changes since 1.229: +1 -7 lines
Diff to previous 1.229 (colored)

Remove stale comment, noted by bad@ in PR 33871.

Revision 1.229 / (download) - annotate - [select for diffs], Thu Jul 13 14:02:34 2006 UTC (12 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.228: +1 -18 lines
Diff to previous 1.228 (colored)

* Add a new stage "bootstrap-depends" that happens before all other
  stages, and that installs dependencies listed in BOOTSTRAP_DEPENDS.
  The bootstrap-depends step works just like the normal depends step
  and honors the value of DEPENDS_TARGET.  It's now possible to add
  dependencies solely to facilitate fetching the distfiles, e.g.

	BOOTSTRAP_DEPENDS+=	curl-[0-9]*:../../www/curl

* Teach the tools framework about ":bootstrap" as a tools modifier
  which indicates the tool should be added as a dependency via
  BOOTSTRAP_DEPENDS.

* Add "digest" to the tools framework.

* Use USE_TOOLS+=digest:bootstrap to force pkgsrc to install digest
  before anything else.  Get rid of unused "uptodate-digest" target
  and related digest version-checking code.

* Finish the refactoring work: split checksum-related code out of
  bsd.pkg.mk and into pkgsrc/mk/checksum and replace the "checksum"
  target command list with a script that does all the real work.

* Make DIGEST_ALGORITHMS and PATCH_DIGEST_ALGORITHM into private
  variables by prepending them with an underscore.  Also, rename
  _PATCH_DIGEST_ALGORITHM to _PATCH_DIGEST_ALGORITHMS and adjust the
  makepatchsum target to allow that variable to contain a list of
  algorithms, all of which are used when creating the patch checksums
  for ${DISTINFO_FILE}.

Revision 1.228 / (download) - annotate - [select for diffs], Mon Jul 10 22:59:27 2006 UTC (12 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.227: +1 -16 lines
Diff to previous 1.227 (colored)

Completely nuke the concept of PKG_PHASE from pkgsrc except for the
purposes of caching MAKEVARS within bsd.pkg.mk and bsd.makevars.mk.

Revision 1.227 / (download) - annotate - [select for diffs], Mon Jul 10 22:17:58 2006 UTC (12 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.226: +19 -16 lines
Diff to previous 1.226 (colored)

Back out revision 1.172 of mk/tools/replace.mk -- we never want to
allow IMAKE to be set by anything other than the tools framework.
Modify the IRIX files so that the native imake is listed as a built-in
tool in the case where X11_TYPE is "native".  Also, move the include
of tools/default.mk a bit lower in bsd.prefs.mk so that tools.${OPSYS}.mk
files can use the value of X11_TYPE.  This should properly set and
point IMAKE to the right binary on IRIX without destroying the
configuration for platforms where IMAKE was not explicitly set, i.e.
every non-IRIX platform.

Revision 1.177.2.8, Wed Jun 7 15:25:38 2006 UTC (12 years, 9 months ago) by tv
Branch: tv-derecurse
Changes since 1.177.2.7: +1 -1 lines
FILE REMOVED

EOL the tv-derecurse branch; it has become too outdated.  The last live
revision can be fetched at the tv-derecurse-eol tag.

Revision 1.226 / (download) - annotate - [select for diffs], Tue Jun 6 15:28:52 2006 UTC (12 years, 9 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2006Q2-base, pkgsrc-2006Q2
Changes since 1.225: +6 -9 lines
Diff to previous 1.225 (colored)

Move some variable definitions out of bsd.prefs.mk and back into
bsd.pkg.mk.  They didn't actually need to be defined in bsd.prefs.mk,
just somewhere before the "main" bsd.<phase>.mk files were included.
This moves some conditional (?=) definitions back into bsd.pkg.mk so
they won't conflict with any conditional definitions in package
Makefiles.

This should fix the "checksum" problems in lang/php-gd as noted here:

    http://mail-index.netbsd.org/pkgsrc-users/2006/06/05/0012.html

where EXTRACT_SUFX had the wrong value due to the order in while *.mk
files were included.

Revision 1.225 / (download) - annotate - [select for diffs], Tue Jun 6 06:30:29 2006 UTC (12 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.224: +4 -4 lines
Diff to previous 1.224 (colored)

Separate out the part of bsd.tools.mk that actually created the tools
into a new file pkgsrc/mk/tools/create.mk.  This leaves bsd.tools.mk
as a file that pulls in all of the other ones.  Also move the
tools-related targets from bsd.pkg.mk into bsd.tools.mk.

The tools cookie file has been removed, as well as hooks for
{pre,do,post}-tools.  Instead, there is now only a single public target
"tools" which may be invoked.  Invoking "tools" will always cause all
of the tools in ${TOOLS_DIR} to be created.

The "tools" step has been moved and is now just after the "depends"
step and before sources are extracted.  This is the earliest place
where the "tools" step can be taken, and it allows the created tools
to be used in all steps/phases after it, starting with "extract".  As
a consequence, we should just invoke tools by their bare names in
targets, e.g. awk, sed, patch, etc., instead of with the ${VARIABLE}
names, e.g. ${AWK}, ${SED}, ${PATCH}, etc.

Revision 1.224 / (download) - annotate - [select for diffs], Tue Jun 6 04:48:19 2006 UTC (12 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.223: +2 -2 lines
Diff to previous 1.223 (colored)

Refactor "patch" code into correspondingly named subdirectory of
pkgsrc/mk.  Also get rid of the recursive make for the "patch" target.
This basically merges the "patch" phase into the "tools" phase.

There should eventually be a standalone script that can be used to
verify checksums listed in distinfo that should be used instead of
the roll-your-own code in the do-pkgsrc-patch target.

Revision 1.223 / (download) - annotate - [select for diffs], Tue Jun 6 03:05:48 2006 UTC (12 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.222: +3 -2 lines
Diff to previous 1.222 (colored)

Refactor "fetch" and "extract" code into correspondingly named
subdirectories of pkgsrc/mk.  Move the following files around for
locality:

	pkgsrc/mk/scripts/extract  -> pkgsrc/mk/extract/extract
	pkgsrc/mk/bsd.sites.mk     -> pkgsrc/mk/fetch/sites.mk

Also get rid of the recursive make for the "fetch" and "extract"
targets.  This basically merges the "fetch" and "extract" phases into
the "patch" phase.

There is still much more work to do to simplify the fetch code, but
this is a good start.

Revision 1.222 / (download) - annotate - [select for diffs], Mon Jun 5 17:11:37 2006 UTC (12 years, 9 months ago) by joerg
Branch: MAIN
Changes since 1.221: +2 -1 lines
Diff to previous 1.221 (colored)

Move the default value of X11_TYPE from x11.version.mk into
bsd.prefs.mk. Add a coment to defaults/mk.conf, why the entry should
be left commented out there.

Revision 1.221 / (download) - annotate - [select for diffs], Sat Jun 3 23:11:42 2006 UTC (12 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.220: +6 -58 lines
Diff to previous 1.220 (colored)

First pass at implementing support for package system flavors other
than pkgsrc's current one.  This is an important lead-up to any project
that redesigns the pkg_* tools in that it doesn't tie us to past design
(mis)choices.  This commit mostly deals with rearranging code, although
there was a considerable amount of rewriting done in cases where I
thought the code was somewhat messy and was difficult to understand.

The design I chose for supporting multiple package system flavors is
that the various depends, install, package, etc.  modules would define
default targets and variables that may be overridden in files from
pkgsrc/mk/flavor/${PKG_FLAVOR}.  The default targets would do the
sensible thing of doing nothing, and pkgsrc infrastructure would rely
on the appropriate things to be defined in pkgsrc/mk/flavor to do the
real work.  The pkgsrc/mk/flavor directory contains subdirectories
corresponding to each package system flavor that we support.  Currently,
I only have "pkg" which represents the current pkgsrc-native package
flavor.  I've separated out most of the code where we make assumptions
about the package system flavor, mostly either because we directly
use the pkg_* tools, or we make assumptions about the package meta-data
directory, or we directly manipulate the package meta-data files, and
placed it into pkgsrc/mk/flavor/pkg.

There are several new modules that have been refactored out of bsd.pkg.mk
as part of these changes: check, depends, install, package, and update.
Each of these modules has been slimmed down by rewriting them to avoid
some recursive make calls.  I've also religiously documented which
targets are "public" and which are "private" so that users won't rely
on reaching into pkgsrc innards to call a private target.

The "depends" module is a complete overhaul of the way that we handle
dependencies.  There is now a separate "depends" phase that occurs
before the "extract" phase where dependencies are installed.  This
differs from the old way where dependencies were installed just before
extraction occurred.  The reduce-depends.mk file is now replaced by
a script that is invoked only once during the depends phase and is
used to generate a cookie file that holds the full set of reduced
dependencies.  It is now possible to type "make depends" in a package
directory and all missing dependencies will be installed.

Future work on this project include:

    * Resolve the workflow design in anticipation of future work on
      staged installations where "package" conceptually happens before
      "install".

    * Rewrite the buildlink3 framework to not assume the use of the
      pkgsrc pkg_* tools.

    * Rewrite the pkginstall framework to provide a standard pkg_*
      tool to perform the actions, and allowing a purely declarative
      file per package to describe what actions need to be taken at
      install or deinstall time.

    * Implement support for the SVR4 package flavor.  This will be
      proof that the appropriate abstractions are in place to allow
      using a completely different set of package management tools.

Revision 1.220 / (download) - annotate - [select for diffs], Wed Mar 8 01:56:46 2006 UTC (13 years ago) by minskim
Branch: MAIN
CVS Tags: pkgsrc-2006Q1-base, pkgsrc-2006Q1
Changes since 1.219: +2 -1 lines
Diff to previous 1.219 (colored)

Set LOWER_OPSYS_VERSUFFIX on Darwin.

Revision 1.219 / (download) - annotate - [select for diffs], Thu Feb 2 13:46:37 2006 UTC (13 years, 1 month ago) by joerg
Branch: MAIN
Changes since 1.218: +1 -2 lines
Diff to previous 1.218 (colored)

Don't include define lower opsys version for the host name, e.g. use
i386-pc-dragonflybsd instead of i386-pc-dragonflybsd1. Saves a few
forks and execs and makes DragonFly more homogenous with NetBSD.

Revision 1.218 / (download) - annotate - [select for diffs], Thu Jan 12 14:57:19 2006 UTC (13 years, 2 months ago) by joerg
Branch: MAIN
Changes since 1.217: +2 -1 lines
Diff to previous 1.217 (colored)

Remove branch tag from DragonFly version, so that OS_VERSION matches
autoconf's normalisation.

Revision 1.217 / (download) - annotate - [select for diffs], Thu Dec 29 21:18:11 2005 UTC (13 years, 2 months ago) by markd
Branch: MAIN
Changes since 1.216: +5 -3 lines
Diff to previous 1.216 (colored)

X11BASE defaults to /usr/openwin on Solaris, but only when using the
native X11_TYPE.  Allow X11BASE to default correctly on Solaris when
X11_TYPE= XFree86 or xorg.

Revision 1.216 / (download) - annotate - [select for diffs], Wed Dec 28 01:00:46 2005 UTC (13 years, 2 months ago) by abs
Branch: MAIN
Changes since 1.215: +6 -1 lines
Diff to previous 1.215 (colored)

Set PATH if not already set at the top of bsd.prefs.mk, just before
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.

Revision 1.215 / (download) - annotate - [select for diffs], Mon Dec 5 22:07:07 2005 UTC (13 years, 3 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2005Q4-base, pkgsrc-2005Q4
Changes since 1.214: +17 -17 lines
Diff to previous 1.214 (colored)

Applied all quoting fixes found by "pkglint --autofix".

Revision 1.214 / (download) - annotate - [select for diffs], Fri Dec 2 17:08:49 2005 UTC (13 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.213: +3 -3 lines
Diff to previous 1.213 (colored)

Remove handling for obsolete USE_SOCKS variable.

Revision 1.213 / (download) - annotate - [select for diffs], Mon Nov 28 21:46:47 2005 UTC (13 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.212: +7 -7 lines
Diff to previous 1.212 (colored)

Prefixed the definitions for the pkgtools with ${SETENV}. Now it is
possible to use these commands in shell programs by assigning the output
of `make show-var VARNAME=PKG_DELETE` to a shell variable.

Revision 1.212 / (download) - annotate - [select for diffs], Thu Nov 24 13:24:10 2005 UTC (13 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.211: +3 -3 lines
Diff to previous 1.211 (colored)

Properly quote _PKG_DBDIR.

Revision 1.211 / (download) - annotate - [select for diffs], Wed Nov 23 18:27:13 2005 UTC (13 years, 4 months ago) by erh
Branch: MAIN
Changes since 1.210: +0 -2 lines
Diff to previous 1.210 (colored)

Per request, back out all the SKIP_AUDIT_PACKAGES changes.
bsd.pkg.mk:1.1758-1.1752
bsd.prefs.mk:1.210
bulk/build:1.79
defaults/mk.conf:1.93-1.92

Revision 1.210 / (download) - annotate - [select for diffs], Wed Nov 16 20:59:23 2005 UTC (13 years, 4 months ago) by erh
Branch: MAIN
Changes since 1.209: +3 -1 lines
Diff to previous 1.209 (colored)

Improve the handling of allowed vulnerabilities.  Instead of the single
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

Revision 1.209 / (download) - annotate - [select for diffs], Mon Nov 14 04:51:47 2005 UTC (13 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.208: +2 -2 lines
Diff to previous 1.208 (colored)

Removed trailing white-space.

Revision 1.208 / (download) - annotate - [select for diffs], Sun Nov 13 17:40:00 2005 UTC (13 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.207: +1 -6 lines
Diff to previous 1.207 (colored)

Reverted the change that moved the definition of MANINSTALL from mk.conf to
bsd.prefs.mk. Alistair has told me that Stoned had told him that MANINSTALL
actually belongs to mk.conf.

Revision 1.207 / (download) - annotate - [select for diffs], Thu Nov 10 09:55:21 2005 UTC (13 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.206: +6 -1 lines
Diff to previous 1.206 (colored)

Moved default definition of MANINSTALL from defaults/mk.conf to
bsd.prefs.mk, as it is not intended to be set in mk.conf.

Revision 1.206 / (download) - annotate - [select for diffs], Thu Nov 10 09:48:04 2005 UTC (13 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.205: +11 -1 lines
Diff to previous 1.205 (colored)

Moved the PKG_INSTALLATION_TYPES variable from defaults/mk.conf to
bsd.prefs.mk as it is not intended to be set in mk.conf.

Revision 1.205 / (download) - annotate - [select for diffs], Thu Nov 10 09:09:26 2005 UTC (13 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.204: +2 -1 lines
Diff to previous 1.204 (colored)

Added a comment that <bsd.own.mk> includes MAKECONF or /etc/mk.conf, so
that a "grep -wr mk\\.conf" will show the user where to find more
information.

Revision 1.204 / (download) - annotate - [select for diffs], Wed Nov 9 01:06:48 2005 UTC (13 years, 4 months ago) by reed
Branch: MAIN
Changes since 1.203: +17 -1 lines
Diff to previous 1.203 (colored)

Moved the X11ROOT_PREFIX and X11BASE setting to mk/bsd.prefs.mk;
removed from mk/defaults/mk.conf.

This was needed in parts of tests of allowing a platform/${OPSYS}.mk
define is X11_TYPE.

Revision 1.203 / (download) - annotate - [select for diffs], Tue Nov 1 16:30:05 2005 UTC (13 years, 4 months ago) by tv
Branch: MAIN
Changes since 1.202: +24 -8 lines
Diff to previous 1.202 (colored)

Abstract [LOWER_]OS_VERSION into a ${...:sh} construct, so that other OS
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.

Revision 1.202 / (download) - annotate - [select for diffs], Tue Nov 1 16:18:33 2005 UTC (13 years, 4 months ago) by tv
Branch: MAIN
Changes since 1.201: +60 -59 lines
Diff to previous 1.201 (colored)

Sort OPSYS pre-<sys.mk> settings section by OPSYS name.

Revision 1.201 / (download) - annotate - [select for diffs], Tue Nov 1 16:11:16 2005 UTC (13 years, 4 months ago) by tv
Branch: MAIN
Changes since 1.200: +4 -14 lines
Diff to previous 1.200 (colored)

Shorten the GNU_ARCH list by using a fallthrough variable expression
for MACHINE_GNU_ARCH.

Revision 1.200 / (download) - annotate - [select for diffs], Tue Aug 16 19:55:38 2005 UTC (13 years, 7 months ago) by dillo
Branch: MAIN
CVS Tags: pkgsrc-2005Q3-base, pkgsrc-2005Q3
Changes since 1.199: +1 -3 lines
Diff to previous 1.199 (colored)

Don't add inet6 to PKG_DEFAULT_OPTIONS, it is a user settable
variable.  mk/defaults/obsolete.mk takes care of converting USE_INET6
to inet6 option.  Bug noted by schmonz.

Revision 1.199 / (download) - annotate - [select for diffs], Thu Jul 28 13:07:17 2005 UTC (13 years, 8 months ago) by wiz
Branch: MAIN
Changes since 1.198: +6 -1 lines
Diff to previous 1.198 (colored)

Start documenting variables.

Revision 1.198 / (download) - annotate - [select for diffs], Tue Jul 19 22:31:01 2005 UTC (13 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.197: +3 -3 lines
Diff to previous 1.197 (colored)

Don't bother defining a temporary _PKGSRC_USE_TOOLS variable that doesn't
actually increase readability by much.

Revision 1.197 / (download) - annotate - [select for diffs], Sat Jul 16 22:33:18 2005 UTC (13 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.196: +4 -1 lines
Diff to previous 1.196 (colored)

There is still one small but important distinction between some of the
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.

Revision 1.196 / (download) - annotate - [select for diffs], Fri Jul 15 18:27:55 2005 UTC (13 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.195: +4 -5 lines
Diff to previous 1.195 (colored)

Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making
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.

Revision 1.195 / (download) - annotate - [select for diffs], Tue Jun 14 07:25:24 2005 UTC (13 years, 9 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q2-base, pkgsrc-2005Q2
Changes since 1.194: +1 -2 lines
Diff to previous 1.194 (colored)

Require xpkgwedge>=1.13 when used as a build dependency so that the
correct make(1) program is invoked by pkgxmkmf.

Revision 1.194 / (download) - annotate - [select for diffs], Wed Jun 1 17:05:19 2005 UTC (13 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.193: +4 -1 lines
Diff to previous 1.193 (colored)

Include bsd.makevars.mk in bsd.prefs.mk instead of bsd.pkg.mk.  This
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.

Revision 1.193 / (download) - annotate - [select for diffs], Sun May 22 19:11:12 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.192: +1 -14 lines
Diff to previous 1.192 (colored)

Remove the old tools framework and references to _USE_NEW_TOOLS.

Revision 1.177.2.7 / (download) - annotate - [select for diffs], Tue May 17 18:29:44 2005 UTC (13 years, 10 months ago) by tv
Branch: tv-derecurse
CVS Tags: tv-derecurse-eol
Changes since 1.177.2.6: +29 -12 lines
Diff to previous 1.177.2.6 (colored) to branchpoint 1.177 (colored)

sync [all but bsd.pkg.mk] with HEAD

Revision 1.192 / (download) - annotate - [select for diffs], Sat May 14 01:51:52 2005 UTC (13 years, 10 months ago) by rillig
Branch: MAIN
CVS Tags: tv-derecurse-merge
Changes since 1.191: +6 -6 lines
Diff to previous 1.191 (colored)

Replaced .ifdef with .if defined() and .ifnded with .if !defined(). This
will allow better error checking.

Revision 1.191 / (download) - annotate - [select for diffs], Fri May 13 17:22:43 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.190: +2 -2 lines
Diff to previous 1.190 (colored)

Make _USE_NEW_TOOLS default to "yes" to turn on using the new tools
framework.  This has been tested by successfully building a meta-package
that pulled in 81 dependencies during the installation.

Revision 1.190 / (download) - annotate - [select for diffs], Tue May 10 19:06:58 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.189: +6 -3 lines
Diff to previous 1.189 (colored)

Make a distinction between the tools that pkgsrc needs and the tools
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.

Revision 1.189 / (download) - annotate - [select for diffs], Mon May 9 05:06:55 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.188: +2 -1 lines
Diff to previous 1.188 (colored)

Teach bsd.pkg.mk to create a phase-specific "makevars.mk" file that
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.

Revision 1.188 / (download) - annotate - [select for diffs], Mon May 2 21:10:02 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.187: +7 -1 lines
Diff to previous 1.187 (colored)

* Push the imake- and xmkmf-handling into the new tools framework.

* 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.

Revision 1.187 / (download) - annotate - [select for diffs], Mon May 2 05:16:21 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.186: +2 -2 lines
Diff to previous 1.186 (colored)

Remove the need for ${FIND} in the top-level make.

Revision 1.186 / (download) - annotate - [select for diffs], Sat Apr 30 15:07:57 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.185: +2 -2 lines
Diff to previous 1.185 (colored)

net/qmail has been taught to not need expr and wc in the top-level make.

Revision 1.185 / (download) - annotate - [select for diffs], Sat Apr 30 04:35:54 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.184: +14 -1 lines
Diff to previous 1.184 (colored)

Split replace.mk into two parts, one of which is included by bsd.prefs.mk
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.

Revision 1.184 / (download) - annotate - [select for diffs], Fri Apr 8 20:11:53 2005 UTC (13 years, 11 months ago) by tv
Branch: MAIN
Changes since 1.183: +2 -2 lines
Diff to previous 1.183 (colored)

Per discussion on tech-pkg, use USE_X11 (not USE_IMAKE) to add X11BASE/bin;
and put LOCALBASE/bin later in the variable (so it shows up *earlier* in
the resultant $PATH).

Revision 1.183 / (download) - annotate - [select for diffs], Thu Mar 24 17:46:00 2005 UTC (14 years ago) by tv
Branch: MAIN
Changes since 1.182: +1 -6 lines
Diff to previous 1.182 (colored)

USE_BUILDLINK3 is no longer optional (and cannot be turned off).  Per mail
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.

Revision 1.177.2.6 / (download) - annotate - [select for diffs], Fri Feb 25 14:46:51 2005 UTC (14 years, 1 month ago) by tv
Branch: tv-derecurse
Changes since 1.177.2.5: +25 -5 lines
Diff to previous 1.177.2.5 (colored) to branchpoint 1.177 (colored)

sync with HEAD

Revision 1.182 / (download) - annotate - [select for diffs], Sat Feb 19 01:28:14 2005 UTC (14 years, 1 month ago) by grant
Branch: MAIN
CVS Tags: tv-derecurse-base, pkgsrc-2005Q1-base, pkgsrc-2005Q1
Changes since 1.181: +6 -5 lines
Diff to previous 1.181 (colored)

define GNU_ARCH for rs6000 and set OBJECT_FMT correctly for AIX.

Revision 1.181 / (download) - annotate - [select for diffs], Thu Feb 17 07:11:59 2005 UTC (14 years, 1 month ago) by grant
Branch: MAIN
Changes since 1.180: +20 -1 lines
Diff to previous 1.180 (colored)

add bits for AIX to correctly set MACHINE_ARCH and OS_VERSION, so that
MACHINE_GNU_PLATFORM is set to something sane. tested with AIX 4.3.3
and 5.1.

Revision 1.180 / (download) - annotate - [select for diffs], Fri Feb 11 16:11:36 2005 UTC (14 years, 1 month ago) by tv
Branch: MAIN
Changes since 1.179: +1 -3 lines
Diff to previous 1.179 (colored)

Migrate several USE_* logic blocks, previously sprinkled liberally
throughout bsd.pkg.mk, to labelled blocks in bsd.pkg.use.mk.

Revision 1.177.2.5 / (download) - annotate - [select for diffs], Fri Feb 11 15:27:57 2005 UTC (14 years, 1 month ago) by tv
Branch: tv-derecurse
Changes since 1.177.2.4: +7 -5 lines
Diff to previous 1.177.2.4 (colored) to branchpoint 1.177 (colored)

sync with HEAD

Revision 1.179 / (download) - annotate - [select for diffs], Thu Jan 27 04:16:47 2005 UTC (14 years, 2 months ago) by tv
Branch: MAIN
Changes since 1.178: +4 -5 lines
Diff to previous 1.178 (colored)

Cleanup: wrapper-defs.mk is no longer optional; remove its conditional.
(...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.)

Revision 1.178 / (download) - annotate - [select for diffs], Thu Jan 27 04:05:08 2005 UTC (14 years, 2 months ago) by tv
Branch: MAIN
Changes since 1.177: +4 -1 lines
Diff to previous 1.177 (colored)

Move the PREPEND_PATH for LOCALBASE/bin (and optionally X11BASE/bin) to a
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.

Revision 1.177.2.4 / (download) - annotate - [select for diffs], Tue Nov 23 20:39:19 2004 UTC (14 years, 4 months ago) by tv
Branch: tv-derecurse
Changes since 1.177.2.3: +2 -2 lines
Diff to previous 1.177.2.3 (colored) to branchpoint 1.177 (colored)

Move "package-name" back to bsd.pkg.mk, as it is needed there.
Make dependency calculation work correctly for "print-summary-data", and
thus for "readme".

Revision 1.177.2.3 / (download) - annotate - [select for diffs], Tue Nov 23 18:25:35 2004 UTC (14 years, 4 months ago) by tv
Branch: tv-derecurse
Changes since 1.177.2.2: +6 -4 lines
Diff to previous 1.177.2.2 (colored) to branchpoint 1.177 (colored)

Factor out package data export bits which are not used in the normal build
process into a new fragment, bsd.pkg.data.mk.

Fix some include ordering so that most of the dependency logic works
correctly again (though fetch-list is still broken).

Revision 1.177.2.2 / (download) - annotate - [select for diffs], Tue Nov 23 17:15:22 2004 UTC (14 years, 4 months ago) by tv
Branch: tv-derecurse
Changes since 1.177.2.1: +6 -3 lines
Diff to previous 1.177.2.1 (colored) to branchpoint 1.177 (colored)

Factor out PLIST generation and handling into its own morsel that's a
little easier to handle and maintain.

Revision 1.177.2.1 / (download) - annotate - [select for diffs], Mon Nov 22 22:48:05 2004 UTC (14 years, 4 months ago) by tv
Branch: tv-derecurse
Changes since 1.177: +56 -17 lines
Diff to previous 1.177 (colored)

So that I don't lose all this work, stash the work-in-progress derecursion
cleanup onto the tv-derecurse branch (only branched in pkgsrc/mk).

Revision 1.177 / (download) - annotate - [select for diffs], Sat Nov 20 04:37:08 2004 UTC (14 years, 4 months ago) by grant
Branch: MAIN
CVS Tags: pkgsrc-2004Q4-base, pkgsrc-2004Q4
Branch point for: tv-derecurse
Changes since 1.176: +9 -1 lines
Diff to previous 1.176 (colored)

add framework support for Tru64 and the Compaq C compiler.

patches provided by Tobias Nygren <tnn at netilium dot org> with
minor changes by me.

Revision 1.176 / (download) - annotate - [select for diffs], Sun Oct 31 22:05:02 2004 UTC (14 years, 4 months ago) by wiz
Branch: MAIN
Changes since 1.175: +13 -1 lines
Diff to previous 1.175 (colored)

Add DragonFlyBSD support, provided by Todd Willey on tech-pkg.

Revision 1.175 / (download) - annotate - [select for diffs], Wed Oct 20 05:42:55 2004 UTC (14 years, 5 months ago) by martti
Branch: MAIN
Changes since 1.174: +2 -2 lines
Diff to previous 1.174 (colored)

Added missing /

Revision 1.174 / (download) - annotate - [select for diffs], Tue Oct 19 23:16:47 2004 UTC (14 years, 5 months ago) by ben
Branch: MAIN
Changes since 1.173: +3 -2 lines
Diff to previous 1.173 (colored)

Translate MACHINE_ARCH and LOWER_ARCH from ppc to powerpc in the case of
Linux, to be more consistent with other platforms.

Revision 1.173 / (download) - annotate - [select for diffs], Thu Oct 7 13:42:26 2004 UTC (14 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.172: +5 -4 lines
Diff to previous 1.172 (colored)

Make PKGSRCDIR a read-only value.  This avoids problems where the user
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.

Revision 1.172 / (download) - annotate - [select for diffs], Thu Oct 7 03:03:09 2004 UTC (14 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.171: +1 -2 lines
Diff to previous 1.171 (colored)

Remove _PKGSRCDIR now that we have PKGSRCDIR (as per previous commit).

Revision 1.171 / (download) - annotate - [select for diffs], Thu Oct 7 02:01:39 2004 UTC (14 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.170: +19 -15 lines
Diff to previous 1.170 (colored)

* Make PKGSRC_TOPDIR a private variable by renaming it to _PKGSRC_TOPDIR,
  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.

Revision 1.170 / (download) - annotate - [select for diffs], Wed Oct 6 20:59:40 2004 UTC (14 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.169: +5 -5 lines
Diff to previous 1.169 (colored)

Climb up the directory tree to find the top, instead of guessing where
the top and searching on the way down.  Thanks Gavan!

Revision 1.169 / (download) - annotate - [select for diffs], Wed Oct 6 20:51:47 2004 UTC (14 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.168: +7 -7 lines
Diff to previous 1.168 (colored)

Reorganize some of the files under pkgsrc/mk:

    (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.

Revision 1.168 / (download) - annotate - [select for diffs], Mon Sep 27 12:05:53 2004 UTC (14 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.167: +6 -1 lines
Diff to previous 1.167 (colored)

Move some wrapper definitions into a separate file wrapper-defs.mk that is
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

Revision 1.167 / (download) - annotate - [select for diffs], Mon Sep 27 12:00:56 2004 UTC (14 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.166: +16 -19 lines
Diff to previous 1.166 (colored)

Define PKGSRC_TOPDIR as the path to the top of the pkgsrc tree relative
to the Makefile on which make is invoked.  Use it instead of doing the
same dance for finding defs.${OPSYS}.mk and bsd.pkg.defaults.mk.

Revision 1.166 / (download) - annotate - [select for diffs], Tue Sep 21 15:01:39 2004 UTC (14 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.165: +3 -3 lines
Diff to previous 1.165 (colored)

Initial commit of a new wrapper script framework that encapsulates
the non-buildlink-related code and moves it out of mk/buildlink3 into
mk/wrapper.  The buildlink3 code is modified to simply hook its
transformations into the wrapper script framework.

The wrapper script framework has some new features:

* Support automatically passing "ABI" flags to the compiler and linker
  depending on the value of ${ABI}.  Currently supports the SunPro
  compiler with ${ABI} == 64 and the MIPSPro compiler with ${ABI} as
  any of 32, n32, o32, and 64.

* making UnixWare GCC accept -rpath options and silently converting
  them into an appropriate LD_RUN_PATH

* Add cmd-sink-interix-gcc and cmd-sink-interix-ld that errors out
  when it sees -fpic/-fPIC and -shared/-Bshareable, respectively
  (requested by <tv>).

* Much improved debugging output.  It's possible to output the wrapper
  work log in-line with normal output by setting WRAPPER_LOG to
  "stderr".

Important differences in behaviour from the old buildlink3 code include:

* Only move the -l options to the end of the command line, leaving the
  -L options in-place.

* Extend the autodetection of the libtool mode to detect "compile" and
  "uninstall".

* Fix problem noted in both PR pkg/24760 and PR pkg/25500, where
  -L/usr/lib/* was being mangled improperly.

* Remove the top-level "buildlink" target; instead, make buildlinking
  occur as part of the "wrapper" target.

* mangle and sub-mangle are only meant to transform directories in
  -I, -L, and rpath options, so remove the lines in
  buildlink3/gen-transform.sh that transformed bare directories.

* Add the ability for the libtool wrapper to be called just to unwrap
  an existing libtool archive by running:

	libtool --mode=unwrap -o libfoo.la

  The old --fix-la syntax no longer works.


20040818
========
* Initial release of a new wrapper script framework that encapsulates
  the non-buildlink-related code and moves it out of mk/buildlink3.
  These features include:

   * making MIPSpro accept GCC options
   * making MIPSpro "ucode" accept GCC options
   * making SunPro accept GCC options
   * making "ld" accept -Wl,* options and silently removing the "-Wl,"
   * (NEW) making UnixWare GCC accept -rpath options and silently
     converting them into an appropriate LD_RUN_PATH

  One major benefit of this is that the buildlink3 code is now much
  tighter and easier to understand since it concerns itself solely
  with buildlink-related details.  I haven't yet optimized the wrapper
  cache, so the new wrapper scripts may take slightly longer to execute
  than the old buildlink3 wrapper scripts, but I'll be improving this
  over time.


20040821
========
* Move the inclusion of $cmd_sink outside of the main loop in wrapper.sh
  so that the $cmd_sink script can be used to globally scan and process
  the arguments.  Move the LD_RUN_PATH code to a cmd-sink-unixware-gcc
  script.  Garbage-collect the now unused export_vars-related code.

* Add cmd-sink-aix-xlc for AIX xlc that munges -Wl,-R* into an
  appropriate -blibpath option.

* Add cmd-sink-interix-gcc and cmd-sink-interix-ld that errors out
  when it sees -fpic/-fPIC and -shared/-Bshareable, respectively
  (requested by <tv>).

* Move the code that converts full paths to shared libraries into the
  "-Ldir -llib" equivalents from the buildlink3 code into wrapper/logic.
  Remove the same from bsd.buildlink3.mk and gen-transform.sh.

* Move the code that checks for absolute rpaths from the buildlink3
  code into wrapper/arg-source.  Remove the same from bsd.buildlink3.mk
  and gen-transform.sh.

* Only move the -l options to the end of the command line, leaving the
  -L options in-place.

* Add more debugging code.


20040824
========
* Fix quoting problems after arguments are transformed.  Remove the
  hack that was inserted that magically made almost everything work
  because we do it the right way now.

* Move the inclusion of $logic outside of the main loop in wrapper.sh
  so that the $logic script doesn't have to worry about underflowing
  the argument buffer.

* Encapsulate the loop in wrapper.sh that fills the argument buffer
  entirely within the arg-source script.

* Move from the logic script into the arg-source script the
  transformations that merge or split arguments.

* Fix bug where skipargs was effectively being ignored if it was more
  than 1.

* Handle the whitespace in transformations in the logic script that
  turn one library option into multiple library options, e.g.
  "-lreadline" -> "-ledit -ltermcap".

* Allow you to specify an environment variable WRAPPER_SKIP_TRANSFORM
  for whether you wish to skip the transformation step in the logic
  script.  This is intended for testing purposes.

* Added check_prog() and init_lib() functions to the shell code library
  to make it more reusable outside of the wrapper framework.

* Allow the msg_log() function to output to "stdout" or "stderr".  If
  you want to have all of the logging appear on the screen, then you
  can now set WRAPPER_LOG=stderr.

* Make some of the script components not overridable on a per-wrapper
  basis.

* Add a gen-transform.sh script that generates transformation sedfiles.
  The "transform" script is used to transform arguments, while the
  "untransform" script is used to unwrap files.  Move the no-rpath
  logic from buildlink3/gen-transform.sh into wrapper/gen-transform.sh
  since it's not buildlink3-specific.

* Check for a non-empty blibpath before adding the option in
  cmd-sink-aix-xlc.

* Extend the autodetection of the libtool mode to detect "compile" and
  "uninstall".

* Add a cmd-sink-libtool script that doesn't pass linker options to
  libtool unless we're in "link" mode.

* Set _USE_RPATH to "yes" for UnixWare so that the wrappers will see the
  rpath options and convert them to a LD_RUN_PATH definition.

* Add more debugging code.


20040826
========
* Rewrite buildlink3/gen-transform.sh to produce more precise sed commands.
  Drop some unused commands from the mini-language, and add a few more
  that are more restrictive in their scope.

* Fix problem where repeated options weren't properly handled by some
  of sed commands.  It's not enough that they're "global replace",
  since some patterns match separator characters before and after each
  option.  We must repeat those patterns twice to catch all instances
  correctly.

* Fix problem noted in both PR pkg/24760 and PR pkg/25500, where
  -L/usr/lib/* was being mangled improperly.

* Remove the top-level "buildlink" target; instead, make buildlinking
  occur as part of the "wrapper" target.

* Add more debugging code.


20040828
========
* Added a head_queue function to shell-lib that returns the head of the
  named queue without popping it off the front of the queue.

* Strip consecutive, repeated library options from the command line when
  we read it in the logic script.

* Be more careful about not underflowing the argument buffer.


20040906
========
* shell-lib was moved into pkgsrc/mk/scripts; correct references to that
  file in the wrapper code.

* Use opt-sub instead of sub-mangle when protecting -I/usr/include/*
  and -L/usr/lib/* from buildlink transformations.  This avoids adding
  lines that look like "-I-I..." in the transformation sedfiles.

* mangle and sub-mangle are only meant to transform directories in
  -I, -L, and rpath options, so remove the lines in
  buildlink3/gen-transform.sh that transformed bare directories.

* Fix bug in strip-slashdot where the "." wasn't backquoted and thus
  matched all characters instead of only the "." character.

* Change the libtool wrapper to use a modified buildcmd script that
  doesn't rearrange any of the arguments.  This should fix spurious
  problems where libtool doesn't understand how to parse the command
  line when the -l options are moved to the end of the argument list.

* Fix bug in the logic script where the $cachearg and $cachedarg
  weren't being properly set at all times, which caused the cache to
  contain the wrong transformed argument.


20040907
========
* Support automatically passing "ABI" flags to the compiler and linker
  depending on the value of ${ABI}.  Currently supports the SunPro
  compiler with ${ABI} == 64 and the MIPSPro compiler with ${ABI} as
  any of 32, n32, o32, and 64.

* Move back the code that splits absolute paths to shared libraries
  from arg-source back into logic.  This allows us to correctly skip
  splitting those paths based on the previous option.  Also add a
  sanity check that the library name in the split argument doesn't
  contain a "/" since shell globs are not as precise as REs.

* Don't transform the path given after --dynamic-linker (used by GNU
  ld for ELF linkage).

* Add the ability for the libtool wrapper to be called just to unwrap
  an existing libtool archive by running:

	libtool --mode=unwrap -o libfoo.la


20040914
========
* Add a loop in libtool-fix-la to ensure that all of the options listed
  in the dependency_libs lines of *.lai files are processed.  This fixes
  a buildlink3 leakage bug.

* Merge the gen-transform.sh scripts between buildlink3 and wrapper and
  place them all in wrapper.  This makes sense since the commands simply
  allow for many types of transformations, which buildlink3 takes
  advantage of, but there is nothing inherently buildlink-ish about
  those commands.

* Don't directly manipulate SUBST_SED.unwrap.  Instead, create the
  value of SUBST_SED.unwrap by combining several other variables
  (currently just _UNWRAP_SED) to ensure that the correct ordering is
  preserved.

* Correct some confusing debugging messages.

Revision 1.165 / (download) - annotate - [select for diffs], Fri Aug 27 06:29:09 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2004Q3-base, pkgsrc-2004Q3
Changes since 1.164: +17 -4 lines
Diff to previous 1.164 (colored)

Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively.  In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath.  The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use.  They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively.  Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.

Revision 1.164 / (download) - annotate - [select for diffs], Fri Jul 30 20:59:08 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.163: +6 -1 lines
Diff to previous 1.163 (colored)

bsd.options.mk provides boilerplate code for standard naming conventions
for handling per-package build options.

Before including this file, the following variables should be defined:

	PKG_OPTIONS_VAR
		This is a list of the name of the make(1) variables that
		contain the options the user wishes to select.  This
		variable should be set in a package Makefile.  E.g.,

			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
		or
			PKG_OPTIONS_VAR=	FOO_OPTIONS BAR_OPTIONS

	PKG_SUPPORTED_OPTIONS
		This is a list of build options supported by the package.
		This variable should be set in a package Makefile.  E.g.,

			PKG_SUPPORTED_OPTIONS=	kerberos ldap ssl

Optionally, the following variables may also be defined:

	PKG_DEFAULT_OPTIONS
		This is a list the options that should be built into
		every package, if that option is supported.  This
		variable should be set in /etc/mk.conf.

	${PKG_OPTIONS_VAR} (the variables named in PKG_OPTIONS_VAR)
		These variables list the selected build options and
		override any default options given in PKG_DEFAULT_OPTIONS.
		If any of the options begin with a '-', then that option
		is always removed from the selected build options, e.g.

			PKG_DEFAULT_OPTIONS=	kerberos ldap sasl
			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
			WIBBLE_OPTIONS=		${PKG_DEFAULT_OPTIONS} -sasl
			# implies PKG_OPTIONS == "kerberos ldap"
		or
			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
			WIBBLE_OPTIONS=		kerberos -ldap ldap
			# implies PKG_OPTIONS == "kerberos"

		This variable should be set in /etc/mk.conf.

	PKG_FAIL_UNSUPPORTED_OPTIONS
		If this is set to "yes", then the presence of unsupported
		options in PKG_OPTIONS.<pkg> (see below) causes the build
		to fail.  Set this to "no" to silently ignore unsupported
		options.  Default: "yes".

After including this file, the following variables are defined:

	PKG_OPTIONS
		This is the list of the selected build options, properly
		filtered to remove unsupported and duplicate options.

Example usage:

-------------8<-------------8<-------------8<-------------8<-------------
# Global and legacy options
.if defined(USE_OPENLDAP) || defined(USE_SASL2)
.  if !defined(PKG_OPTIONS.wibble)
.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
PKG_OPTIONS.wibble+=	ldap
.    endif
.    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
PKG_OPTIONS.wibble+=	sasl
.    endif
.  endif
.endif

PKG_OPTIONS_VAR=	PKG_OPTIONS.wibble
PKG_SUPPORTED_OPTIONS=	ldap sasl
.include "../../mk/bsd.options.mk"

# Package-specific option-handling

###
### LDAP support
###
.if !empty(PKG_OPTIONS:Mldap)
.  include "../../databases/openldap/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-ldap=${BUILDLINK_PREFIX.openldap}
.endif

###
### SASL authentication
###
.if !empty(PKG_OPTIONS:Msasl)
.  include "../../security/cyrus-sasl2/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-sasl=${BUILDLINK_PREFIX.sasl}
.endif
-------------8<-------------8<-------------8<-------------8<-------------

Revision 1.163 / (download) - annotate - [select for diffs], Fri Jul 30 07:38:01 2004 UTC (14 years, 7 months ago) by xtraeme
Branch: MAIN
Changes since 1.162: +5 -5 lines
Diff to previous 1.162 (colored)

Only assign X11BASE=/usr/X11R6 if X11_TYPE was not defined, or
if X11_TYPE == native (by default).

Revision 1.162 / (download) - annotate - [select for diffs], Tue Jul 6 22:49:16 2004 UTC (14 years, 8 months ago) by wiz
Branch: MAIN
Changes since 1.161: +2 -3 lines
Diff to previous 1.161 (colored)

Retire buildlink2, now that all packages using it have been converted to
buildlink3.

Revision 1.161 / (download) - annotate - [select for diffs], Fri Jul 2 16:27:48 2004 UTC (14 years, 8 months ago) by wiz
Branch: MAIN
Changes since 1.160: +2 -2 lines
Diff to previous 1.160 (colored)

else exists ... -> elif exists ...
Noted by Roland Illig on tech-pkg.

Revision 1.160 / (download) - annotate - [select for diffs], Mon Apr 26 17:29:33 2004 UTC (14 years, 11 months ago) by tv
Branch: MAIN
CVS Tags: pkgsrc-2004Q2-base, pkgsrc-2004Q2
Changes since 1.159: +2 -2 lines
Diff to previous 1.159 (colored)

PKGDIRMODE must be set *after* including defs.*.

Revision 1.159 / (download) - annotate - [select for diffs], Sun Apr 25 22:42:51 2004 UTC (14 years, 11 months ago) by tv
Branch: MAIN
Changes since 1.158: +2 -1 lines
Diff to previous 1.158 (colored)

Make sure PKGDIRMODE is always set in bsd.prefs.mk so it can be checked
in lang/perl58/Makefile.  (It had been set previously only in bsd.pkg.mk.)

Revision 1.158 / (download) - annotate - [select for diffs], Sun Apr 4 07:09:38 2004 UTC (14 years, 11 months ago) by agc
Branch: MAIN
Changes since 1.157: +2 -2 lines
Diff to previous 1.157 (colored)

Make USE_XPKGWEDGE default to "yes", as announced on tech-pkg@ last week.

Revision 1.157 / (download) - annotate - [select for diffs], Thu Mar 11 17:53:16 2004 UTC (15 years ago) by tv
Branch: MAIN
CVS Tags: pkgsrc-2004Q1-base, pkgsrc-2004Q1
Changes since 1.156: +5 -1 lines
Diff to previous 1.156 (colored)

Add Interix bits.

Revision 1.156 / (download) - annotate - [select for diffs], Tue Mar 9 20:39:50 2004 UTC (15 years ago) by recht
Branch: MAIN
Changes since 1.155: +10 -1 lines
Diff to previous 1.155 (colored)

Add LOWER_OPSYS_VERSUFFIX on FreeBSD platforms, so that the major
number is included in MACHINE_GNU_PLATFORM.
Fixes at least the build of wip/mingw-gcc.
Patch based upon the one provided by Michal Pasternak in PR 23856.

Revision 1.155 / (download) - annotate - [select for diffs], Wed Feb 18 13:32:38 2004 UTC (15 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.154: +1 -15 lines
Diff to previous 1.154 (colored)

* Move pkgsrc/mk/compiler/bsd.compiler.mk to pkgsrc/mk/compiler.mk.
  Package Makefiles may now directly include compiler.mk.

* Don't include compiler.mk within bsd.prefs.mk any longer.  It was only
  included for the purposes of defining CC_VERSION.  Packages that want
  to test the value of CC_VERSION should now first include
  "../../mk/compiler.mk".  Any GCC_REQD statements in package Makefiles
  should be set before compiler.mk is included.

* Simpllfy pkgsrc/mk/compiler/*.mk files as a result of not needing to
  be included indirectly by bsd.prefs.mk.  We remove the special handling
  associated with detecting whether the file was included from within
  bsd.prefs.mk.  These files are now much more straightforward to write
  and understand.

* G/C the BSD_PREFS_MK stack mechanism as the only users (compiler/*)
  no longer need it.

* Ensure that directories are prepended to the PATH only from within
  bsd.pkg.mk.

Revision 1.154 / (download) - annotate - [select for diffs], Sat Feb 14 11:28:28 2004 UTC (15 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.153: +2 -3 lines
Diff to previous 1.153 (colored)

Convert a debugging definition back into the real thing.

Revision 1.153 / (download) - annotate - [select for diffs], Sat Feb 14 03:33:39 2004 UTC (15 years, 1 month ago) by grant
Branch: MAIN
Changes since 1.152: +3 -1 lines
Diff to previous 1.152 (colored)

add URL to my post to tech-pkg to deprecated Zoularis message.

Revision 1.152 / (download) - annotate - [select for diffs], Sat Feb 14 03:26:09 2004 UTC (15 years, 1 month ago) by grant
Branch: MAIN
Changes since 1.151: +6 -10 lines
Diff to previous 1.151 (colored)

deprecate Zoularis: remove any tests for ZOULARIS* and bomb if
${LOCALBASE}/bsd/share/mk/zoularis.mk exists.

Revision 1.151 / (download) - annotate - [select for diffs], Fri Feb 13 18:00:29 2004 UTC (15 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.150: +19 -12 lines
Diff to previous 1.150 (colored)

Don't use the new pkg_info options unless the the pkg_install tools are
new enough to support them.  pkgsrc requires updated pkg_install for
older NetBSD releases and will ask the user to install them as the first
step to using pkgsrc, but the error messages about pkg_info not supporting
the "-K" option were confusing.

Revision 1.150 / (download) - annotate - [select for diffs], Fri Feb 6 19:04:25 2004 UTC (15 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.149: +7 -7 lines
Diff to previous 1.149 (colored)

If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value.  This
avoids breakage when executing the just-in-time su targets.

Revision 1.149 / (download) - annotate - [select for diffs], Fri Feb 6 04:37:02 2004 UTC (15 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.148: +17 -1 lines
Diff to previous 1.148 (colored)

Hiding the PATH from certain phases of the build only accidentally worked
due to a type on gcc.mk that causes the ${_GCC_PREFIX}/bin to always be
prepended to the PATH.  The problem that was hiding was "make" resolving
to ${TOOLS_DIR}/bin/make if the package used GNU make, which broke
building since the package Makefile is a BSD Makefile and we passed
PATH to some phases of the build.  Fix this by expanding MAKE to the
full path to ${MAKE} in bsd.prefs.mk.  We also garbage collect the now
useless checks for PHASES_AFTER_BUILDLINK that cluttered the PREPEND_PATH
code.

Revision 1.148 / (download) - annotate - [select for diffs], Thu Feb 5 03:39:17 2004 UTC (15 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.147: +3 -3 lines
Diff to previous 1.147 (colored)

Simpilfy the test for whether we're inside bsd.prefs.mk.

Revision 1.147 / (download) - annotate - [select for diffs], Thu Feb 5 03:37:47 2004 UTC (15 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.146: +9 -1 lines
Diff to previous 1.146 (colored)

Include bsd.compiler.mk inside both bsd.pkg.mk and bsd.prefs.mk and define
a stack-like mechanism in bsd.prefs.mk to detect when a we're inside
bsd.prefs.mk.

Revision 1.146 / (download) - annotate - [select for diffs], Sun Feb 1 00:32:38 2004 UTC (15 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.145: +5 -5 lines
Diff to previous 1.145 (colored)

Use the new compiler selection framework instead of the old one.

Revision 1.145 / (download) - annotate - [select for diffs], Tue Jan 27 02:36:59 2004 UTC (15 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.144: +2 -1 lines
Diff to previous 1.144 (colored)

"fetch" is also a distinct build phase.

Revision 1.144 / (download) - annotate - [select for diffs], Sun Jan 25 19:23:20 2004 UTC (15 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.143: +2 -2 lines
Diff to previous 1.143 (colored)

Purge one more instance of _NULL_SUFFIX.  Fix by Marc Recht.

Revision 1.143 / (download) - annotate - [select for diffs], Sun Jan 25 18:42:53 2004 UTC (15 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.142: +1 -7 lines
Diff to previous 1.142 (colored)

pkgsrc requires PKGTOOLS_REQD>=20030918, so we don't need to conditionalize
passing "-S" to pkg_admin.

Revision 1.142 / (download) - annotate - [select for diffs], Fri Jan 23 17:55:17 2004 UTC (15 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.141: +39 -22 lines
Diff to previous 1.141 (colored)

Move all of the code that sets USE_XPKGWEDGE from bsd.pkg.mk into
bsd.prefs.mk as it's needed in setting X11PREFIX to the correct value,
which is also done in bsd.prefs.mk.  This is the follow-through to the
temporary fix in previous revision (1.141) of bsd.prefs.mk.

Revision 1.141 / (download) - annotate - [select for diffs], Fri Jan 23 16:49:47 2004 UTC (15 years, 2 months ago) by agc
Branch: MAIN
Changes since 1.140: +3 -2 lines
Diff to previous 1.140 (colored)

Temporary fix for xpkgwedge'd packages which were getting buildlinked
with a prefix of X11BASE, rather than LOCALBASE - check whether
USE_XPKGWEDGE is defined to {"YES", "yes"} as well as looking for the
existence of the xpkgwedge definition file when calculating the value
of X11PREFIX.

Revision 1.140 / (download) - annotate - [select for diffs], Wed Jan 21 18:13:27 2004 UTC (15 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.139: +15 -1 lines
Diff to previous 1.139 (colored)

Introduce concept of the "phase" that we're in as we progress through
fetching, extracting, configuring, building, etc. of a package.  We
can check what phase we're in by examining the value of ${PKG_PHASE}
and comparing against PHASES_AFTER_<phase>, which list phases that
are "greater than or equal to" <phase>.

One useful example of how to use PKG_PHASE is:

.if !empty(PHASES_AFTER_EXTRACT:${PKG_PHASE})
#
# Some variable settings or targets here that rely on dependencies to
# already be installed, or ${WRKDIR} to be created, etc., as these are
# things that should have happened by the time "make extract" is
# completed.
#
.endif

Revision 1.139 / (download) - annotate - [select for diffs], Sun Dec 28 11:23:28 2003 UTC (15 years, 3 months ago) by agc
Branch: MAIN
Changes since 1.138: +4 -4 lines
Diff to previous 1.138 (colored)

Indent to make nested blocks easier to distinguish.

Revision 1.138 / (download) - annotate - [select for diffs], Sun Dec 28 10:09:38 2003 UTC (15 years, 3 months ago) by tron
Branch: MAIN
Changes since 1.137: +2 -2 lines
Diff to previous 1.137 (colored)

Fix back ".endif" logic which breaks "USE_INET6" on many platforms.

Revision 1.137 / (download) - annotate - [select for diffs], Sat Dec 27 13:39:01 2003 UTC (15 years, 3 months ago) by tron
Branch: MAIN
Changes since 1.136: +2 -2 lines
Diff to previous 1.136 (colored)

Override predefined "USE_INET6" if "USE_SOCKS" is defined.

Revision 1.136 / (download) - annotate - [select for diffs], Sat Dec 27 13:28:46 2003 UTC (15 years, 3 months ago) by tron
Branch: MAIN
Changes since 1.135: +10 -4 lines
Diff to previous 1.135 (colored)

If "USE_INET6" is already defined (e.g. by NetBSD-current's "bsd.own.mk")
convert it to uppercase to make checks in packages like "bind9" work.

Revision 1.135 / (download) - annotate - [select for diffs], Thu Dec 11 22:35:50 2003 UTC (15 years, 3 months ago) by reed
Branch: MAIN
Changes since 1.134: +4 -1 lines
Diff to previous 1.134 (colored)

For BSD/OS, the customized libtool uses "bsdi", so set
LOWER_OPSYS to that.

Revision 1.134 / (download) - annotate - [select for diffs], Wed Dec 10 13:59:07 2003 UTC (15 years, 3 months ago) by grant
Branch: MAIN
Changes since 1.133: +13 -2 lines
Diff to previous 1.133 (colored)

override bootstrap-pkgsrc's incorrect OBJECT_FMT on NetBSD 1.4. from
krister.

XXX this should also be fixed in bootstrap-pkgsrc and bmake's
mk-files.

Revision 1.133 / (download) - annotate - [select for diffs], Fri Dec 5 05:33:17 2003 UTC (15 years, 3 months ago) by reed
Branch: MAIN
Changes since 1.132: +1 -6 lines
Diff to previous 1.132 (colored)

For BSD/OS, get rid of that libtool work-around of
renaming LOWER_OPSYS to match. I will fix ltconfig to work
with "bsdos" too instead.

Revision 1.132 / (download) - annotate - [select for diffs], Wed Dec 3 21:48:33 2003 UTC (15 years, 3 months ago) by reed
Branch: MAIN
Changes since 1.131: +7 -2 lines
Diff to previous 1.131 (colored)

In bsd.prefs.mk, get rid of possible "/" in OPSYS name and define
LOWER_OPSYS for libtool use under BSD/OS.

Add initial support for using pkgsrc under BSD/OS.  This was tested
under BSDI BSD/OS 4.3.1. (Thank you D. Hege.)

(Need to add BSDOS.x11.dist later.)
CVS ----------------------------------------------------------------------

Revision 1.131 / (download) - annotate - [select for diffs], Thu Oct 23 18:11:49 2003 UTC (15 years, 5 months ago) by fredb
Branch: MAIN
CVS Tags: pkgsrc-2003Q4-base, pkgsrc-2003Q4
Changes since 1.130: +2 -2 lines
Diff to previous 1.130 (colored)

The "elf" goes after "netbsd", the version number after that.

Revision 1.130 / (download) - annotate - [select for diffs], Sat Oct 11 06:46:45 2003 UTC (15 years, 5 months ago) by grant
Branch: MAIN
Changes since 1.129: +3 -2 lines
Diff to previous 1.129 (colored)

use 'solaris2' instead of 'solaris' in MACHINE_GNU_PLATFORM to
fix breakage in some GNU configure scripts.

based on patch from Jonathan Perkin in PR pkg/20701.

Revision 1.129 / (download) - annotate - [select for diffs], Wed Oct 8 10:07:20 2003 UTC (15 years, 5 months ago) by agc
Branch: MAIN
Changes since 1.128: +8 -2 lines
Diff to previous 1.128 (colored)

Use the -S argument to pkg_admin(1) if it exists.

Revision 1.128 / (download) - annotate - [select for diffs], Wed Sep 24 12:22:04 2003 UTC (15 years, 6 months ago) by grant
Branch: MAIN
Changes since 1.127: +7 -1 lines
Diff to previous 1.127 (colored)

make CC_VERSION available to packages by including bsd.prefs.mk.

it is of the form 'gcc-<version>' if gcc is being used, or empty
otherwise (for now).

requested by tron.

Revision 1.127 / (download) - annotate - [select for diffs], Wed Sep 17 05:14:40 2003 UTC (15 years, 6 months ago) by itojun
Branch: MAIN
Changes since 1.126: +9 -1 lines
Diff to previous 1.126 (colored)

binary format detection for OpenBSD.  Frederick Bruckman

Revision 1.126 / (download) - annotate - [select for diffs], Tue Sep 16 08:09:04 2003 UTC (15 years, 6 months ago) by grant
Branch: MAIN
Changes since 1.125: +29 -29 lines
Diff to previous 1.125 (colored)

fix some indentation

Revision 1.125 / (download) - annotate - [select for diffs], Sat Sep 13 05:55:15 2003 UTC (15 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.124: +8 -1 lines
Diff to previous 1.124 (colored)

In cases where we need the best match for a pkgpattern, use
"${PKG_BEST_EXIST} pkgpattern" instead of "${PKG_INFO} -e pkgpattern".  The
latter can return multiple package names if there are multiple versions of
a piece of software installed.  PKG_BEST_EXIST is defined to be
"${PKG_ADMIN} -b -d ${_PKG_DBDIR} -s "" lsbest", so it searches for the
best installed package that matches the given pkgpattern or else returns
the empty string.

Bump PKGTOOLS_REQD to 20030912 since pkg_admin(1) needs to know about "-b"
and "-d <dir>".

Revision 1.124 / (download) - annotate - [select for diffs], Fri Sep 12 16:07:09 2003 UTC (15 years, 6 months ago) by grant
Branch: MAIN
Changes since 1.123: +1 -9 lines
Diff to previous 1.123 (colored)

move a SunPro tweak to compiler.mk.

Revision 1.123 / (download) - annotate - [select for diffs], Fri Sep 12 10:49:31 2003 UTC (15 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.122: +7 -1 lines
Diff to previous 1.122 (colored)

Move the default settings for USE_BUILDLINK[23] from bsd.pkg.mk into
bsd.prefs.mk so that they may be tested/used in buildlink[23].mk files.

Revision 1.122 / (download) - annotate - [select for diffs], Tue Sep 2 06:59:44 2003 UTC (15 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.121: +48 -8 lines
Diff to previous 1.121 (colored)

Merge pkgviews-mk branch into the HEAD by running:

	cd pkgsrc/mk
	cvs update -Pd -A
	cvs update -Pd -j pkgviews-mk-base -j pkgviews-mk

Revision 1.118.2.17 / (download) - annotate - [select for diffs], Tue Sep 2 03:09:49 2003 UTC (15 years, 6 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.16: +1 -1 lines
Diff to previous 1.118.2.16 (colored) to branchpoint 1.118 (colored) next main 1.119 (colored)

Sync to HEAD before merging back.

Revision 1.121 / (download) - annotate - [select for diffs], Sun Aug 31 11:04:58 2003 UTC (15 years, 6 months ago) by jlam
Branch: MAIN
CVS Tags: pkgviews-mk-base
Changes since 1.120: +13 -7 lines
Diff to previous 1.120 (colored)

Create new variables PKG_*_CMD that contain just the paths to the various
pkg_install tools.

Revision 1.118.2.16 / (download) - annotate - [select for diffs], Sat Aug 30 09:24:22 2003 UTC (15 years, 6 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.15: +2 -2 lines
Diff to previous 1.118.2.15 (colored) to branchpoint 1.118 (colored)

_PKG_DBDIR is in fact set in this very file.  Thanks, seb!

Revision 1.118.2.15 / (download) - annotate - [select for diffs], Fri Aug 29 02:06:12 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.14: +10 -6 lines
Diff to previous 1.118.2.14 (colored) to branchpoint 1.118 (colored)

Support two new variables:

PKG_INSTALLATION_PREFS?= overwrite pkgviews
# This is a whitespace-separated list of installation types to try when
# building a package, in order of preference.
# Possible: any of: overwrite, pkgviews
# Default: overwrite pkgviews

PKG_INSTALLATION_TYPES?= overwrite
# This is a whitespace-separated list of installation types supported
# by the package.
#
# *NOTE*: This variable *must* be set in the package Makefile *before*
#         the inclusion of bsd.prefs.mk.
#
# Possible: any of: overwrite, pkgviews
# Default: overwrite

Revision 1.118.2.14 / (download) - annotate - [select for diffs], Tue Aug 26 21:52:10 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.13: +17 -1 lines
Diff to previous 1.118.2.13 (colored) to branchpoint 1.118 (colored)

Move the PKG_INSTALLATION_TYPE and _PKG_DBDIR definitions into
bsd.prefs.mk so that PKG_{INFO,ADD,ADMIN,etc.} all use the correct
package database directory and are set correctly before bsd.pkg.mk is
included.  This is needed since some buildlink2.mk files use these
variables in != variable settings, and the buildlink2.mk files are included
before bsd.pkg.mk.

As a side effect of this change, we now require PKG_INSTALLATION_TYPE to be
defined *before* bsd.prefs.mk is included, so stick the definition near the
top of package Makefile.

Revision 1.118.2.13 / (download) - annotate - [select for diffs], Mon Aug 25 19:37:47 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.12: +6 -6 lines
Diff to previous 1.118.2.12 (colored) to branchpoint 1.118 (colored)

Revert PKG_DBDIR -> PKG_DBDIR_DFLT change.  Since the pkg_* tools all
support a command-line option to specify the pkg_dbdir, we can keep the
old PKG_DBDIR semantics without change.  This is less impactful for when
we merge.

Revision 1.118.2.12 / (download) - annotate - [select for diffs], Sat Aug 23 09:45:55 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.11: +3 -1 lines
Diff to previous 1.118.2.11 (colored) to branchpoint 1.118 (colored)

Sync to HEAD.

Revision 1.118.2.11 / (download) - annotate - [select for diffs], Fri Aug 22 07:15:46 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.10: +16 -10 lines
Diff to previous 1.118.2.10 (colored) to branchpoint 1.118 (colored)

Require version 20030820 of the pkg_install tools to use the new -K and -k
flags to specify package database directories, instead of setting up a
shell environment for the pkg_install tools.  The latter was more prone to
error.

Revision 1.120 / (download) - annotate - [select for diffs], Thu Aug 21 16:16:46 2003 UTC (15 years, 7 months ago) by gavan
Branch: MAIN
Changes since 1.119: +3 -1 lines
Diff to previous 1.119 (colored)

Avoid circular dependency on gcc if USE_GCC[23] is set.

Revision 1.118.2.10 / (download) - annotate - [select for diffs], Thu Aug 21 04:07:38 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.9: +1 -6 lines
Diff to previous 1.118.2.9 (colored) to branchpoint 1.118 (colored)

Support PLIST_TYPE, which can be either "dynamic" or "static" to represent
whether we are using the dynamic PLIST facility or if we're using the PLIST
kept with pkgsrc.  PLIST_TYPE is only relevant if PKG_INSTALLATION_TYPE is
set to "pkgviews".

Revision 1.118.2.9 / (download) - annotate - [select for diffs], Thu Aug 21 02:06:15 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.8: +12 -8 lines
Diff to previous 1.118.2.8 (colored) to branchpoint 1.118 (colored)

Use the 20030819 pkg_install tools, which support PKG_DBDIR_DFLT, and
modify pkgsrc to use the new variable.  This greatly simplifies a lot of
the code instead of having to overload the value of PKG_DBDIR as we did
before this change.

Revision 1.118.2.8 / (download) - annotate - [select for diffs], Sat Aug 16 21:14:52 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.7: +3 -2 lines
Diff to previous 1.118.2.7 (colored) to branchpoint 1.118 (colored)

Define some _PKG_* variables representing the pkg_install tools that point
to either DEPOT_PKG_* or PKG_* and consistently use _PKG_* to avoid having
to constantly condition on the value of PKG_INSTALLATION_TYPE.

Revision 1.118.2.7 / (download) - annotate - [select for diffs], Sat Aug 16 20:22:11 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.6: +2 -1 lines
Diff to previous 1.118.2.6 (colored) to branchpoint 1.118 (colored)

Define a DEPOT_PKG_ADMIN command that runs pkg_admin(1) with PKG_DBDIR
set to the DEPOTBASE.  This is used for all pkgviews-related uses of
pkg_admin(1).

Revision 1.118.2.6 / (download) - annotate - [select for diffs], Sat Aug 16 09:08:50 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.5: +6 -1 lines
Diff to previous 1.118.2.5 (colored) to branchpoint 1.118 (colored)

Sync to HEAD for tools.mk changes.

Revision 1.119 / (download) - annotate - [select for diffs], Sat Aug 16 08:39:17 2003 UTC (15 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.118: +6 -1 lines
Diff to previous 1.118 (colored)

There are many uses for a common log file, so define one that may be
picked up and used by tools.mk, bsd.buildlink2.mk, etc.

Revision 1.118.2.5 / (download) - annotate - [select for diffs], Thu Aug 14 07:08:17 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.4: +6 -1 lines
Diff to previous 1.118.2.4 (colored) to branchpoint 1.118 (colored)

Move the PKG_INSTALLATION_TYPE definition from bsd.pkg.defaults.mk to
bsd.prefs.mk.  We don't want users to get the idea that this variable is
something that they set in /etc/mk.conf.

Revision 1.118.2.4 / (download) - annotate - [select for diffs], Tue Jul 29 20:34:19 2003 UTC (15 years, 7 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.3: +3 -1 lines
Diff to previous 1.118.2.3 (colored) to branchpoint 1.118 (colored)

Config file handling in the pkgviews world is that each package
installed on the system has a unique config file directory by default,
and that the config files are symlinked into view-friendly places
during the VIEW-INSTALL step.  There are three cases:

(1) If PKG_SYSCONFBASE points to somewhere under PREFIX, then we don't
    have to do anything, as everything (except for scratch files:
    *[~#], *.OLD, *.orig, *,v) in PREFIX is symlinked into the view
    automatically when the package is added to the view using
    pkg_view(1).

(2) If PKG_SYSCONFBASE points outside of PREFIX, then we construct a
    PKG_SYSCONFDIR as:

	${PKG_SYSCONFBASE}/${DEPOT_SUBDIR}/${PKGNAME}

    This mirrors the directory layout in ${LOCALBASE}/${X11BASE} for
    depoted packages.  Then during VIEW-INSTALL time, we "add" a view
    to the package config files by using linkfarm(1) to symlink
    everything (again, except for scratch files) from PKG_SYSCONFDIR
    into PKG_SYSCONFBASE.

(3) If PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set, then we don't do any
    view-friendly symlinking.

Case (1) is the default.  Case (2) handles the NFS-shared /usr/pkg
case where config files really shouldn't be shared, and the usual
setting of PKG_SYSCONFBASE=/etc in /etc/mk.conf should do the right
thing.  Case (3) tries to avoid being overly smart and possibly
messing up when the package builder does something special for the
package.

Revision 1.118.2.3 / (download) - annotate - [select for diffs], Thu Jul 24 22:00:10 2003 UTC (15 years, 8 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.2: +19 -7 lines
Diff to previous 1.118.2.2 (colored) to branchpoint 1.118 (colored)

Restore pkgviews-mk branch modifications to pkgsrc/mk after botched sync to
HEAD (time to script the command sequence...).

Revision 1.118.2.2 / (download) - annotate - [select for diffs], Thu Jul 24 09:26:00 2003 UTC (15 years, 8 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118.2.1: +6 -18 lines
Diff to previous 1.118.2.1 (colored) to branchpoint 1.118 (colored)

Sync with HEAD.

Revision 1.118.2.1 / (download) - annotate - [select for diffs], Wed Jul 16 09:33:47 2003 UTC (15 years, 8 months ago) by jlam
Branch: pkgviews-mk
Changes since 1.118: +19 -7 lines
Diff to previous 1.118 (colored)

Initial work in merging bits of the pkgviews branch into modern pkgsrc.
Currently, the pkgviews/buildlink2 integration is incomplete.  People who
work on this branch should also check out src/usr.sbin/pkg_install from
the pkgviews branch.

Revision 1.118 / (download) - annotate - [select for diffs], Sun Jul 13 13:27:18 2003 UTC (15 years, 8 months ago) by grant
Branch: MAIN
CVS Tags: pkgviews-base
Branch point for: pkgviews-mk
Changes since 1.117: +1 -15 lines
Diff to previous 1.117 (colored)

move gcc selection back to bsd.pkg.mk as the top-level Makefile
includes bsd.prefs.mk.

Revision 1.117 / (download) - annotate - [select for diffs], Sun Jul 13 13:10:43 2003 UTC (15 years, 8 months ago) by grant
Branch: MAIN
Changes since 1.116: +13 -13 lines
Diff to previous 1.116 (colored)

don't set USE_GCC2 by default as it implies the use pkgsrc gcc2, and
move handling of gcc shared libraries to bsd.prefs.mk.

Revision 1.116 / (download) - annotate - [select for diffs], Wed Jul 9 16:07:21 2003 UTC (15 years, 8 months ago) by salo
Branch: MAIN
Changes since 1.115: +9 -1 lines
Diff to previous 1.115 (colored)

More support bits for native Sun compilers (on Solaris).

Sun's C++ compiler (CC) doesn't support passing arguments to ld via -Wl flag,
remove this flag from the buildlink2 environment.

Revision 1.115 / (download) - annotate - [select for diffs], Wed Jul 9 11:38:17 2003 UTC (15 years, 8 months ago) by abs
Branch: MAIN
Changes since 1.114: +2 -2 lines
Diff to previous 1.114 (colored)

Handle blank MACHINE_ARCH on Linux (as seen on 20030630 bootstrap kit)

Revision 1.114 / (download) - annotate - [select for diffs], Wed Jul 9 08:22:22 2003 UTC (15 years, 8 months ago) by salo
Branch: MAIN
Changes since 1.113: +15 -1 lines
Diff to previous 1.113 (colored)

Introduce few new variables for (mostly) non-GCC compilers use with pkgsrc
so compiler-dependent settings can be set later.

USE_GCC2    - GNU Compiler Collection 2.x	(default)
USE_GCC3    - GNU Compiler Collection 3.x	(used already)
USE_MIPSPRO - Silicon Graphics, Inc. MIPSpro Compiler
USE_SUNPRO  - Sun Microsystems, Inc. WorkShop/Forte/Sun ONE Studio
              Compiler Collection

(Intel compilers on Linux, anyone? :) )

Revision 1.113 / (download) - annotate - [select for diffs], Thu Jun 5 00:23:29 2003 UTC (15 years, 9 months ago) by jschauma
Branch: MAIN
Changes since 1.112: +3 -3 lines
Diff to previous 1.112 (colored)

Use a better value as LOWER_OPSYS for IRIX.

Revision 1.112 / (download) - annotate - [select for diffs], Mon Apr 21 01:54:33 2003 UTC (15 years, 11 months ago) by grant
Branch: MAIN
Changes since 1.111: +6 -3 lines
Diff to previous 1.111 (colored)

back out previous, it does not work as it should.

Revision 1.111 / (download) - annotate - [select for diffs], Mon Apr 21 01:35:10 2003 UTC (15 years, 11 months ago) by grant
Branch: MAIN
Changes since 1.110: +4 -7 lines
Diff to previous 1.110 (colored)

ensure LOWER_ARCH always gets set on Solaris, not only if MACHINE_ARCH
is non-sensical. shuffle some definitions around to follow style of
other entries.

semi-related to a tr(1) bug observed by sommerfeld@ Solaris 10/i386.

Revision 1.110 / (download) - annotate - [select for diffs], Tue Apr 15 05:29:46 2003 UTC (15 years, 11 months ago) by grant
Branch: MAIN
Changes since 1.109: +6 -1 lines
Diff to previous 1.109 (colored)

add OPSYS_{,NO_}WHOLE_ARCHIVE_FLAG which defines the argument passed
to the linker to (not) extract all symbols from static archives and
export these variables to packages as {,NO_}WHOLE_ARCHIVE_FLAG.

these are not currently set for IRIX.

Revision 1.109 / (download) - annotate - [select for diffs], Mon Mar 31 02:58:01 2003 UTC (15 years, 11 months ago) by jschauma
Branch: MAIN
Changes since 1.108: +2 -1 lines
Diff to previous 1.108 (colored)

${UNAME} -p is a good value for LOWER_ARCH on Irix as well.

Revision 1.108 / (download) - annotate - [select for diffs], Fri Mar 28 21:16:10 2003 UTC (16 years ago) by wiz
Branch: MAIN
Changes since 1.107: +2 -2 lines
Diff to previous 1.107 (colored)

Quote tr arguments.

Revision 1.107 / (download) - annotate - [select for diffs], Fri Mar 14 19:37:49 2003 UTC (16 years ago) by jlam
Branch: MAIN
Changes since 1.106: +5 -1 lines
Diff to previous 1.106 (colored)

(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
    Makefiles simply need to use this value often, for better or for
    worse.

(2) Create a new variable FIX_RPATH that lists variables that should
    be cleansed of -R or -rpath values if ${_USE_RPATH} is "no".  By
    default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
    additional variables may be appended from package Makefiles.

Revision 1.106 / (download) - annotate - [select for diffs], Sat Jan 25 22:39:56 2003 UTC (16 years, 2 months ago) by jschauma
Branch: MAIN
CVS Tags: netbsd-1-6-1-base, netbsd-1-6-1
Changes since 1.105: +14 -6 lines
Diff to previous 1.105 (colored)

Add some LOWER_VENDOR definitions on Linux to better customize packages
in the future (on Debian, for example, there is no libtermcap, and we need to
depend on ncurses etc.)

Revision 1.105 / (download) - annotate - [select for diffs], Wed Jan 15 20:55:39 2003 UTC (16 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.104: +3 -3 lines
Diff to previous 1.104 (colored)

Make BUILD_DIR always point to a physical path by invoking /bin/pwd instead
of relying on the shell's builtin pwd.  This makes BUILD_DIR consistently
point to the correct directory regardless of the definition of SHELL.  This
fixes elusive some buildlink2 errors due to the fact that BUILDLINK_DIR is
derived from BUILD_DIR and some paths were incorrectly being translated.

Revision 1.104 / (download) - annotate - [select for diffs], Wed Jan 15 10:06:48 2003 UTC (16 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.103: +4 -4 lines
Diff to previous 1.103 (colored)

Revert previous change.  Defining BSD_PREFS_MK instead of BSD_PKG_MK
breaks too many users' /etc/mk.conf files that have a

	.ifdef BSD_PKG_MK
	# /usr/pkgsrc stuff
	.else
	# /usr/src stuff
	.endif

structure.  We'll think of another way to protect against multiple
inclusion of bsd.pkg.mk and bsd.prefs.mk.

Revision 1.103 / (download) - annotate - [select for diffs], Tue Jan 14 16:25:41 2003 UTC (16 years, 2 months ago) by wiz
Branch: MAIN
Changes since 1.102: +4 -4 lines
Diff to previous 1.102 (colored)

Define and check for BSD_PREFS_MK, not BSD_PKG_MK. Proposed by Jan Schaumann.

Revision 1.102 / (download) - annotate - [select for diffs], Tue Jan 14 03:01:37 2003 UTC (16 years, 2 months ago) by jschauma
Branch: MAIN
Changes since 1.101: +4 -5 lines
Diff to previous 1.101 (colored)

On Linux, LOWER_ARCH is generally not yet defined.  Move assignment.

Revision 1.101 / (download) - annotate - [select for diffs], Sun Jan 12 22:36:14 2003 UTC (16 years, 2 months ago) by jschauma
Branch: MAIN
Changes since 1.100: +3 -3 lines
Diff to previous 1.100 (colored)

According to seb, make on 1.5 does not know about ${VAR:tl}, so let's go back to
echo VAR | tr A-Z a-z

Revision 1.100 / (download) - annotate - [select for diffs], Sun Jan 12 22:30:08 2003 UTC (16 years, 2 months ago) by jschauma
Branch: MAIN
Changes since 1.99: +6 -6 lines
Diff to previous 1.99 (colored)

efficiency++;
Make can take care of substitutions itself, so we don't need to use
echo VAR | sed
or
echo VAR | tr
Suggested by seb.

Revision 1.99 / (download) - annotate - [select for diffs], Sun Jan 12 20:36:58 2003 UTC (16 years, 2 months ago) by jschauma
Branch: MAIN
Changes since 1.98: +3 -1 lines
Diff to previous 1.98 (colored)

On Linux, s/i.86/i386/ for LOWER_ARCH and MACHINE_ARCH as suggested by
Jeremy C. Reed on tech-pkg.
Even though bootstrap's bmake will do this at build-time, this ensures
that even older bmake's don't fail if a package checks it for == i386.

Revision 1.98 / (download) - annotate - [select for diffs], Sun Jan 5 22:48:12 2003 UTC (16 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.97: +1 -13 lines
Diff to previous 1.97 (colored)

Remove a unused hack (it was only used by pthread.buildlink.mk, which is
now gone).

Revision 1.97 / (download) - annotate - [select for diffs], Wed Dec 18 06:18:14 2002 UTC (16 years, 3 months ago) by schmonz
Branch: MAIN
Changes since 1.96: +8 -18 lines
Diff to previous 1.96 (colored)

Introduce _OPSYS_HAS_INET6, and use it to determine the default
value of USE_INET6.

Revision 1.96 / (download) - annotate - [select for diffs], Sun Dec 15 01:15:24 2002 UTC (16 years, 3 months ago) by taca
Branch: MAIN
Changes since 1.95: +4 -2 lines
Diff to previous 1.95 (colored)

Previous commit breaks pkgsrc on NetBSD current since OS_VERSION isn't
pure numeric value "1.6K".

So, sperate ".if" directive comparing OS_VERSION into two ".if" directives.

Revision 1.95 / (download) - annotate - [select for diffs], Sun Dec 15 00:40:29 2002 UTC (16 years, 3 months ago) by schmonz
Branch: MAIN
Changes since 1.94: +3 -1 lines
Diff to previous 1.94 (colored)

Default to USE_INET6 = NO on Darwin < 6.0, whose IPv6 bits are a red herring.

Revision 1.94 / (download) - annotate - [select for diffs], Thu Dec 12 03:02:41 2002 UTC (16 years, 3 months ago) by jschauma
Branch: MAIN
Changes since 1.93: +5 -1 lines
Diff to previous 1.93 (colored)

Make sure that on IRIX{,64} LOWER_OPSYS matches what most configure
scripts seem to expect.  While we're at it, add a vendor.

Revision 1.93 / (download) - annotate - [select for diffs], Tue Dec 10 12:50:48 2002 UTC (16 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.92: +4 -4 lines
Diff to previous 1.92 (colored)

Remove trailing whitespace.

Revision 1.92 / (download) - annotate - [select for diffs], Sat Nov 30 16:49:00 2002 UTC (16 years, 3 months ago) by grant
Branch: MAIN
Changes since 1.91: +5 -2 lines
Diff to previous 1.91 (colored)

turn on USE_INET6 in a KAME IPv6 environment other than NetBSD.

Revision 1.91 / (download) - annotate - [select for diffs], Sun Nov 17 22:35:23 2002 UTC (16 years, 4 months ago) by grant
Branch: MAIN
Changes since 1.90: +5 -1 lines
Diff to previous 1.90 (colored)

LOWER_VENDOR is 'pc' on FreeBSD only if running on i386.

Revision 1.90 / (download) - annotate - [select for diffs], Sun Nov 17 15:11:40 2002 UTC (16 years, 4 months ago) by grant
Branch: MAIN
Changes since 1.89: +8 -1 lines
Diff to previous 1.89 (colored)

Add initial pkgsrc FreeBSD support :-)

Tested on FreeBSD 4.7-RELEASE/i386.

Revision 1.89 / (download) - annotate - [select for diffs], Fri Nov 1 06:29:23 2002 UTC (16 years, 4 months ago) by jlam
Branch: MAIN
Changes since 1.88: +3 -1 lines
Diff to previous 1.88 (colored)

When "make install" su's to root, su is invoked with the "-l" option, which
causes the shell environment to be discarded.  This also discards
OBJMACHINE or OBJHOSTNAME, which causes WRKDIR_BASENAME to be different
between the "non-root" and "root" make targets and leads to the breakage
seen in pkg/18879 by Simon Burge.  Fix this by saving the OBJHOSTNAME or
OBJMACHINE setting in MAKEFLAGS so that it is seen even after we "su -l" to
root.

Revision 1.88 / (download) - annotate - [select for diffs], Fri Nov 1 06:19:47 2002 UTC (16 years, 4 months ago) by jlam
Branch: MAIN
Changes since 1.87: +2 -2 lines
Diff to previous 1.87 (colored)

Whitespace and minor cosmetic fixes.

Revision 1.87 / (download) - annotate - [select for diffs], Mon Oct 21 21:46:00 2002 UTC (16 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.86: +6 -3 lines
Diff to previous 1.86 (colored)

Move X11BASE setting for Solaris to a more appropriate place now that we
don't need to worry about USE_XPM.

Revision 1.86 / (download) - annotate - [select for diffs], Mon Oct 21 13:58:18 2002 UTC (16 years, 5 months ago) by wiz
Branch: MAIN
Changes since 1.85: +1 -23 lines
Diff to previous 1.85 (colored)

Purge unused USE_XPM (use graphics/xpm/buildlink2.mk instead).

Revision 1.85 / (download) - annotate - [select for diffs], Mon Oct 21 01:40:57 2002 UTC (16 years, 5 months ago) by wiz
Branch: MAIN
Changes since 1.84: +1 -6 lines
Diff to previous 1.84 (colored)

Remove traces of now unused USE_XAW.

Revision 1.84 / (download) - annotate - [select for diffs], Mon Oct 21 01:17:12 2002 UTC (16 years, 5 months ago) by wiz
Branch: MAIN
Changes since 1.83: +2 -33 lines
Diff to previous 1.83 (colored)

Remove USE_MESA -- now unused.

Revision 1.83 / (download) - annotate - [select for diffs], Sun Oct 20 11:47:05 2002 UTC (16 years, 5 months ago) by wiz
Branch: MAIN
Changes since 1.82: +1 -18 lines
Diff to previous 1.82 (colored)

Remove obsolete USE_FREETYPE2 support; all users have been converted to use
freetype2's buildlink2.mk.

Revision 1.82 / (download) - annotate - [select for diffs], Sat Oct 19 20:33:59 2002 UTC (16 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.81: +37 -1 lines
Diff to previous 1.81 (colored)

Move some variable definitions from bsd.pkg.mk to bsd.prefs.mk so that
they may be used in conditional statements in *.mk files before bsd.pkg.mk
is included.

Revision 1.81 / (download) - annotate - [select for diffs], Sat Oct 12 20:25:49 2002 UTC (16 years, 5 months ago) by bouyer
Branch: MAIN
Changes since 1.80: +2 -1 lines
Diff to previous 1.80 (colored)

Assign a default value to SPARC_TARGET_ARCH for the if MACHINE_ARCH == sun4
too.

Revision 1.80 / (download) - annotate - [select for diffs], Sat Oct 12 17:17:22 2002 UTC (16 years, 5 months ago) by agc
Branch: MAIN
Changes since 1.79: +17 -14 lines
Diff to previous 1.79 (colored)

On Solaris, MACHINE_ARCH on Suns can be sun4c or i86pc with
bootstrap-pkgsrc, so adjust accordingly.

Also indent a little better.

Revision 1.79 / (download) - annotate - [select for diffs], Tue Sep 24 21:54:51 2002 UTC (16 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.78: +10 -3 lines
Diff to previous 1.78 (colored)

Move pkgtools-related definitions into bsd.prefs.mk so that they may be
used by buildink2.mk files.

Revision 1.78 / (download) - annotate - [select for diffs], Tue Sep 24 13:59:34 2002 UTC (16 years, 6 months ago) by wiz
Branch: MAIN
Changes since 1.77: +3 -3 lines
Diff to previous 1.77 (colored)

Some whitespace cleanup.

Revision 1.77 / (download) - annotate - [select for diffs], Sun Sep 15 11:58:23 2002 UTC (16 years, 6 months ago) by rh
Branch: MAIN
Changes since 1.76: +20 -1 lines
Diff to previous 1.76 (colored)

Move xpkgwedge check from bsd.pkg.mk to bsd.prefs.mk so that X11PREFIX
location check within package Makefiles actually works as expected.

Revision 1.76 / (download) - annotate - [select for diffs], Sun Sep 1 15:13:41 2002 UTC (16 years, 6 months ago) by tron
Branch: MAIN
Changes since 1.75: +11 -6 lines
Diff to previous 1.75 (colored)

The "Xpm" library is distributed with Solaris 9. Handle this case like
XFree86 4.x and don't install the package.

Revision 1.70.2.4 / (download) - annotate - [select for diffs], Wed Aug 21 22:01:34 2002 UTC (16 years, 7 months ago) by jlam
Branch: buildlink2
Changes since 1.70.2.3: +3 -1 lines
Diff to previous 1.70.2.3 (colored) to branchpoint 1.70 (colored) next main 1.71 (colored)

Merge conflicts.

Revision 1.75 / (download) - annotate - [select for diffs], Wed Aug 21 08:40:40 2002 UTC (16 years, 7 months ago) by grant
Branch: MAIN
Changes since 1.74: +3 -1 lines
Diff to previous 1.74 (colored)

set USE_INET6 if we are on an IPv6 capable Solaris host.

Revision 1.70.2.3 / (download) - annotate - [select for diffs], Wed Aug 21 05:19:43 2002 UTC (16 years, 7 months ago) by jlam
Branch: buildlink2
Changes since 1.70.2.2: +1 -9 lines
Diff to previous 1.70.2.2 (colored) to branchpoint 1.70 (colored)

Merge pkgsrc/mk from pkgsrc-current into the buildlink2 branch.

Revision 1.74 / (download) - annotate - [select for diffs], Thu Aug 1 05:36:33 2002 UTC (16 years, 7 months ago) by jlam
Branch: MAIN
CVS Tags: netbsd-1-6-RELEASE-base, netbsd-1-6, buildlink2-base
Changes since 1.73: +1 -5 lines
Diff to previous 1.73 (colored)

We no longer expect PTHREAD_TYPE to be defined after including
bsd.prefs.mk.  It's value is now supposed to be checked after including
pthread.buildlink.mk.

Revision 1.73.2.1 / (download) - annotate - [select for diffs], Mon Jul 22 16:25:52 2002 UTC (16 years, 8 months ago) by agc
Branch: pkgviews
Changes since 1.73: +3 -3 lines
Diff to previous 1.73 (colored) next main 1.74 (colored)

Add basic support for package views.

Revision 1.70.2.2 / (download) - annotate - [select for diffs], Sun Jun 23 18:54:41 2002 UTC (16 years, 9 months ago) by jlam
Branch: buildlink2
Changes since 1.70.2.1: +17 -12 lines
Diff to previous 1.70.2.1 (colored) to branchpoint 1.70 (colored)

Merge from pkgsrc-current to buildlink2 branch.

Revision 1.73 / (download) - annotate - [select for diffs], Fri Jun 21 21:06:48 2002 UTC (16 years, 9 months ago) by jlam
Branch: MAIN
Branch point for: pkgviews
Changes since 1.72: +3 -3 lines
Diff to previous 1.72 (colored)

Move the definition of OBJECT_FMT for NetBSD-1.3.x back _below_ the
inclusion of bsd.own.mk.  This is to allow OBJECT_FMT to be set explicitly
in ${MAKECONF} (/etc/mk.conf) to override the setting in bsd.own.mk on the
older NetBSD systems.

Revision 1.72 / (download) - annotate - [select for diffs], Fri Jun 21 17:49:47 2002 UTC (16 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.71: +12 -12 lines
Diff to previous 1.71 (colored)

Move the definition of OBJECT_FMT for NetBSD-1.3.x systems ahead of the
inclusion of defs.*.mk so that they can conditionalize on OBJECT_FMT.

Revision 1.71 / (download) - annotate - [select for diffs], Thu May 30 22:15:40 2002 UTC (16 years, 9 months ago) by schmonz
Branch: MAIN
Changes since 1.70: +6 -1 lines
Diff to previous 1.70 (colored)

On Darwin, before including <bsd.own.mk>, set OBJECT_FMT to "Mach-O".
(<bsd.own.mk> tries to set it to "ELF" otherwise.) The problem was
unmasked by -r1.983 of bsd.pkg.mk.

Approved by agc.

Revision 1.70.2.1 / (download) - annotate - [select for diffs], Wed May 8 16:09:12 2002 UTC (16 years, 10 months ago) by jlam
Branch: buildlink2
Changes since 1.70: +6 -2 lines
Diff to previous 1.70 (colored)

Use the buildlink2.mk file instead if USE_BUILDLINK2_ONLY is defined.

Revision 1.70 / (download) - annotate - [select for diffs], Mon Mar 18 05:46:42 2002 UTC (17 years ago) by fredb
Branch: MAIN
CVS Tags: netbsd-1-5-PATCH003
Branch point for: buildlink2
Changes since 1.69: +20 -2 lines
Diff to previous 1.69 (colored)

Append "elf" to ${MACHINE_GNU_PLATFORM}, for NetBSD archs that were once
a.out but are now ELF, in a way that's consistent with bsd.own.mk in
NetBSD-current. This, incidently, makes the gcc package build again on
NetBSD-1.5.3_ALPHA/i386.

Revision 1.69 / (download) - annotate - [select for diffs], Wed Dec 26 19:16:59 2001 UTC (17 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.68: +13 -1 lines
Diff to previous 1.68 (colored)

Define a symbol BSD_PREFS_MK that may be checked by Makefile fragments to
see whether they are being included from within bsd.prefs.mk or from
without.

Revision 1.68 / (download) - annotate - [select for diffs], Mon Dec 24 19:29:32 2001 UTC (17 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.67: +5 -1 lines
Diff to previous 1.67 (colored)

Initial implementation of pthread.buildlink.mk to transparently allow for
using either the native pthread implementation or using a package pthread
implementation instead, e.g. pth, ptl2, mit-pthreads, etc.  The only
currently supported package pthread implementation is pth as it's the only
one with a buildlink.mk file.  An example usage is:

	USE_PTHREAD=	native pth
	.include "../../mk/pthread.buildlink.mk"

or a fancier example is:

	USE_PTHREAD=	native
	.include "../../mk/bsd.prefs.mk"
	.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
	CONFIGURE_ARGS+= --without-pthreads
	.endif
	.include "../../mk/pthread.buildlink.mk"

Revision 1.67 / (download) - annotate - [select for diffs], Wed Dec 12 16:30:06 2001 UTC (17 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.66: +1 -16 lines
Diff to previous 1.66 (colored)

Retire USE_CURSES, which was superseded by devel/ncurses/buildlink.mk, and
has now been purged from pkgsrc.

Revision 1.66 / (download) - annotate - [select for diffs], Wed Dec 12 12:31:15 2001 UTC (17 years, 3 months ago) by abs
Branch: MAIN
Changes since 1.65: +4 -1 lines
Diff to previous 1.65 (colored)

Add LOWER_OS_VERSION to match LOWER_OPSYS, LOWER_VENDOR, and LOWER_ARCH

Revision 1.65 / (download) - annotate - [select for diffs], Wed Nov 28 19:58:13 2001 UTC (17 years, 3 months ago) by tv
Branch: MAIN
Changes since 1.64: +6 -1 lines
Diff to previous 1.64 (colored)

In the odd possible case of someone using "pkgsrc" underneath "src"
(even though that's still a bad idea), set USETOOLS=no explicitly before
including <bsd.own.mk>, and add this also to MAKE_ENV to make BSD-Makefile
based packages build properly.

Revision 1.64 / (download) - annotate - [select for diffs], Wed Nov 21 14:10:06 2001 UTC (17 years, 4 months ago) by agc
Branch: MAIN
Changes since 1.63: +1 -77 lines
Diff to previous 1.63 (colored)

Move some operating-system specific definitions to the individual
defs.${OPSYS}.mk files.

Revision 1.63 / (download) - annotate - [select for diffs], Sun Nov 4 19:49:56 2001 UTC (17 years, 4 months ago) by agc
Branch: MAIN
Changes since 1.62: +1 -3 lines
Diff to previous 1.62 (colored)

My thanks to Thorsten - this part of my change for Darwin support was
lost.

However, modify previous change to let Darwin know about SHAREOWN,
SHAREGRP and SHAREMODE in a different way - no point in checking for
OPSYS here, since every OPSYS has to know about them.

Revision 1.62 / (download) - annotate - [select for diffs], Sun Nov 4 13:42:01 2001 UTC (17 years, 4 months ago) by frueauf
Branch: MAIN
Changes since 1.61: +2 -2 lines
Diff to previous 1.61 (colored)

"Darwin" needs to know about SHAREOWN, SHAREGRP and SHAREMODE too.

Revision 1.61 / (download) - annotate - [select for diffs], Tue Oct 30 13:53:15 2001 UTC (17 years, 4 months ago) by agc
Branch: MAIN
Changes since 1.60: +20 -9 lines
Diff to previous 1.60 (colored)

Add initial support for Darwin (1.4) to pkgsrc.

Revision 1.60 / (download) - annotate - [select for diffs], Fri Sep 21 15:28:35 2001 UTC (17 years, 6 months ago) by tron
Branch: MAIN
Changes since 1.59: +7 -7 lines
Diff to previous 1.59 (colored)

Include "bsd.own.mk" before "bsd.pkg.defaults.mk" because otherwise "?="
assignments in "/etc/mk.conf" won't work anymore.

Revision 1.59 / (download) - annotate - [select for diffs], Tue Sep 18 21:30:06 2001 UTC (17 years, 6 months ago) by agc
Branch: MAIN
Changes since 1.58: +10 -1 lines
Diff to previous 1.58 (colored)

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.

Revision 1.58 / (download) - annotate - [select for diffs], Fri Aug 24 09:00:44 2001 UTC (17 years, 7 months ago) by abs
Branch: MAIN
Changes since 1.57: +6 -4 lines
Diff to previous 1.57 (colored)

shuffle some whitespace to make it more obvious what is going on

Revision 1.57 / (download) - annotate - [select for diffs], Tue Aug 14 11:00:44 2001 UTC (17 years, 7 months ago) by skrll
Branch: MAIN
Changes since 1.56: +2 -1 lines
Diff to previous 1.56 (colored)

Add GNU_ARCH.sparc64 entry.

This should fix pkg/13714 by Martti Kuparinen <martti.kuparinen@iki.fi>

Revision 1.56 / (download) - annotate - [select for diffs], Thu Jul 26 16:13:52 2001 UTC (17 years, 8 months ago) by hubertf
Branch: MAIN
Changes since 1.55: +5 -1 lines
Diff to previous 1.55 (colored)

ZOULARISBASE: If there's no $LOCALBASE/bsd, try $LOCALBASE

Revision 1.55 / (download) - annotate - [select for diffs], Thu Jul 26 08:33:02 2001 UTC (17 years, 8 months ago) by hubertf
Branch: MAIN
Changes since 1.54: +2 -2 lines
Diff to previous 1.54 (colored)

Close a quote.

Noted by Will Andrews <will@physics.purdue.edu> in private mail.

Revision 1.54 / (download) - annotate - [select for diffs], Tue Jul 17 10:11:32 2001 UTC (17 years, 8 months ago) by abs
Branch: MAIN
Changes since 1.53: +14 -2 lines
Diff to previous 1.53 (colored)

Switch solaris default LOCALBASE across to /usr/pkg

Revision 1.53 / (download) - annotate - [select for diffs], Tue Jul 10 16:37:13 2001 UTC (17 years, 8 months ago) by tron
Branch: MAIN
Changes since 1.52: +5 -3 lines
Diff to previous 1.52 (colored)

Check if "${X11BASE}/lib/X11/config/X11.tmpl" exists before searching
with "grep" through it in Mesa library handling.

Revision 1.52 / (download) - annotate - [select for diffs], Tue Jul 10 15:07:35 2001 UTC (17 years, 8 months ago) by tron
Branch: MAIN
Changes since 1.51: +4 -1 lines
Diff to previous 1.51 (colored)

Add new variable "SPARC_TARGET_ARCH" used to select the target architecture
under Solaris/SPARC. Default is "sparcv7".

Revision 1.51 / (download) - annotate - [select for diffs], Tue Jul 10 11:13:31 2001 UTC (17 years, 8 months ago) by tron
Branch: MAIN
Changes since 1.50: +4 -2 lines
Diff to previous 1.50 (colored)

Use ":=" in assignment of "ZOULARISBASE" because "LOCALBASE" might get
redefined later.

Revision 1.50 / (download) - annotate - [select for diffs], Mon Jul 9 14:31:58 2001 UTC (17 years, 8 months ago) by fredb
Branch: MAIN
Changes since 1.49: +2 -3 lines
Diff to previous 1.49 (colored)

Provide missing parenthesis for CHECK_XPM.

Revision 1.49 / (download) - annotate - [select for diffs], Fri Jul 6 21:10:20 2001 UTC (17 years, 8 months ago) by tron
Branch: MAIN
Changes since 1.48: +3 -2 lines
Diff to previous 1.48 (colored)

Check if "${X11BASE}/lib/X11/config/X11.tmpl" before searching with
"grep" in it to avoid problems under Solaris.

Revision 1.48 / (download) - annotate - [select for diffs], Thu Jul 5 21:11:07 2001 UTC (17 years, 8 months ago) by abs
Branch: MAIN
Changes since 1.47: +12 -1 lines
Diff to previous 1.47 (colored)

bsd.prefs.mk: Make OBJECT_FMT work on NetBSD 1.3

Revision 1.47 / (download) - annotate - [select for diffs], Tue Jul 3 02:20:38 2001 UTC (17 years, 8 months ago) by mjl
Branch: MAIN
Changes since 1.46: +2 -1 lines
Diff to previous 1.46 (colored)

Add GNU_ARCH.powerpc. This fixes some of the recent problems experienced
on macppc compiling packages.

XXX This should come from bsd.own.mk but doesn't. Why?

Revision 1.46 / (download) - annotate - [select for diffs], Mon Jul 2 08:02:34 2001 UTC (17 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.45: +18 -1 lines
Diff to previous 1.45 (colored)

Make check for Xpm in XFree86 look like the checks for Mesa and freetype2.

Revision 1.45 / (download) - annotate - [select for diffs], Thu Jun 28 13:16:56 2001 UTC (17 years, 9 months ago) by drochner
Branch: MAIN
Changes since 1.44: +2 -1 lines
Diff to previous 1.44 (colored)

add an explicite GNU_ARCH.mipsel assignment to work around poor interaction
with <bsd.own.mk>

Revision 1.44 / (download) - annotate - [select for diffs], Wed Jun 20 19:36:03 2001 UTC (17 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.43: +6 -1 lines
Diff to previous 1.43 (colored)

Move default setting of XAW_TYPE to bsd.prefs.mk.

Revision 1.43 / (download) - annotate - [select for diffs], Sat Jun 16 08:45:41 2001 UTC (17 years, 9 months ago) by veego
Branch: MAIN
Changes since 1.42: +13 -1 lines
Diff to previous 1.42 (colored)

Add a check for the libGLU which comes with XFree86 4.1.0: HAVE_BUILTIN_GLU
To be used in the Mesa package.

Revision 1.42 / (download) - annotate - [select for diffs], Thu Jun 14 16:04:06 2001 UTC (17 years, 9 months ago) by skrll
Branch: MAIN
Changes since 1.41: +27 -4 lines
Diff to previous 1.41 (colored)

Put back stuff deleted in last commit.

Revision 1.41 / (download) - annotate - [select for diffs], Thu Jun 14 13:45:12 2001 UTC (17 years, 9 months ago) by rafal
Branch: MAIN
Changes since 1.40: +5 -27 lines
Diff to previous 1.40 (colored)

Add GNU_ARCH.mipseb (which is just mipseb); now pkgsrc make machinery passes
the right (ARCH, VENDOR, OS) tuple down to GNU_CONFIGURE using programs.
Fixes PR pkg/13196.

Revision 1.40 / (download) - annotate - [select for diffs], Tue Jun 12 18:58:42 2001 UTC (17 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.39: +13 -5 lines
Diff to previous 1.39 (colored)

Fix inclusion of defs.*.mk files so that it works from anywhere in the
pkgsrc tree that contains a Makefile.

Revision 1.39 / (download) - annotate - [select for diffs], Tue Jun 12 12:49:55 2001 UTC (17 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.38: +11 -3 lines
Diff to previous 1.38 (colored)

Migrate some OS-specific variable definitions into OS-specific files.
Include it in bsd.prefs.mk to allow their use much earlier in Makefiles,
and try to use the variable references instead of directly invoking the
programs in bsd.prefs.mk and bsd.pkg.mk where possible.

Revision 1.38 / (download) - annotate - [select for diffs], Fri Jun 8 21:21:05 2001 UTC (17 years, 9 months ago) by tron
Branch: MAIN
Changes since 1.37: +6 -1 lines
Diff to previous 1.37 (colored)

Define "HAVE_OPENWINDOWS" if we are using OpenWindows as X11 distribution
under Solaris.

Revision 1.37 / (download) - annotate - [select for diffs], Thu Jun 7 15:17:08 2001 UTC (17 years, 9 months ago) by tron
Branch: MAIN
Changes since 1.36: +4 -2 lines
Diff to previous 1.36 (colored)

Set "X11BASE" much earlier under Solaris to get "USE_MESA" and "USE_XPM"
working if "X11BASE" is not set by the user.

Revision 1.36 / (download) - annotate - [select for diffs], Thu May 17 15:08:17 2001 UTC (17 years, 10 months ago) by abs
Branch: MAIN
Changes since 1.35: +4 -4 lines
Diff to previous 1.35 (colored)

Default LOCALBASE to /usr/pkg, and override to /usr/local in Solaris case.
No change in NetBSD case, switches to /usr/pkg in Linux case.

Revision 1.35 / (download) - annotate - [select for diffs], Thu May 17 15:00:26 2001 UTC (17 years, 10 months ago) by abs
Branch: MAIN
Changes since 1.34: +2 -1 lines
Diff to previous 1.34 (colored)

In the Linux case, if MACHINE_ARCH is unknown set it to LOWER_ARCH (it does
seem a little backwards).

Revision 1.34 / (download) - annotate - [select for diffs], Wed May 2 04:53:11 2001 UTC (17 years, 10 months ago) by jlam
Branch: MAIN
CVS Tags: netbsd-1-5-PATCH001
Changes since 1.33: +2 -2 lines
Diff to previous 1.33 (colored)

Fix a typo: a = sign should actually be !=.  The CHECK_FREETYPE2 stuff
should actually work now on non-XFree86-4.0.x systems.

Revision 1.33 / (download) - annotate - [select for diffs], Sun Apr 22 04:52:31 2001 UTC (17 years, 11 months ago) by jlam
Branch: MAIN
Changes since 1.32: +18 -1 lines
Diff to previous 1.32 (colored)

Handle freetype2 package like the MesaLib package as it is bundled with
XFree86-4.0.x.  Missed committing this file along with the related changes
to graphics/freetype/Makefile and mk/bsd.pkg.mk.

Revision 1.32 / (download) - annotate - [select for diffs], Sun Apr 8 14:14:11 2001 UTC (17 years, 11 months ago) by hubertf
Branch: MAIN
Changes since 1.31: +7 -5 lines
Diff to previous 1.31 (colored)

Invent ZOULARISBASE, defaulting to $LOCALBASE/bsd, to make it possible
to setup Zoularis (or similar :-) environments to be closer to hier(7).

Revision 1.31 / (download) - annotate - [select for diffs], Sat Mar 24 21:06:52 2001 UTC (18 years ago) by tron
Branch: MAIN
Changes since 1.30: +2 -2 lines
Diff to previous 1.30 (colored)

Fix typo in last commit.

Revision 1.30 / (download) - annotate - [select for diffs], Sat Mar 24 21:05:49 2001 UTC (18 years ago) by tron
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

Only enforce the use of Zoularis under SunOS.

Revision 1.29 / (download) - annotate - [select for diffs], Fri Mar 23 15:49:23 2001 UTC (18 years ago) by tron
Branch: MAIN
Changes since 1.28: +2 -2 lines
Diff to previous 1.28 (colored)

Add missing check for NetBSD in last commit.

Revision 1.28 / (download) - annotate - [select for diffs], Fri Mar 23 15:47:21 2001 UTC (18 years ago) by tron
Branch: MAIN
Changes since 1.27: +10 -1 lines
Diff to previous 1.27 (colored)

Provide Zoularis version number as "${ZOULARIS_VERSION}" on non NetBSD
systems.

Revision 1.27 / (download) - annotate - [select for diffs], Mon Mar 19 14:46:04 2001 UTC (18 years ago) by dmcmahill
Branch: MAIN
Changes since 1.26: +38 -1 lines
Diff to previous 1.26 (colored)

add a list of default serial devices on a per machine_arch basis as discussed
a while back on tech-pkg.  Note that these defaults will not be 100% accurate
as different machines with the same MACHINE_ARCH may have different serial
hardware.  However the default serial device may then be overridden in /etc/mk.conf.
This should at least be better than what we had before ("all the world is i386").

Revision 1.26 / (download) - annotate - [select for diffs], Tue Mar 13 09:53:37 2001 UTC (18 years ago) by agc
Branch: MAIN
Changes since 1.25: +7 -2 lines
Diff to previous 1.25 (colored)

Add an explanatory comment.

Revision 1.25 / (download) - annotate - [select for diffs], Tue Mar 13 09:41:36 2001 UTC (18 years ago) by agc
Branch: MAIN
Changes since 1.24: +5 -7 lines
Diff to previous 1.24 (colored)

Only add DIGEST_VERSION to MAKEFLAGS when we know it's a valid version.

Addresses PR 12397

Revision 1.24 / (download) - annotate - [select for diffs], Sat Mar 10 10:53:15 2001 UTC (18 years ago) by tron
Branch: MAIN
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 (colored)

Fix typo.

Revision 1.23 / (download) - annotate - [select for diffs], Tue Mar 6 16:00:16 2001 UTC (18 years ago) by wiz
Branch: MAIN
Changes since 1.22: +10 -1 lines
Diff to previous 1.22 (colored)

Move PKGTOOLS_VERSION check to bsd.prefs.mk for speedups in recursive tree walks.bsd.pkg.mk bsd.prefs.mk
Bump required version number of PKGTOOLS to 20010306 for the latest bugfixes
and the -V option support.

Revision 1.22 / (download) - annotate - [select for diffs], Tue Mar 6 14:50:46 2001 UTC (18 years ago) by agc
Branch: MAIN
Changes since 1.21: +26 -1 lines
Diff to previous 1.21 (colored)

Add support for message digests other than md5 into pkgsrc. This is done
by using the pkgsrc/pkgtools/digest package, and adding dependencies in
bsd.pkg.mk to make sure that that package is up to date.

There is no discernable performance decrease in using sha1 checksums
over md5 ones, and most people advocate the use of sha1 or rmd160 over
md5.

As part of this change, move the initial setting of LOCALBASE, X11BASE
and CROSSBASE into bsd.prefs.mk from bsd.pkg.mk.

Addresses PR 11809.

Revision 1.21 / (download) - annotate - [select for diffs], Sun Dec 3 14:10:03 2000 UTC (18 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.20: +3 -1 lines
Diff to previous 1.20 (colored)

Add USE_INET6?=NO in the !(USE_INET6?=YES) case.

Revision 1.20 / (download) - annotate - [select for diffs], Tue Nov 21 00:16:44 2000 UTC (18 years, 4 months ago) by hubertf
Branch: MAIN
Changes since 1.19: +4 -4 lines
Diff to previous 1.19 (colored)

Fix NEED_NCURSES handling:

Let's take timidity, which needs ncurses and tk. By setting
NEED_NCURSES=1 and adding it to MAKEFLAGS, all other required pkgs
automagically depend on ncurses - tk, tcl (which is slurped in by
tk), ...

Revision 1.19 / (download) - annotate - [select for diffs], Thu Nov 2 03:01:40 2000 UTC (18 years, 4 months ago) by wiz
Branch: MAIN
Changes since 1.18: +16 -1 lines
Diff to previous 1.18 (colored)

Move USE_NCURSES stuff from bsd.pkg.mk to bsd.prefs.mk.
Do executable bit testing in bsd.pkg.mk, REPLACE_NCURSES, slightly
different.

Revision 1.18 / (download) - annotate - [select for diffs], Sun Oct 15 11:31:42 2000 UTC (18 years, 5 months ago) by rh
Branch: MAIN
Changes since 1.17: +18 -1 lines
Diff to previous 1.17 (colored)

Add USE_MESA and USE_GLX mechanism similar to USE_XPM that detects and
handles a builtin XFree86-4.x Mesa.

Revision 1.17 / (download) - annotate - [select for diffs], Sat Jun 3 22:33:22 2000 UTC (18 years, 9 months ago) by mycroft
Branch: MAIN
CVS Tags: netbsd-1-5-RELEASE, netbsd-1-4-PATCH003
Changes since 1.16: +6 -6 lines
Diff to previous 1.16 (colored)

Explicitly pass down MAKEFLAGS to all sub-makes, not just the first.

Revision 1.16 / (download) - annotate - [select for diffs], Sat Jun 3 07:16:51 2000 UTC (18 years, 9 months ago) by hubertf
Branch: MAIN
Changes since 1.15: +17 -10 lines
Diff to previous 1.15 (colored)

Pass variables set via != to MAKEFLAGS, so the forking needed for that
process doesn't slow us down more than necessary.

Revision 1.15 / (download) - annotate - [select for diffs], Sun Feb 13 10:33:22 2000 UTC (19 years, 1 month ago) by tron
Branch: MAIN
CVS Tags: netbsd-1-4-PATCH002
Changes since 1.14: +3 -2 lines
Diff to previous 1.14 (colored)

Don't enable IPv6 support if socks support is activated.

Revision 1.14 / (download) - annotate - [select for diffs], Mon Jan 24 07:04:28 2000 UTC (19 years, 2 months ago) by itojun
Branch: MAIN
Changes since 1.13: +6 -1 lines
Diff to previous 1.13 (colored)

make USE_INET6=YES a default, if the package is compiled on IPv6-ready
userland (checked by existence of /sbin/ping6).

with the change, the default value for USE_INET6 will be like this:
- non-NetBSD: undefined
- NetBSD releases prior and including 1.4.x: undefined
- NetBSD-current (pre-1.5) prior to IPv6 integration: undefined
- NetBSD-current after IPv6 integration: USE_INET6=YES

It is advised to obey the default.

Revision 1.13 / (download) - annotate - [select for diffs], Sat Sep 18 15:33:55 1999 UTC (19 years, 6 months ago) by kim
Branch: MAIN
CVS Tags: comdex-fall-1999
Changes since 1.12: +5 -2 lines
Diff to previous 1.12 (colored)

Fix unknown MACHINE_ARCH on Solaris.

Revision 1.12 / (download) - annotate - [select for diffs], Thu Aug 12 14:16:25 1999 UTC (19 years, 7 months ago) by christos
Branch: MAIN
Changes since 1.11: +13 -1 lines
Diff to previous 1.11 (colored)

Linux fixes.

Revision 1.11 / (download) - annotate - [select for diffs], Thu Jul 8 08:06:59 1999 UTC (19 years, 8 months ago) by agc
Branch: MAIN
CVS Tags: netbsd-1-4-PATCH001
Changes since 1.10: +2 -2 lines
Diff to previous 1.10 (colored)

Revert to previous configuration:
LOWER_OPSYS for Solaris is solaris.
Remove the ugly hacks which had been introduced to workaround previous
misunderstanding.

Revision 1.10 / (download) - annotate - [select for diffs], Thu Jul 8 07:58:42 1999 UTC (19 years, 8 months ago) by agc
Branch: MAIN
Changes since 1.9: +8 -8 lines
Diff to previous 1.9 (colored)

CAPITAL_OPSYS and OS_MAJOR_VERSION are used in one package Makefile,
but calculated every time bsd.prefs.mk is read.  Correct the
situation, and only calculate these when they are needed.
Also save a few more cycles by hardcoding the LOWER_OPSYS values for
known operating systems, rather than using expensive shell echo and tr
commands every time bsd.prefs.mk is read.

Revision 1.9 / (download) - annotate - [select for diffs], Wed Jun 23 17:06:21 1999 UTC (19 years, 9 months ago) by christos
Branch: MAIN
Changes since 1.8: +19 -9 lines
Diff to previous 1.8 (colored)

Linux bits; now the package system works on Linux too.

Revision 1.8 / (download) - annotate - [select for diffs], Wed May 26 14:47:07 1999 UTC (19 years, 10 months ago) by tv
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)

`I'm a bonehead.'  Reverse the order of components in ${MACHINE_GNU_PLATFORM}.

Revision 1.7 / (download) - annotate - [select for diffs], Mon May 24 18:42:01 1999 UTC (19 years, 10 months ago) by tv
Branch: MAIN
Changes since 1.6: +46 -20 lines
Diff to previous 1.6 (colored)

Implement some parts of proposals posted to tech-pkg:

- Define OS_VERSION in bsd.prefs.mk (...if not already defined).  Previously
  was only set in a conditional block in bsd.pkg.mk.

- Define new values, MACHINE_PLATFORM and MACHINE_GNU_PLATFORM, which
  default to ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} and
  ${LOWER_OPSYS}-${LOWER_VENDOR}-${LOWER_ARCH} respectively.
  (Probably should nuke LOWER_ARCH and rename LOWER_VENDOR to something
  like MACHINE_GNU_VENDOR.)

- Use ${MACHINE_GNU_PLATFORM} as the argument to `--host' in GNU_CONFIGURE
  packages.

- Allow for ONLY_FOR_PLATFORM and NOT_FOR_PLATFORM, lists of patterns
  in csh(1) glob style which are matched against MACHINE_PLATFORM above
  and take the place of {ONLY,NOT}_FOR_{ARCHS,OPSYS}.  (For now, until
  all pkgs are converted, provide backwards compatibility.)  *Both* may
  be defined, in which case NOT_FOR_PLATFORM takes precedence.

- Also do some significant aesthetic cleanup, based on the idea
  `define platform-specific overrides first, then define a generic case
  with the ?= operator'.  Lots more of this to do yet.

Revision 1.6 / (download) - annotate - [select for diffs], Mon May 24 11:17:05 1999 UTC (19 years, 10 months ago) by tv
Branch: MAIN
Changes since 1.5: +3 -1 lines
Diff to previous 1.5 (colored)

Explicitly include <sys.mk> after mk.conf.  This ensures that standard
flags (e.g. CFLAGS=-O/-O2) are defined as necessary before a pkg modifies
them with "+=".

Revision 1.5 / (download) - annotate - [select for diffs], Sun May 23 22:10:01 1999 UTC (19 years, 10 months ago) by tv
Branch: MAIN
Changes since 1.4: +21 -7 lines
Diff to previous 1.4 (colored)

- Move the inclusion of bsd.own.mk to bsd.prefs.mk, and multiple-include
  protect bsd.prefs.mk.  Now there's no multiple inclusion of mk.conf,
  clobbering variables modified between bsd.prefs.mk and bsd.pkg.mk, when
  set with VARNAME=value.
- Let bsd.own.mk include mk.conf/MAKECONF; we don't need to do that
  manually.
- Don't define BSD_PKG_MK or OPSYS in bsd.pkg.mk, as bsd.prefs.mk does
  precisely that just a couple lines below.

Revision 1.4 / (download) - annotate - [select for diffs], Thu Nov 26 23:39:15 1998 UTC (20 years, 4 months ago) by hubertf
Branch: MAIN
CVS Tags: netbsd-1-4-RELEASE
Changes since 1.3: +5 -1 lines
Diff to previous 1.3 (colored)

Add BSD_PKG_MK=1 to bsd.prefs.mk, and clarify it's usage (comment) a bit,
pointed out by Alistair Crooks and Johnny Lam.

Revision 1.3 / (download) - annotate - [select for diffs], Wed Aug 19 16:23:40 1998 UTC (20 years, 7 months ago) by tv
Branch: MAIN
CVS Tags: netbsd-1-3-PATCH003
Changes since 1.2: +5 -2 lines
Diff to previous 1.2 (colored)

Don't barf if the environment sets PREFIX (just ignore it).  Needed for
recursive makes.

Revision 1.2 / (download) - annotate - [select for diffs], Tue Aug 11 19:30:48 1998 UTC (20 years, 7 months ago) by tv
Branch: MAIN
Changes since 1.1: +7 -1 lines
Diff to previous 1.1 (colored)

- Introduce CROSSBASE and a USE_CROSSBASE option, for use with pkgs from
  the "cross" subdirectory.  Defaults to ${LOCALBASE}/cross.
- PREFIX is not user settable.  Do not conditionally set it such that
  environment variables and mk.conf can override it.  Issue an error if
  PREFIX is attempted to be set from mk.conf, environment, or command line.

Revision 1.1 / (download) - annotate - [select for diffs], Wed Jun 3 11:15:29 1998 UTC (20 years, 9 months ago) by agc
Branch: MAIN

Consolidate all the logic for inclusion of MAKECONF, and /etc/mk.conf,
into one file, located in the pkgsrc tree.  Thus one file simply needs
to be included before any .if* statements in the package Makefile,
rather than a large number of ad-hoc methods of doing this.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>