to address issues with NetBSD-6(and earlier)'s fontconfig not being
new enough for pango.
While doing that, also bump freetype2 dependency to current pkgsrc
version.
Suggested by tron in PR 47882
libXext/buildlink3.mk, now that it is included there.
Leave the places where its API version is set or variables from it
are used directly (about 3 packages).
alternative from mk/jpeg.buildlink3.mk
This allows selection of an alternative jpeg library (namely the x86 MMX,
SSE, SSE2 accelerated libjpeg-turbo) via JPEG_DEFAULT=libjpeg-turbo, and
follows the current standard model for alternatives (fam, motif, fuse etc).
The mechanical edits were applied via the following script:
#!/bin/sh
for d in */*; do
[ -d "$d" ] || continue
for i in "$d/"Makefile* "$d/"*.mk; do
case "$i" in *.orig|*"*"*) continue;; esac
out="$d/x"
sed -e 's;graphics/jpeg/buildlink3\.mk;mk/jpeg.buildlink3.mk;g' \
-e 's;BUILDLINK_PREFIX\.jpeg;JPEGBASE;g' \
< "$i" > "$out"
if cmp -s "$i" "$out"; then
rm -f "$out"
else
echo "Edited $i"
mv -f "$i" "$i.orig" && mv "$out" "$i"
fi
done
done
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.
* Backported FXTopWindow resize() and position() fixes from FOX 1.7.
* Fixed GCC 4.3 warning in FXArray header file.
* Made internal data arrays static to prevent global name clashes on some compilers.
* Fixed uninitialized variable in FXFileDict.
March 10 - FOX STABLE 1.6.32
* Fixed FXPath::simplify(). Backport from FOX 1.7.
* Fixed Adie CPU load issue caused by clock updating.
* Fixed FXURL::fileFromURL().
November 16 - FOX STABLE 1.6.31
* Bug fix to strtoull() for systems which have no native strtoull().
* Missing tr() added in FXMDIClient.
* Fix for FXRuby in FXMDIClient (don't test for message==0 in notify message).
October 6 - FOX STABLE 1.6.30
* Fixed some issues with flush() in FXBZFileStream and FXGZFileStream.
* FXDial didn't issue SEL_COMMAND when driven from keyboard.
* Small typo found in fxfilematch() was found which affected character-range matching.
* Problem in FX7Segment fixed.
August 9 - FOX STABLE 1.6.29
* Added ".jpeg" as additional extension for JPEG images in FXIconSource.
* Fix in FXSplashWindow not killing timer if it gets destroyed before timer goes off.
* FX7Segment had bug in onCmdGetStringValue() implementation (it was not returning the string).
* Cruft removed from FXMat3f.
* Bold style fixed in FXText.
* Read outside buffer problem (flagged in valgrind occasionally) fixed in FXText.
* Bugs in FXListBox and FXTreeListBox fixed.
1.6.28: not described
* Decoration options interpreted under Windows-XP and UNIX as follows:
DECOR_SHRINKABLE means window may be smaller, but not larger, than
default size; DECOR_STRETCHABLE means window may be larger, but not
smaller, than default size; and finally, DECOR_RESIZE means window may
be both smaller or larger than default size.
* Fixed regression in glUseFXFont() when using Xft instead of XLFD.
* Fixed bug in FXVisual which caused drawing to FXBitmap to fail.
* Fixed bug FXWindow setDNDData() which affected MS-Windows clipboard operations.
* Fixed issue with bold-face text not drawing correctly in FXText if gap
happens to be in the text-fragment being drawn.
* Fixed issue in multi-head API access under older Windows operating
systems than Windows-XP.
* FXMDIChild resize animation speed changed a little bit.
* Some MacOS-X porting issues fixed.
New in 1.4.34:
* Fixed buglet in own strtoll which is only used on machines which
don't have native one.
1.4.32
* Back-ported fixes for GCC 4.1 C++ Language Changes [Friend Injection].
1.4.26
* Fixed SUN Solaris compile issue with threads.
* Missing fxcheckTIF(), fxcheckPNG(), fxcheckJPG() declarations if
TIF, PNG, and JPEG support is stubbed out.
1.4.24
* Fixed small issue in FXVec4{d,f} distance() routine.
1.4.23
* Fixed compile issue with new GetOwnModuleHandle() function.
* Delete thread local storage key upon global destructor in FXThread.
1.4.22
* Fixed bug in fxloadGIF [and thus also in FXGIFIcon and FXGIFImage;
some subltety with the LZW implementation was wrong. It is very
rare as we've lived with this flaw for a long time before discovering
it. The symptom is that the decoder complains that the image is
truncated [it isn't!].
* Bug in FXSettings causes trouble when writing large integer
numbers back to the registry file.
1.4.21
* The getDisplay() API now returns the proper HINSTANCE on Windows;
thanks to Henrik and Claus Wann Jensen feedback on this problem.
The solution fixes some instability problems in .DLL use of FOX on
Windows.
1.4.20
* Set active window to owner when dialog closes on Windows.
* Fixed Thread Local Storage handle leak on Windows.
* Fixed GDI HICON handle leak for FXTopLevel's big/small icons on Windows.
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).
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.
