This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
INSTALLATION_DIRS, as well as all occurrences of ${PREFIX}/man with
${PREFIX}/${PKGMANDIR}.
Fixes PR 35265, although I did not use the patch provided therein.
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.
For example, "make show-buildlink3" in fonts/Xft2 displays:
zlib
fontconfig
iconv
zlib
freetype2
expat
freetype2
Xrender
renderproto
RECOMMENDED is removed. It becomes ABI_DEPENDS.
BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
BUILDLINK_DEPENDS does not change.
IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".
Added to obsolete.mk checking for IGNORE_RECOMMENDED.
I did not manually go through and fix any aesthetic tab/spacing issues.
I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.
I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.
As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.
As discussed on tech-pkg.
I will commit to revbump, pkglint, pkg_install, createbuildlink separately.
Note that if you use wip, it will fail! I will commit to pkgsrc-wip
later (within day).
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.
in the process. (More information on tech-pkg.)
Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.
Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:
lib/libfoo.a
lib/libfoo.la
lib/libfoo.so
lib/libfoo.so.0
lib/libfoo.so.0.1
one simply needs:
lib/libfoo.la
and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.
Also make LIBTOOLIZE_PLIST default to "yes".
- Bl3ify.
- Enable pkgviews installation.
OK'ed by jwise@, the maintainer.
Changes since 8.2:
* got "make buildhelp" working
* tcl/generic/tclXgeneral.c (TclX_EchoObjCmd): use encoding aware
functions in 8.1+. [Bug #514053]
* win/Makefile.in:
* win/configure.in:
* win/configure: Changed to use TCL_LIBS and TK_LIBS as the source
for the list of Windows libraries to link against. Fixes#501990.
* tcl/generic/tclXlib.c (MakeAbsFile): Replaced a call to the
internal 'TclpGetCwd' with an access to the public API
'Tcl_GetCwd'. [457266]. Reported by Vincent Darley.
* doc/TclX.n:
* tcl/generic/tclXoscmds.c: allowed sleep to accept double values,
to match the Expect sleep command. This prevents conflicts that
depended on the order of package requires. [Patch #444332]
* unix/tools/tclmanpages: Added "re_syntax.n" to the list of
processed manpages [#405956].
* All of the changes below are there to fix bug [418295].
* tcl/generic/tclXoscmds.c (TclX_OsCmdsInit): "system" and
"sleep" now use the new command creation procedure.
* tcl/generic/tclXprocess.c (TclX_ProcessInit): "fork" and
"wait" now use the new command creation procedure.
* tcl/generic/tclXutil.c (TclX_CreateObjCommand): Added
the implementation of this new procedure.
* tcl/generic/tclExtdInt.h: Added TclX_CreateObjCommand to
encapsulate the logic for the creation of commands FOO and
tclx_FOO.
* tcl/generic/tclXlist.c (TclX_LassignObjCmd): Added
TCL_LEAVE_ERR_MSG to call of 'Tcl_SetVar2Ex'. This
fixes the bug [227478].
* tcl/generic/tclXgeneral.c (TclX_LoopObjCmd): Changed
'Tcl_AppendStringsToObj' into 'Tcl_AddErrorInfo'.
Fixes bug [226388]. Associated patch is [403050]. No need to
extend the testsuite, it already contained a test exercising the
bug.
* tcl/unix/Makefile.in:
* tk/unix/Makefile.in:
Fixed bogus "test -f" on the new HELP_DIR directory, which should
be "test -d".
* win/Makefile.in - fixed because of new definition of
TCL_SRC_DIR and TK_SRC_DIR
* Changed the HELP_DIR to be configurable so I could have parallel
builds not all trying to create the same help files.
* tcl/win/configure.in, common.bc, common.vc
Fixed version number to 8.3
* {tcl,tk}/unix/Makefile.in, tweaks to get references to LIB_RUNTIME_DIR
properly expanded on irix builds. Also added BUILDHELP macro
that is conditional on nroff being present so we don't try to
build help files on systems with out nroff.
* tcl/win/tclXAppInit.c, tk/generic/tkXshell.c, tk/win/tkXAppInit.c
- turn off USE_TCL_STUBS
* win/Makefile.in, win/configure.in: Cleanup use of stubs library.
* tcl/win/tclXwinOS.c (TclXOSkill): Added support for "kill"
command on Windows platforms.
references of the pkglint package.
_PKGSRCDIR is an internal definition in bsd.pkg.mk, and a few packages
which would like to refer to other packages in the build tree. It should
not be set by users, but neither should it stop a user from building a
package if it is defined, so make it obvious that this is the case.
foo-* to foo-[0-9]*. This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net. Also
change dependency examples in Packages.txt to reflect this.
hopefully in a cleaner way.
Do the same for the tk sources for tk-tclX
Both should now build.
{tcl,tk}-tclX/Makefile have an awful lot in common so someone might like to
split a lot of it out.
