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).
makeinfo if no native makeinfo executable exists. Honor TEXINFO_REQD
when determining whether the native makeinfo can be used.
* Remove USE_MAKEINFO and replace it with USE_TOOLS+=makeinfo.
* Get rid of all the "split" argument deduction for makeinfo since
the PLIST module already handles varying numbers of split info files
correctly.
NOTE: Platforms that have "makeinfo" in the base system should check
that the makeinfo entries of pkgsrc/mk/tools.${OPSYS}.mk are
correct.
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.
NEWS since guile-gtk-1.2-0.31
* Guile-gtk-1.2 is now part of the GNU Project.
* Drag'n'Drop support - see examples/test-dnd.scm
* GdkPixbuf bindings. Formerly these bindings were part of
guile-gnome, unfortunately they were far from compelete,
moreover they were not working at all. Now there are full
GdkPixbuf bindings in the (gtk-1.2 gdk-pixbuf) module.
* LibGlade bindings (formerly part of gnome-guile). Imported from
gnome-guile, completed and improved. Now it is possible to
autoconnect scheme functions and build a guile-gtk (glade)
application in three commands - see examples/test-glade.scm and the
little bit longer examples/run-glade.scm.
You can find libGlade bindings in the (gtk-1.2 glade) module.
* GtkGLArea bindings (formerly part of guileGL). Imported from
guileGL, completed and improved.
(gtk-1.2 gdk-gl) module provides bindings for Gdk part of GtkGLArea
library (GdkGLContext, GdkGLPixmap etc), (gtk-1.2 gtk-gl-area) has
bindings for GtkGLArea functions.
* configure script has options --with-gdk-pixbuf, --with-glade and
--with-gtkgl. Just in case you would like to turn off these new
nifty features.
* build-guile-gtk-1.2 supports functions with arbitrary number of
required arguments.
* GtkPixmap bindings closely reflects C API, helper function
gtk-pixmap-new-from-file implements old behaviour.
GtkPixmap bindings are complete.
* Lots of additional bindings, especially for Gdk.
NEWS in guile-gtk-1.2-0.31
* Bug fixes.
NEWS in guile-gtk-1.2-0.30
* Support for Gnome and Gtk+-2.0 has been removed.
The modules have been renamed from (gtk ...) to (gtk-1.2 ...). They
are still available under their old names, but the new ones are
preferred.
Likewise, build-guile-gtk has been renamed to build-guile-gtk-1.2,
with the old name still available but deprecated.
Building new programs with "build-guile-gtk main" is no longer
supported; only shared libraries are. Consequently, the guile-gtk
program is no longer provided.
NEWS in 0.20
* New `cname' option for field specifiers. You can now specify what
name to use on the C side for field accessors. For example, to
access the allocation.x subfield of a GtkWidget structure, you can use
(fields
(int allocation-x (cname allocation.x)))
The value of the option can be either a symbol or a string.
* New cstring type added to deal with const char *str declarations.
* Guile-gtk will now start the usual `top-repl' of Guile. The
processing of Gtk events will happen in a separate handler thread.
When your Guile doesn't support threading, you get the old event
driven repl.
* `gdk-event-button-state' and `gdk-event-key-state' have been
replaced by `gdk-event-state'. The new function will return a
GtkModifierType which is a list of symbol such as
(shift-mask control-mask)
* Automatic *.h->*defs translator
* Threads support
* Experimental GTK+ 2.0 support
* RPM spec file corrected
* Lots of additions and corrections to the *.defs files
* Various bug fixes
Unfortunately, guile{,14}/buildlink3.mk directly includes it, and I don't
know which dependencies actually need libltdl, so it was a recursive bump.
Hopefully this recursive inclusion can be ripped out of
guile{,14}/buildlink3.mk at some point and bubble down to dependencies that
actually use libltdl, avoiding this headache in the future....
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".
necessary, but only one other package, gwave, uses guile-gtk and it's
currently broken with respect to building, and we need the latest guile-gtk
at build-time to fix gwave's build, so I'm bumping the dependency for the
sake of convenience.
