| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
|
|
general solution I checked in in bsd.buildlink3.mk.
|
|
|
|
"Xrender" first. This avoids using the builtin "Xft2" if the builtin
"fontconfig" is reject.
This fixes another regression caused by the "pango" upgrade and the fix
for PKG pkg/47882.
|
|
Recursively bump package revisions again after the "freetype2" and
"fontconfig" handling was fixed.
|
|
to address issues with NetBSD-6(and earlier)'s fontconfig not being
new enough for pango.
While doing that, also bump freetype2 dependency to current pkgsrc
version.
Suggested by tron in PR 47882
|
|
|
|
Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge.
Always install man pages, not cat pages when using imake.
Unify the various imake PLIST variables in preparation for dropping.
Adjust xbattbar for the new expectations.
|
|
|
|
|
|
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.
|
|
X.Org found in NetBSD-current.
Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).
On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files. It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file. x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.
|
|
bogus because we need these variables to be defined and not to be "no"
to decide whether we want to use the builtin version.
|
|
|
|
packages with the modular Xorg equivalent. Those are falling back
to the old location by default, so this commmit doesn't change
dependencies.
graphics/xpm ==> x11/libXpm
fonts/Xft2 ==> x11/libXft
x11/Xfixes ==> x11/libXfixes
x11/xcursor ==> x11/libXcursor
x11/Xrender ==> x11/libXrender
x11/Xrandr ==> libXrandr
|
|
apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".
|
|
This version of Xft2 is not supported and I have been using
the maintained version since last year on several pkgsrc build
systems. But I will not switch to new version until okayed by others.
|
|
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
|
|
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.
|
|
This fixes problem when using USE_BUILTIN.Xft2=yes.
This is to close PR #32316 from Rui-Xiang Guo.
|
|
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).
|
|
exists on the disk -- we can just check whether a variable defined by
find-files.mk is "__nonexistent__" or not.
|
|
developer is officially maintaining the package.
The rationale for changing this from "tech-pkg" to "pkgsrc-users" is
that it implies that any user can try to maintain the package (by
submitting patches to the mailing list). Since the folks most likely
to care about the package are the folks that want to use it or are
already using it, this would leverage the energy of users who aren't
developers.
|
|
|
|
of the shlib major bump.
PKGREVISION++ for the dependencies.
|
|
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
|
|
2005-03-29 Keith Packard
* README:
* Xft.h:
* configure.ac:
Update for version 2.1.7
2005-03-01 Keith Packard
* xftdpy.c: (_XftDisplayInfoGet), (XftDefaultSubstitute):
Avoid calling any Render functions when Render is missing (#137)
* xftglyphs.c: (XftFontLoadGlyphs):
Only clip to bounding box when FC_CHARCELL is specified.
Only fix glyph spacing when FC_MONO is specified.
2005-02-28 Keith Packard
* configure.ac:
* xftdpy.c: (_XftDefaultInit), (XftDefaultSubstitute):
* xftfreetype.c: (XftFontInfoFill), (XftFontOpenInfo):
* xftglyphs.c: (XftFontLoadGlyphs):
* xftint.h:
Add support for artificial emboldening of glyphs through
the FT_GlyphSlot_Embolden API when it is available.
* xftextent.c: (XftGlyphExtents):
Optimize one glyph extents case (it happens a *lot*).
(Ross Burton)
2004-11-28 James Henstridge
* xftfreetype.c (_XftReleaseFile): add parentheses in the
expression in the second argument to XftMemFree so that it is
interpreted correctly.
2004-09-05 Keith Packard
* configure.ac:
Move AC_CONFIG_AUX_DIR above AM_INIT_AUTOMAKE to make
automake 1.9 happy
2004-08-03 Keith Packard
* xftfreetype.c: (_XftReleaseFile):
Called strlen with (f->file) without checking for NULL (which
happens when directly using FT_Face objects).
2004-04-14 Keith Packard
* AUTHORS:
* Makefile.am:
* Xft-def.cpp:
* Xft.3.in:
* Xft.h:
* XftCompat.h:
* configure.ac:
* xftcolor.c:
* xftcore.c:
* xftdbg.c:
* xftdpy.c:
* xftdraw.c:
* xftextent.c:
* xftfont.c:
* xftfreetype.c: (XftFontOpenInfo):
* xftglyphs.c:
* xftinit.c:
* xftint.h:
* xftlist.c:
* xftname.c:
* xftrender.c:
* xftstr.c:
* xftswap.c:
* xftxlfd.c:
Regularize #include usage so that all includes
happen in xftint.h. This allows conditional inclusion
of system headers like string.h/strings.h
Add GCC warnings on GCC systems.
Fix CVS Id strings
|
|
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.
|
|
We rely on the tools framework to pull in a good enough awk tool.
|
|
USE_GNU_TOOLS -> USE_TOOLS
awk -> gawk
m4 -> gm4
make -> gmake
sed -> gsed
yacc -> bison
|
|
|
|
before xorg.cf, which in xorg from pkgsrc does not contain them.
(This is required by our xorg-* packages).
|
|
|
|
Closes PR 29477.
|
|
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:
Bug fixes and clean ups.
|
|
we have. for the moment, consider X.org 6.7 the same as XFree86 4.4
for the purpose of Xft2.
|
|
|
|
pkgsrc/fonts/Xft2/patches was added on April 27 to add #include
<ft2build.h> in Xft.h. This helps newer freetype2-using
files to build.
|
|
|
