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.
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.
- input-linux_kbd: Fix tons of warnings about type re-defintions. Patch from
Tobias Hunger.
- fix compiler error with gcc 3.4 in the pthread based scheduler. Patch from
Tobias Hunger.
- #define GIIK_Enter and GIIK_Delete properly in <ggi/keyboard.h>
- pthread locking: fix crash on GNU Hurd
- typo fix: configure --disable-stdin now actually disables input-stdin
- input-xwin: locking is conditional, so do with unlocking. Patch from SF
#1164406
- input-x: enable keyboard focus by default as originally intended
- build system: fix case bug in long long test
- build system: make configure fail when passing an unsupported mutex type
to --enable-mutexes
- documentation: added manpages for input-x and input-xwin
New in 0.9.0: 2004-11-30:
- Documentation updates
- KII target improvements
- minor fixes to button and symbol handling
- handle labels correctly now
- merge improvements from the FreeBSD ports tree
- works on Windows using MinGW w/o requiring special Makefiles.
- task scheduler as an abstraction for platform independent threads.
- DirectX target improvements
- Tries to use the actual keyboard layout, and only fall back
to the hardcoded defines when that does not work.
- Makes shift and caps lock bring you capital letters.
- Dead keys support (GIIK_VOID in sym, synthetic press/release
events if non-matching key is hit after the dead key).
- Renamed Caps, Num and Scroll to CapsLock, NumLock etc.
- Mouse wheel support.
- Support for up to 8 mouse buttons (2 previously).
- Support for emPtrRelative.
- Preliminary support for emPtrRelative.
- Fixed a bug so that a lot of surplus emPtrAbsolute events are
killed.
- Support for various game controllers.
- The mouse and the keyboard are separated into two devices.
- Emulates key repeat messages.
New in 0.8.7: 2004-11-30:
* hotfix: input-linux-evdev: fix compiling error where KEY_103RD is not defined (SuSE 9.1)
* minor buildsystem update
* use more length bounded string operations
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".
New in 0.8.6: 2004-09-14:
* ggGetUserDir(3): Eliminate race condition
* ggGetUserDir(3): Fix memory leak on Darwin when $HOME is not set
* Bugfix: ensure aligned memory access in event handling. Fixes crash on NetBSD/sparc64
* giiSplitInputs(3): make it work - finds the actual input
* config file parsing fixes
New in 0.8.5: 2004-05-29:
* add hotfix to make libgii compile for linux users,
who uses kernel 2.6 headers to compile their userland. Fixes Debian bug 224802
* libtool update. Fixes Debian bug 208288.
* add 'See Also' section to libgii(7) manpage and lots of other documentation updates
* build system updates
* linux_kbd fix: read unicode symbols correctly. Patch from Aurelien Reynaud.
* focus pulling fix in xwin/x: Key focus should
no longer get lost, when the mouse is NOT over the window.
Note, input-x need to know some little more information from libggi's
display-X. So don't forget to update libggi's display-X as well,
otherwise you may experience everything from strange input behaviour to crashes.
Hi Christoph!
Changes since 0.8.3:
* gcc 3.3 warning fix (warnings caused by <ggi/gg.h>:194 fixed)
* hotfixes for libgii 0.8.3
* fixed memory leak on unloading modules under Darwin
* win32 (cygwin/mingw) compile fixes from Albert Graef
* cygwin build fixes
New in 0.8.3:
* The two hotfixes for libgii 0.8.2
* manpage fixes
* several minor fixes
New in 0.8.2: 2002-12-??;
* Misc bugfixes (see ChangeLog).
* Huge Documentation update.
* Threadsafety fixes
* LibGG: New supported platform: Darwin
* Major build system update
- autoconf 2.5x works now
- build fixes for many platforms
* input-kii
- new input target. Works for many KGI users, but
still not for everyone.
- still very experimental, thus disabled by default
* input-x/input-xwin
- handle GraphicExpose events
* input-ipaq
- new touchscreen input for Compaq iPaq from Tobias
* input-zaurus
- new touchscreen input for Sharp Zaurus from Tobias
New in 0.8.1: 2001-08-26;
* Nothing much in the code except the usual minor fixes.
* The build process is improved.
New in 0.8: 2001-07-10;
* Misc bugfixes (see ChangeLog).
* Huge Documentation update.
* New API: giiSplitInputs()
* input-linux-evdev
- Bugfixes from Stephan
* input-directx
- Update
* input-vgl
- small build fix for FreeBSD
New in 0.7: 2000-12-18;
* Portability fixes for non-Linux platforms.
* Preliminary Win32 support.
* All headers should be C++ compatible now.
* Misc bugfixes (see ChangeLog).
* Documentation updates.
* Renamed GGI_ELOCKBUSY to GGI_EBUSY.
* New LibGG functions ggCurTime() and ggConfigExpandAlias().
* LibGG now uses it's own mutexes when compiled with gcc - no more
pthreads and dynamic linker bugs.
* Support compiler type checking on gii_input_t.
* New command events GII_CMDCODE_PREFER_ABSPTR and GII_CMDCODE_PREFER_RELPTR.
* input-linux-evdev
- New target to support the new evdev input API present in Linux 2.4 and
2.2.18. Should handle mice, joysticks and keyboards.
* input-linux-mouse
- Improved autodetection of mousetype.
* input-mouse
- 3 button support for MS protocol.
- 4 button support for IMPS/2 protocol.
* input-x/input-xwin
- Prevent events from lagging in the socket queue in apps that don't call
XFLush/XSync frequently.
* input-vgl
- New inputlib for FreeBSD's VGL library.
* input-directx
- New inputlib for DirectInput on Win32.
* filter-keytrans
- Added new filter to arbitrarily remap key events.
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES". This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile. Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
out of date - it was based on a.out OBJECT_FMT, and added entries in the
generated PLISTs to reflect the symlinks that ELF packages uses. It also
tried to be clever, and removed and recreated any symbolic links that were
created, which has resulted in some fun, especially with packages which
use dlopen(3) to load modules. Some recent changes to our ld.so to bring
it more into line with other Operating Systems also exposed some cracks.
+ Modify bsd.pkg.mk and its shared object handling, so that PLISTs now contain
the ELF symlinks.
+ Don't mess about with file system entries when handling shared objects in
bsd.pkg.mk, since it's likely that libtool and the BSD *.mk processing will
have got it right, and have a much better idea than we do.
+ Modify PLISTs to contain "ELF symlinks"
+ On a.out platforms, delete any "ELF symlinks" from the generated PLISTs
+ On ELF platforms, no extra processing needs to be done in bsd.pkg.mk
+ Modify print-PLIST target in bsd.pkg.mk to add dummy symlink entries on
a.out platforms
+ Update the documentation in Packages.txt
With many thanks to Thomas Klausner for keeping me honest with this.
