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.
SGML_ENTRIES entry - it doesn't work. Probably because expansion
in this context requires the variable to already be defined, which it
isn't.
This is lucky, because every package using catalogs.mk adds ${PREFIX}
itself to each entry. So usually it gets added just the once.
The luck stops if you do something like: make PREFIX=/usr/pkgroot2
This makes the automatic ${PREFIX} insertion suddenly work AS WELL as
the client packages adding ${PREFIX} themselves. We end up with
/usr/pkgroot2/share/xml/catalog containing lines like:
<nextCatalog catalog="/usr/pkgroot2/usr/pkgroot2/share/xml/docbook/4.3/catalog" />
... after installing textproc/docbook-xml. This in turn causes
textproc/scrollkeeper to obscurely fail to build at configure time.
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
the pkglint warning:
As {INSTALL,DEINSTALL}_TEMPLATE is modified using "+=", its name
should indicate plural.
This does make the variables a bit more suggestive of the fact that they
hold lists of values.
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).
INSTALL/DEINSTALL script creation within pkgsrc.
If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts. If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:
INSTALL_SRC= ${PKGDIR}/INSTALL
DEINSTALL_SRC= # emtpy
As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts. By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).
In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework. The only public variables relating to the templates are:
INSTALL_SRC INSTALL_TEMPLATE
DEINSTALL_SRC DEINSTALL_TEMPLATE
HEADER_TEMPLATE
The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
that these directories will be conditionally removed (based on reference
counts), regardless of the value of PKG_CONFIG. Bump the PKGREVISION
for packages that were modified as a result.
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files. Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
BUILDLINK_PREFIX.xmlcatmgr because the latter is not defined if NO_BUILD
is set.
Fixes problems seen by abs@ (docbook-xml's catalog not appearing in the
system-wide catalog).
BUILDLINK_PREFIX.xmlcatmgr), and set the XMLCATMGR variable accordingly.
This is to let packages setting NO_BUILD to still be able to use this
variable (such as docbook-xml).
Fixes PR pkg/29789 by chris@.
by other package Makefiles, and with the deprecation of USE_BUILDLINK3
support in the infrastructure files, these had the potential to break
existing packages.
which was the BUILDLINK_RECOMMENDED.xmlcatmgr. (Okay'ed by jmmv.)
I had noticed that old xmlcatmgr on my system (using IGNORE_RECOMMENDED)
was not good enough
The xmlcatmgr changes for 2.0alpha2 said that command line usage changed
in some scenarios.
Also remove BUILDLINK_RECOMMENDED.xmlcatmgr because now it was the
same (and is redundant for now).
I am not bumping in PKGREVISIONs because of this. This happened
last January and is too late now and maybe I am the only person to
notice.
Third stable version of the 2.x branch, released on 2004/09/01.
* Converted to use the GNU Build System (GNU Automake and GNU Autoconf).
* Because of the previous change, the build has been hopefully fixed in
several platforms, specially under Irix 6.5 using the MIPSpro C compiler.
Second stable version of the 2.x branch, released on 2004/05/02.
* Fixed an attribute name when parsing the `uri' tag in XML catalogs; it
expects `name', not `uriId'.
* Fixed a warning message when removing entries from an XML catalog.
* Fixed several warnings when building mem.c code in a system with glibc
2.[23].x and -O2 enabled.
* Added the `-p' flag which changes the behavior of the `add' action so
that new entries are prepended instead of appended.
* Improved consistency of the lookup action so that it behaves equally
for SGML and XML catalogs (this includes making XML lookup show all
matching entries).
* Documentation is now installed in an unversioned directory by default.
First stable version of the 2.x branch, released on 2004/03/26.
* Fixed build under HP-UX and Tru64 Unix.
* Fixed a crash that occurred during parsing of some malformed XML
catalogs.
Released on 2004/01/23, its state was beta.
* Recognize two default catalog files, one for XML and one for SGML,
instead of only one as in previous versions.
* Added the `-h' option to xmlcatmgr, which shows a descriptive usage
message.
* Added multiple comments to the code, explaining what each function does.
* Some bug fixes.
The version in the buildlink2.mk file is bumped because there were some
incompatible changes done in the previous version that may cause problems
to people upgrading an already installed package. This should have really
happened in the previous version... but well, as this is now beta, there
shouldn't be any interface changes any more.
Released on 2004/01/17, its state was alpha.
* Fixes to allow multiple entries with the same content in both SGML and
XML catalog files. Sorry but this may break command line compatibility
with old versions in some scenarios; that is, the "remove" action now
takes pairs of values. Even though, if just one argument is given to
"remove", it behaves as before to help the transition to newer versions.
* New catalogs are created now in memory before writting them to disk.
This ensures that they will look exactly the same after creation and
after some manipulation (addition and removal of entries).
* Added an option to configure, '-n doc', to disable installation of
distribution documentation files in the system.
* Some bug fixes.
"Package Makefiles should refer to PKG_SYSCONFBASEDIR instead of
PKG_SYSCONFBASE when they want PKG_SYSCONFDIR stripped of
PKG_SYSCONFSUBDIR. This makes PKG_SYSCONFBASE=/etc work with pkgviews by
installing all config files into /etc/packages/<pkg> instead of
occasionally putting some directly into /etc."
