CVS log for pkgsrc/textproc/libxml2/buildlink3.mk

Up to [NetBSD + pkgsrc-wip] / pkgsrc / textproc / libxml2

Request diff between arbitrary revisions - Display revisions graphically

Keyword substitution: kv
Default branch: MAIN

Simply and speed up buildlink3.mk files and processing.
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.

Add glob to USE_FEATURES only once.

Convert to use the features framework.

Convert all libnbcompat/buildlink3.mk references to inplace.mk.

Replace mk/bsd.prefs.mk includes with bsd.fast.prefs.mk includes.
The redundant parsing of bsd.prefs.mk is mostly avoided now and
parse time e.g. for x11/kdebase3 gets reduced by up to 10%.

added support for IRIX 5

Change the format of BUILDLINK_ORDER to contain depth information as well,
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

Track information in a new variable BUILDLINK_ORDER that informs us
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.

Aligned the last line of the buildlink3.mk files with the first line, so
that they look nicer.

Over 1200 files touched but no revisions bumped :)

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

Recursive revision bump / recommended bump for gettext ABI change.

Also buildlink the xml2-config tool. Okay'd by recht.

Noticed under Mac OS X which had a native xml2-config that wrong includes
were being used causing build failure of scrollkeeper.

Pullup ticket 159 - requested by Havard Eidnes
security fix for libxml2

        Module Name:    pkgsrc
        Committed By:   xtraeme
        Date:           Thu Oct 21 05:28:17 UTC 2004

        Modified Files:
                pkgsrc/doc: CHANGES TODO
                pkgsrc/textproc/libxml2: Makefile distinfo

        Log Message:
        Update textproc/libxml2 to 2.6.14, this is a bugfix release.
---
        Module Name:    pkgsrc
        Committed By:   recht
        Date:           Sun Oct 31 10:40:51 UTC 2004

        Modified Files:
                pkgsrc/textproc/libxml2: Makefile buildlink3.mk distinfo
                pkgsrc/textproc/libxml2/patches: patch-aa patch-ab

        Log Message:
        update to libxml2-2.6.15

        changes:

        * security fixes on the nanoftp and nanohttp modules
        For details see:
        http://www.securityfocus.com/archive/1/379383/2004-10-24/2004-10-30/0

        * build fixes:
          - xmllint detection bug in configure
          - building outside the source tree (Thomas Fitzsimmons)
        * bug fixes:
          - HTML parser on broken ASCII chars in names (William)
          - Python paths (Malcolm Tredinnick)
          - xmlHasNsProp and default namespace (William)
          - saving to python file objects (Malcolm Tredinnick)
          - DTD lookup fix (Malcolm)
          - save back <group> in catalogs (William)
          - tree build fixes (DV and Rob Richards)
          - Schemas memory bug
          - structured error handler on Python 64bits
          - thread local memory deallocation
          - memory leak reported by Volker Roth
          - xmlValidateDtd in the presence of an internal subset
          - entities and _private problem (William)
          - xmlBuildRelativeURI error (William).
        * improvements:
          - better XInclude error reports (William)
          - tree debugging module and tests
          - convenience functions at the Reader API (Graham Bennett)
          - add support for PI in the HTML parser.

        Update BUILDLINK_RECOMMENDED to 2.6.15 for the security fix.
---
        Module Name:    pkgsrc
        Committed By:   minskim
        Date:           Wed Nov  3 16:41:56 UTC 2004

        Modified Files:
                pkgsrc/textproc/py-libxml2: Makefile distinfo

        Log Message:
        Sync with libxml2-2.6.15.

        Changes since 2.6.12:
           - saving to python file objects (Malcolm Tredinnick)
           - structured error handler on Python 64bits
           - Python space/tabs cleanups
           - Python libxml2 driver improvement
---
        Module Name:    pkgsrc
        Committed By:   recht
        Date:           Thu Nov 11 21:01:15 UTC 2004

        Modified Files:
                pkgsrc/textproc/libxml2: Makefile distinfo
                pkgsrc/textproc/libxml2/patches: patch-aa patch-ab

        Log Message:
        update to 2.6.16

        2.6.16: Nov 10 2004:
           - general hardening and bug fixing crossing all the API based on
             new automated regression testing
           - build fix: IPv6 build and test on AIX (Dodji Seketeli)
           - bug fixes: problem with XML::Libxml reported by Petr Pajas,
             encoding conversion functions return values, UTF-8 bug affecting
             XPath reported by Markus Bertheau, catalog problem with NULL
             entries (William Brack)
           - documentation: fix to xmllint man page, some API function
             descritpion were updated.
           - improvements: DTD validation APIs provided at the Python level
             (Brent Hendricks)
---
        Module Name:    pkgsrc
        Committed By:   minskim
        Date:           Thu Nov 25 18:37:43 UTC 2004

        Modified Files:
                pkgsrc/textproc/py-libxml2: Makefile distinfo
                pkgsrc/textproc/py-libxml2/patches: patch-aa

        Log Message:
        Update py-libxml2 to 2.6.16.

        Changes:
          - improvements: DTD validation APIs provided at the Python level.

update to libxml2-2.6.15

changes:

* security fixes on the nanoftp and nanohttp modules
For details see:
http://www.securityfocus.com/archive/1/379383/2004-10-24/2004-10-30/0

* build fixes:
  - xmllint detection bug in configure
  - building outside the source tree (Thomas Fitzsimmons)
* bug fixes:
  - HTML parser on broken ASCII chars in names (William)
  - Python paths (Malcolm Tredinnick)
  - xmlHasNsProp and default namespace (William)
  - saving to python file objects (Malcolm Tredinnick)
  - DTD lookup fix (Malcolm)
  - save back <group> in catalogs (William)
  - tree build fixes (DV and Rob Richards)
  - Schemas memory bug
  - structured error handler on Python 64bits
  - thread local memory deallocation
  - memory leak reported by Volker Roth
  - xmlValidateDtd in the presence of an internal subset
  - entities and _private problem (William)
  - xmlBuildRelativeURI error (William).
* improvements:
  - better XInclude error reports (William)
  - tree debugging module and tests
  - convenience functions at the Reader API (Graham Bennett)
  - add support for PI in the HTML parser.

Update BUILDLINK_RECOMMENDED to 2.6.15 for the security fix.

Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.

Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.

BUILDLINK_DEPENDS.<pkg> lines should _always_ use += to _append_ to the
existing value.  This is critical to set the correct list of dependencies
for a package.

bl3ify