| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
is already provided by the system natively. There is no reason to
prevent its installation.
|
|
|
|
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.
|
|
|
|
|
|
|
|
than "__progname" (just in case), and set it also in getopt_long(3).
|
|
- pull sources directly into pkgsrc
- do not depend on namespace.h, <sys/cdefs.h> (de-__P()ify), or <err.h>
- use libtool for better portability in shlib creation
The resultant library is still ABI compatible with prior versions and
should have the same shlib major version number.
Thanks to Roland Illig <roland.illig@gmx.de> for help in getting this
working properly on Solaris.
|
|
|
|
|
|
patch by Georg Schwarz in PR 28597
|
|
used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk.
|
|
|
|
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
|
|
e.g. "BUILDLINK_PKGBASE.gtk?= gtk+". This is mandated by the example
buildlink[23].mk files in bsd.buildlink[23].mk.
|
|
BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE.<pkg> explicitly so that
we can map from <pkg> to BUILDLINK_PKGBASE.<pkg>.
|
|
built-in or not into a separate builtin.mk file. The code to deal
checking for built-in software is much simpler to deal with in pkgsrc.
The buildlink3.mk file for a package will be of the usual format
regardless of the package, which makes it simpler for packagers to
update a package.
The builtin.mk file for a package must define a single yes/no variable
USE_BUILTIN.<pkg> that is used by bsd.buildlink3.mk to decide whether
to use the built-in software or to use the pkgsrc software.
|
|
|
|
|
|
recommended by seb :)
|
|
|
|
|
|
buildlink3 framework.
|
|
|
|
|
|
|
|
|
|
|
|
buildlink2.mk files back into the main trunk.
|
|
|
|
to be linked into just the programs, not everything being linked including
libraries. Also some changes to set _NEED_GETOPT instead of a direct check
for /usr/include/getopt.h.
|
|
- pkglint: remove whitespace and end of line.
|
|
installation directory in case the package isn't installed.
|
|
Patches provided by Stoned Elipot <Stoned.Elipot@script.jussieu.fr>
in private mail.
Addresses pkg/13017.
|
|
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>.
|
|
|
|
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.
|
|
|
|
|
|
linked from a particular package, and add a pre-configure target to
the buildlink.mk file to more painlessly use buildlink.mk files. A
${BUILDLINK_TARGETS} variable still exists in case a package _must_
define NO_CONFIGURE.
|
|
|
|
paste into new buildlink.mk files.
|
|
and add link-getopt-libs to BUILDLINK_TARGETS.
|
|
comments (WRKSRC should be WRKDIR).
|
|
Use BUILDLINK_INCDIR, BUILDLINK_LIBDIR for locations of linked headers
and libraries. Create a variable BUILDLINK_TARGETS whose value is the
list of build-link targets to execute.
|
|
-lgetopt to LIBS if GNU_CONFIGURE is defined.
|
|
|
|
more packages.
|
|
|
