- remove LIBXAW variable. It is handled by buildlink3.mk now
- simplify patches and Makefile in packages using libXaw
- in some cases force use of Xaw3d (won't build with Xaw)
- replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk
In next part:
- replace more includes with mk/xaw.buildlink3.mk
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).
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.
libraries work properly with xaw.buildlink3.mk. That's better!
This was done so that X/Open Curses (pkgsrc-wip/pdcurses) could
have a chance of using these libraries. ;)
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).
developer is officially maintaining the package.
The rationale for changing this from "tech-pkg" to "pkgsrc-users" is
that it implies that any user can try to maintain the package (by
submitting patches to the mailing list). Since the folks most likely
to care about the package are the folks that want to use it or are
already using it, this would leverage the energy of users who aren't
developers.
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".
0.15.1:
030915 Toggle again: the check mark displayed in the wrong place
when the widget wasn't its default height.
Added code to the Command Redisplay function so it doesn't
shift the text when the widget is a Toggle in check or radio
style. That's really ugly because we're depending
on how the widget is subclassed. But it works.
030913 The new highlighting code broke with the Toggle widget
in radio or check style.
030912 Fixed function prototypes in Toggle.c and fixed bugs
caused by not having them in the first place.
030903 Eliminated warnings caused by missing #includes.
030902 Scrollbar: Added XtNarrowStyle resource to make arrows in the
style of Windows ("win95") or NeXt ("next", default).
UPDATE: This was later backed out.
0.15.0:
030902 Scrollbar: Made the bump on the thumb optional (resource
XtNdrawBump, default True).
030901 ThreeD: Added XtNbevel resource to make the bevel "solid"
(Motif/Xaw3d-like) or "rounded" (neXtaw, default).
Added the same code to neXtawDrawShadowBox in Misc.c, which
is used by Scrollbar and SimpleMenu.
Added a 3D bevel to Text using a similar hack as in Xaw95.
030831 Command, Repeater and Toggle: Draw a dotted rectangle around
the highlighted widget. Reduced the distance the text shifts
in a set widget to 1 pixel.
030824 Added traversal code from Ed Falk's XawM. Note: KDE messes up
translations for the Command widget. That is a bug in KDE.
USE_GCC2 or USE_GCC3 where appropriate.
the functionality of the old gcc.buildlink2.mk has been rolled into
compiler.mk now, which is automatically used.
more changes to come later...
030823 Patch from Alexey I. Froloff <raorn@altlinux.ru>:
This patch adds shadow width to SimpleMenu widget's height
(last Sme overlaps with bottom shadow) and fixes SmeBSB drawing
code (different regions were highlighted in Redisplay and
FlipColors, "disabled" menu items were displayed as normal if
.international is set to True).
030227 Updated selection code in Text widget. Removed support for
cut buffers. Added support for CLIPBOARD. Changed keybindings:
Ctrl-C = copy selection to clipboard
Ctrl-X = cut selection to clipboard
Ctrl-V = paste clipboard
Page_Up = page up
Page_Down = page down
Home = beginning of line
Ctrl-Home = beginning of file
End = end of line
Ctrl-End = end of file
New configuration option --enable-obsolete-selections reverts
to the old code.
030204 Check for the existence of widec.h (c/o Matthias Buelow).
030115 Patches by Alexey I. Froloff:
"NeXtish" scrollbar look (thumb and buttons are wider and
look more flat).
Fixed thumb positioning for Button2 scrolling.
Released 0.13.0.
