| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
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.
|
|
|
|
|
|
with this change in-place suggests that sometimes the prefix IS added
in catalogs.mk (and presumably not in the client package, for some reason).
|
|
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.
|
|
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.
|
|
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.
|
|
automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.
|
|
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
|
|
|
|
consolidate the files for that framework in one directory.
|
|
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).
|
|
by other package Makefiles, and with the deprecation of USE_BUILDLINK3
support in the infrastructure files, these had the potential to break
existing packages.
|
|
|
|
using this have been converted to bl3.
|
|
share/(xml|sgml) nor these directories themselves.
|
|
|
|
we're not already using buildlink3.
|
|
buildlink3.mk file if USE_BUILDLINK3 is "yes".
|
|
variables from the catalogs.mk file to buildlink2.mk. These may be needed in
a package that does *not* provide catalog files (i.e., all the functionality
in catalogs.mk is not required).
|
|
* Added XML Catalogs management. You must use the new `-s' flag to handle
SGML Catalogs as XML format becomes the default.
* Dropped use of getopt in favour of getopts, as the former does not handle whitespace in variables properly.
* Handle comments in SGML catalogs properly.
* Several manpage improvements.
Changes in the package:
* Implement a new framework to automatically register/deregister catalog
entries. This is available through the catalogs.mk file. Packages do
not need to call xmlcatmgr directly any more, nor do tricky things in
their PLISTs.
* Install two catalog files under PKG_SYSCONFDIR, one called sgml/catalog
and the other xml/catalog. Both are completely different things, so they
can't be mixed. Also avoid that any of these catalogs refer to the other
one, as this could cause problems.
|
