| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
This is from Leonard Schmidt via tech-pkg.
|
|
file's sole purpose was to provide a dependency on pkg-config and set
some environment variables. Instead, turn pkg-config into a "tool"
in the tools framework, where the pkg-config wrapper automatically
adds PKG_CONFIG_LIBDIR to the environment before invoking the real
pkg-config.
For all package Makefiles that included pkg-config/buildlink3.mk, remove
that inclusion and replace it with USE_TOOLS+=pkg-config.
|
|
No PKGREVISION bump since pkg-config is only a BUILD_DEPENDS.
|
|
the X11 distribution using imake into mk/buildlink3/imake-check.mk.
imake-check.mk calls out to a helper shell script mk/buildlink3/imake-check
that generates the required Imakefiles and runs imake. Remove the
now extraneous builtin-imake.mk files as the builtin.mk files can now
contain the name of the imake symbol to check.
|
|
contain a command plus arguments. We use the standard idiom to extract
the first word of a list stored in a make variable:
VAR_CMD= ${VAR:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
XXX This can be replaced with a more succinct use of variable modifiers
XXX when we update the bootstrap bmake to match the latest NetBSD make
XXX sources, i.e.:
XXX
XXX VAR_CMD= ${VAR:[1]}
|
|
this requirement by using TMPDIR as the read-write location demanded
by using imake.
|
|
|
|
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".
|
|
|
|
changes:
2004-01-15 Daniel Stone <daniel@fooishbar.org>
* Tag release 2.0.1 for first freedesktop.org clientside lib release.
2004-01-15 Harold L Hunt II <huntharo@msu.edu>
* Makefile.am: Pass -no-undefined to libtool via LDFLAGS.
2003-11-21 Keith Packard <keithp@keithp.com>
* Region.c: (XFixesCopyRegion), (XFixesUnionRegion),
(XFixesIntersectRegion), (XFixesSubtractRegion),
(XFixesInvertRegion), (XFixesTranslateRegion):
* Xfixes.h:
Eliminate offset arguments in combining operators,
create separate XFixesCopyRegion and XFixesTranslateRegion functions.
2003-11-02 Keith Packard <keithp@keithp.com>
* Cursor.c: (XFixesSelectCursorInput), (XFixesGetCursorImage),
(XFixesSetCursorName), (XFixesGetCursorName), (XFixesChangeCursor),
(XFixesChangeCursorByName):
* Makefile.am:
* Region.c: (XFixesCreateRegion), (XFixesCreateRegionFromBitmap),
(XFixesCreateRegionFromWindow), (XFixesCreateRegionFromGC),
(XFixesCreateRegionFromPicture), (XFixesDestroyRegion),
(XFixesSetRegion), (XFixesUnionRegion), (XFixesIntersectRegion),
(XFixesSubtractRegion), (XFixesInvertRegion),
(XFixesRegionExtents), (XFixesFetchRegion),
(XFixesSetGCClipRegion), (XFixesSetWindowShapeRegion),
(XFixesSetPictureClipRegion):
* SaveSet.c: (XFixesChangeSaveSet):
* Selection.c: (XFixesSelectSelectionInput):
* Xfixes.c: (XFixesExtAddDisplay), (XFixesExtRemoveDisplay),
(XFixesExtFindDisplay), (XFixesFindDisplay), (XFixesCloseDisplay),
(XFixesWireToEvent), (XFixesEventToWire), (XFixesQueryExtension),
(XFixesQueryVersion):
* Xfixes.h:
* Xfixesint.h:
* configure.ac:
* xfixes.pc.in:
Merge in xfixes_2_branch
|
|
|
|
|
|
|
|
all these packages.
|
|
|
|
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.
|
|
|
|
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
|
|
|
|
|
|
relative to ${WRKSRC}. Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
|
|
|
|
based upon the pkgsrc-wip pkg by xtraeme@
Xfixes extension of X RandR
|
