This is just a simple version bump so that ${OS_VERSION} can be removed from
the DISTNAME as this package now depends on 'pkgtools/osabi'
Update BUILDLINK_API_DEPENDS.x11-links to match.
1.) Update list to remove duplicates and add missing entries for recent
versions of NetBSD-current. The necessary changes were supplied
by Bernd Ernesti.
2.) Include the operating system version number in the package version
to force a re-build of the package if the operating system is
updated (which might change the X11 distribution as well.
This should fix PR pkg/42492.
Change approved by Thomas Klausner.
Detect X.org even if "imake" is not installed. The package now works as
expected under Mac OS X Snow Leopard.
No regressions under NetBSD/amd64 5.0_STABLE with native X.org.
Add newer library version as provided by Mac OS 10.5.4. Based on a patch
submitted by Brian de Alwis in PR pkg/39207.
Tested under NetBSD/i386 4.0_STABLE and Mac OS PPC 10.5.4.
Update the "x11-links" package to version 0.34:
- Add suport for "libICE", "libSM", "libXext", libXinerama", "libXrandr",
"libXrender", "libXt" and "xcursor"
- Improve support for "Xfixes".
-- instead, we just check "pkg_info", which should exist on all pkgsrc
platforms.
XXX Note that this may need to change when we later support other package
XXX system flavors.
Back out revision 1.79 of pkgtools/x11-links/Makefile which was only to
work around needing a C compiler for shlib-type to work.
'make package' (make; make package works): without this SHLIB_TYPE
is set to 'none' while doing 'make package', resulting in
mk/plist/shlib-none.awk being used hence missing PLIST entries.
XXX I suppose this may not really be the right fix (barrier
problem?) but for the time being 'pkg_comp makeroot' succeed
XXX What is this 'foo' target?
the files in the work directory are built to discover the directories
that need to be removed at deinstall time. This fixes PR pkg/25325 by
Georg Schwarz.
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.
