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.
Stop lying and drop maintainership of these packages. I have not
maintained them for a very long time already, so leave room for
fresh blood to take over them.
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).
file's sole purpose was to provide a dependency on pkg-config and set
some environment variables. Instead, turn pkg-config into a "tool"
in the tools framework, where the pkg-config wrapper automatically
adds PKG_CONFIG_LIBDIR to the environment before invoking the real
pkg-config.
For all package Makefiles that included pkg-config/buildlink3.mk, remove
that inclusion and replace it with USE_TOOLS+=pkg-config.
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
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".
* Look for "id" attribute of anchor element as XHTML 1.0 deprecates
"name" attribute. (bug 137854) [Sven Neumann]
* Use focus-width when restyling box. (bug 125290) [Balamurali Vishwnanthan]
* Fix crasher bug in gnochm when displaying new page. (bug #135489).
Overview of Changes in gtkhtml2 2.6.0
=====================================
None.
Overview of Changes in gtkhtml2 2.5.6
=====================================
* Redraw cursor quickly when cursor is moved. (bug #135484)
=====================================
Overview of Changes in gtkhtml2 2.5.5
=====================================
* Fix porting issues for AIX C complier (bug #134860)
[bugzilla-gnome@thewrittenword.com].
Overview of Changes in gtkhtml2 2.5.4
=====================================
* Fix memory corruption problems. (bug #133518).
Overview of Changes in gtkhtml2 2.5.3
=====================================
* Correct inconsistency between byte offset and character offset when
selecting text. (bug #131425)
* Add support for virtual cursor position when scrolling up and down with
cursor showing. (bug 131216)
* Fix loooping error which occurred when reading accessible content of page
which contained HtmlBoxText without any text. (bug #131453)
* Correct cursor placement at end of paragraphs. (bug #131550)
* Correct creation of accessible objects for objects containing text.
(bug #131553)
* Emit text-caret-moved signal when cursor is moved and accessibility is
enabled. (bug #131465)
* Added FLOWS_FROM and FLOW_TO relations for accessible objects containing
text. (bug #131462)
* Move cursor when focus changes. (bug #131908)
* Correct link index value in link-selected signal (bug #131912)
* Remove file data/gtkhtml2.xcf as it is not used.
Overview of Changes in gtkhtml2 2.5.2
=====================================
* Emit selection-changed events when accessibility is enabled and
text is selected. (bug #125309)
* Fix crasher bug when float:center is specified in the html. (bug #129486)
* Fix crasher bug when multiple HTML documents are used in a HtmlView.
(bug #130789)
* Implement F7 to toggle showing cursor. Implement moving cursor by character,
word, line and page and to top or end using the keyboard.. Also implement
selection of text.
Overview of Changes in gtkhtml2 2.5.1
=====================================
* Fix crasher bug when document is deleted. (bug #127946)
Overview of Changes in gtkhtml2 2.5.0
=====================================
* Emit notification when new HTML page is displayed. (bugg #124199)
* Use correct language so that glyphs are displayed correctly for Chinese.
[Phill Zhang] (bug #124650)
* Make focus line visible, particularly when large font is uded. (bug #125290)
* Show text in correct font after font size is decreased. (bug #125301)
* Fix crasher problem when gok is used with yelp. (bug #126294)
* Correct implementation of moving focus out of HtmlView (bug #90281)
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.
