When necessary, the flex version is obtained from the version string reported
by running flex. Generally, the first word of the version string is flex and
and the second is a version number. At least for MacOS, there is a third
vendor-specific word. The sed command previously used to capture the flex
version captured the last word, not the second one, because the first capture
group was too greedy and could capture more than a single word. Instead,
force the capture groups to capture only words, i.e., no blanks, and use the
second word for the version.
This allows setting flags for PaX on select binaries. Two new variables
are introduced for packages: NOT_PAX_ASLR_SAFE and NOT_PAX_MPROTECT_SAFE.
They both expect a list of binaries are known to not support PaX ASLR
and/or PaX MPROTECT, respectively.
"Please commit" wiz@
with what packages such as multimedia/ffmpeg2 expect, and as so few
packages have texi2html in USE_TOOLS it may be causing more problems
that it is worth to save a few dependencies. PR#51113.
The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.
Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.
Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.
problems that are fixed by using the pkgsrc version, and no platform
other than Cygwin tries to use a native version.
Consensus is that due to the limited impact and clear benefit this is
ok to go in during the freeze despite being an infrastructure change.
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@
* Test for /usr/sbin/chgrp (it's a link, but hey);
* Test for /usr/sbin/openssl as an alternative location. There is no entry
in /usr/bin (at least in OpenBSD 5.6);
* /usr/bin/tbl doesn't exist in OpenBSD 5.6, so test for it before setting;
Fixes unwanted execution of {aclocal,automake}-${latest_version} for the
case configure.ac (or something) is patched, but configure is also alredy
regenerated and aclocal and automake are not required (not in USE_TOOLS).
XXX: if {aclocal,automake}-${latest_version} is really required by somewhere,
XXX: it should be created below, same as plain aclocal and automake.
* if p5-* in {,BUILD_,TOOL_}DEPENDS, use perl5 from pkgsrc.
* check whether builtin perl satisfies PERL5_REQD, or use perl5 from pkgsrc.
* if buitin perl satisfies all {perl>=n.m,p5-foo>=x.y} style dependencies,
get rid of such dependencies and use builtin perl.
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.
The nroff tool is primarily used to generate catman pages, however there
were circular dependency issues with using groff as the provider, as it
has a large number of dependencies, some of which depend on nroff.
mdocml is much smaller, has fewer dependencies, is BSD licensed, and is
just as capable in nroff mode.
satisfy the BISON_REQD check, it does not function correctly in the tools
environment when not called as /usr/bin/bison, as it is unable to find its
m4sugar.m4 without BISON_PKGDATADIR being set.
Whilst we could work around that in bison.mk I feel that's something of a
hack, and it is simpler and cleaner to just use the pkgsrc tool instead.
from 2006 and the OSX bison has been upgraded long since then. In any
case, if the bison is too old, the BISON_REQD check will ensure that a
working version is pulled in if necessary.
Whilst it works for the most part, the mk/extract/extract script expects
an -O flag which it does not support, and adding conditionals to that
script would be messy.
Fixes 5 direct packages.
This is a provisional kludge to work around PR pkg/47838. Sorry for
taking far too long to find a workaround that doesn't break various
other stuff too -- this duration of time was ridiculous, and it was
entirely my fault.
We can get rid of this kludge when we start using `env -i' in the
build phase or when we replace TARGET_ARCH by TARGET_MACHINE_PLATFORM
(and replace the make-internal variable MACHINE_ARCH by
MACHINE_PLATFORM -- that is part of what makes the logic in
pkgformat/pkg/depends.mk and bsd.prefs.mk so fragile). However,
although I intend to do both of these things, they were deemed too
likely to cause too much fallout just before the freeze, so they'll
wait until after the freeze.
Build depends are target packages that are needed at build-time for,
e.g., static libraries to link against, header files to include, &c.
Tool depends are native packages that are needed at build-time for,
e.g., compilers/linkers/&c. to run.
ok agc
The NATIVE_xyz versions are for packages that build tools that they
run natively but don't end up in the final product.
This is a provisional scheme -- it should be replaced eventually by
something more principled.
ok agc
is also start with "\n", but msgctxt is inserted before it, to avoid msgfmt(1)'s
format mismatch check (`msgid' and `msgstr' entries do not both begin with '\n')
ghostscript-agpl.
Reverts revisions 1.255 and 1.254
----------------------------
revision 1.255
date: 2013/03/16 23:03:33; author: dholland; state: Exp; lines: +3 -3
print/ghostscript -> print/ghostscript-agpl
----------------------------
revision 1.254
date: 2013/03/16 21:47:14; author: dholland; state: Exp; lines: +13 -3
Choose ghostscript package for ghostscript tools based on whether
gnu-agpl-* is in ACCEPTABLE_LICENSES.
This is mostly the same as the old ghostscript type logic that was
removed in version 1.223.
