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.
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives
a value only once due to the multiple inclusion protection in the
bulldlink3.mk files. In the case where a package includes several
buildlink3.mk files that each want a slightly different version of another
dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the
strictest <pkg> dependency to be matched.
imlib-config were dynamic by running another *-config
script. This fix is to remove the buildlinking of
gtk-config, so imlib-config would work.
As mention by Juan RP on tech-pkg, imlib's build
could use
CONFIGURE_ENV+= GTK_CONFIG="${PREFIX}/bin/gtk-config"
to make sure that correct gtk-config is used.
Because gtk-config was broken, imlib couldn't build.
Probably x11/gtk's PKG_REVISION should by bumped?
I need to look to see if smpeg-config is broken too
(due to sdl-config path).
Makefiles simply need to use this value often, for better or for
worse.
(2) Create a new variable FIX_RPATH that lists variables that should
be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By
default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
additional variables may be appended from package Makefiles.
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
slash to .../gtk-1.2/ since it's usually not there and we won't match it.
This error was detected only because gconf-config has .../gtk-1.2 at the
very end of it's output. Anywhere in the middle, and it would have been
fine.
Summary of changes:
- removal of USE_GTEXINFO
- addition of mk/texinfo.mk
- inclusion of this file in package Makefiles requiring it
- `install-info' substituted by `${INSTALL_INFO}' in PLISTs
- tuning of mk/bsd.pkg.mk:
removal of USE_GTEXINFO
INSTALL_INFO added to PLIST_SUBST
`${INSTALL_INFO}' replace `install-info' in target rules
print-PLIST target now generate `${INSTALL_INFO}' instead of `install-info'
- a couple of new patch files added for a handful of packages
- setting of the TEXINFO_OVERRIDE "switch" in packages Makefiles requiring it
- devel/cssc marked requiring texinfo 4.0
- a couple of packages Makefiles were tuned with respect of INFO_FILES and
makeinfo command usage
See -newly added by this commit- section 10.24 of Packages.txt for
further information.
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
use X11_BUILDLINK_MK as a test value. Generally just reordering the
inclusions so that x11.buildlink.mk comes before the other buildlink.mk
files will make everthing work.
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
set FOO_CONFIG=${BUILDLINK_CONFIG_WRAPPER.foo} in both CONFIGURE_ENV and
MAKE_ENV. We remove the check for GNU_CONFIGURE because if a package
Makefile includes the buildlink.mk file, then it most likely wants to use
the config script wrappers as well. Change suggested by Hubert Feyrer
(hubertf) and Tomasz Luchowski (zuntum).
BUILDLINK_PREFIX.<pkgname>. This allows buildlink to find X11BASE packages
regardless of whether they were installed before or after xpkgwedge was
installed. Idea by Alistair Crooks <agc@pkgsrc.org>.
so remove it from package Makefiles. Also move the inclusion of the
buildlink.mk files to the end of the Makefile to just before bsd.pkg.mk
to ensure that any Makefile settings occur before the buildlink.mk files.
${X11PREFIX}/include/gtk-1.2 -> ${BUILDLINK_DIR}/include/gtk-1.2
for some buildlink protection for gtk packages installed in ${X11BASE}.
Only helps with the include files, though, not the libraries.
FOO_REQD=1.0 being converted to foo>=1.0, one can now directly specify
the dependency pattern as FOO_DEPENDS=foo>=1.0. This allows things like
JPEG_DEPENDS=jpeg-6b, or fancier expressions like for postgresql-lib.
Change existing FOO_REQD definitions in Makefiles to FOO_DEPENDS.
the installed package. We patch the version info in the configure scripts
to deal with shared library versioning, but we don't want those version
numbers to leak into installed files. Fixes 2nd part of pkg/12146 by
Dan Winship <danw@ximian.com>.
* Fix focus drawing with no window manager
* Fix cut-and-paste with no current event
* Fix compilation using --with-xinput=gxi
* Fix problem with cut-and-paste and KOI8-R
* Fix rare problem with enter events and menus
* Fix problem with --with-native-locale and GNU libc-2.1
* Further fixes for using fonts, not fontsets, with non iso-8859-1.
* Fix problem with dropping onto internal children, such as CList buttons
* Translation updates
This package also fixes a bug of gtk+-1.2.10 that messes up
focus-follows-pointer with embedded windows (which affects, for example,
the control center and various bonobo components in GNOME). Thanks go to
Dan Winship <danw@ximian.com>, who provided this patch in private mail.
first component is now a package name+version/pattern, no more
executable/patchname/whatnot.
While there, introduce BUILD_USES_MSGFMT as shorthand to pull in
devel/gettext unless /usr/bin/msgfmt exists (i.e. on post-1.5 -current).
Patch by Alistair Crooks <agc@netbsd.org>
Overview of Changes in GTK+ 1.2.9:
* Move include files into a gtk-1-2/ subdir to support parallel
installation with GTK+-2.0. If you are installing from source
on top of a previous version, you should to remove $(includedir)/gdk/
and $(includedir)/gtk/ manually before installing the new version.
* Improved submenu navigation.
* Other small useability improvements for menus, scrollbars, etc.
* Patch enabling themes with better appearance by making some
geometry parameters settable.
* Changes so that using fonts (as well as fontsets) for
non-iso-8859-1 locales will work.
* New --with-native-locale configure option for faster string
handling on systems with non-broken locale support.
* Refuse to initialize GTK+ when setuid (http://www.gtk.org/setuid.html)
* Change to make GdkRGB use less SHM segments.
* Addition of .pc files
* Many bug fixes
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.
