CVS log for pkgsrc/fonts/Xft2/Makefile

Up to [cvs.NetBSD.org] / pkgsrc / fonts / Xft2

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

*: revebump for new brotli option for freetype2

Addresses PR 57693

*: Recursive revbup from graphics/freetype2

*: revbump after fontconfig bl3 changes (libuuid removal)

all: migrate several HOMEPAGEs to https

pkglint --only "https instead of http" -r -F

With manual adjustments afterwards since pkglint 19.4.4 fixed a few
indentations in unrelated lines.

This mainly affects projects hosted at SourceForce, as well as
freedesktop.org, CTAN and GNU.

fonts: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.

Recursive bumps for fontconfig and libzip dependency changes.

Follow some redirects.

Remove pkgviews: don't set PKG_INSTALLATION_TYPES in Makefiles.

Correct home page URL.

Try to fix the fallout caused by the fix for PR pkg/47882. Part 3:

Recursively bump package revisions again after the "freetype2" and
"fontconfig" handling was fixed.

Bump freetype2 and fontconfig dependencies to current pkgsrc versions,
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

Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days.

Recursive bump for graphics/freetype2 buildlink addition.

Depend on latest Xrender to have correct .pc file. Bump PKGREVISION.

Mechanically replace all includes of buildlink3.mk of the following
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

Flag a number of packages I use as supporting (user-)destdir.
apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".

Conflict with libXft (currently in pkgsrc-wip).

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.

Over 1200 files touched but no revisions bumped :)

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).

Point MAINTAINER to [email protected] in the case where no
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.

Recursive revision bump / recommended bump for gettext ABI change.

Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because
of the shlib major bump.
PKGREVISION++ for the dependencies.

Fixed pkglint warnings. The warnings are mostly quoting issues, for
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

Update to 2.1.7:

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

Fix MASTER_SITES as the old site does not exist anymore.
This is from Leonard Schmidt via tech-pkg.

Remove the abuse of buildlink that was pkg-config/buildlink3.mk.  That
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.

Change path from devel/pkgconfig to devel/pkg-config.
No PKGREVISION bump since pkg-config is only a BUILD_DEPENDS.

Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
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.

Remove USE_TOOLS+=gawk from packages that had it added solely for Solaris.
We rely on the tools framework to pull in a good enough awk tool.

Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:

	USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison

Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.

Needs at least Xrender-0.8.2 and fontconfig-2.2.
Closes PR 29477.

Libtool fix for PR pkg/26633, and other issues.  Update libtool to 1.5.10
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.

Update to libXft-2.1.6.

changes:
Bug fixes and clean ups.

Bump PKGREVISION.

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.

Enable pkgviews installation.

Xft2 only needs Xrender>=0.8.

Remove redundant addition to BUILDLINK_DEPENDS.freetype2 that's already
added by fontconfig/buildlink3.mk.  Also use += to append to
BUILDLINK_DEPENDS.Xrender instead of setting it.

PKGCONFIG_OVERRIDE is relative to WRKSRC.

LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.

bl3ify, enable libtool now we have 1.5.2, remove useless PLIST_SUBST.

replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

Add a comment explaining why we have to use PLIST_SUBST over FreeBSD/Linux.
(Suggested by seb@)

Fix installation on systems where libXft.so.$(MAJOR_VERSION).$(MINOR_VERSION)
was not built (at least FreeBSD/Linux).

quote EGREP in MAKE_ENV.

this needs zlib, so include devel/zlib/buildlink2.mk.

Add missing PKGCONFIG_OVERRIDE.
Bump PKGREVISION because of the changed *.pc files.
ok'ed by wiz@

Depend on Xrender>=0.8.2, since that's what the configure check checks for.
Do not bump PKGREVISION since the update was only a short while ago.

Update Xft2 to version 2.1.2.

Not sure of precise changes but does again build correctly against the
current fontconfig package.

use += for USE_GNU_TOOLS.

USE_GNU_TOOLS=awk

get a working awk on Solaris, sort includes.

s/netbsd.org/NetBSD.org/

Use tech-pkg@ in favor of packages@ as MAINTAINER for orphaned packages.
Should anybody feel like they could be the maintainer for any of thewe packages,
please adjust.

Clean up freetype2 requirements so Xft2 and fontconfig also require the right
version via buildlink'ing

Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.

Drop maintainership.  I don't understand how this package really works and
all the magic needed to get it working with the versions included with
XFree86.  Other people will do a better job than me.

Bump PKGREVISION

Ugg...This can use the 2.0.5 freetype2 included in XF4.2.x (which is what we
shipped with 1.6), however the most recent pango requires 2.0.9 and also uses
this package. As a result you end up with conflicting freetype linkage and
the wrong library version (.8) can get used in further packages which use
pango. Alleviate all of this by requiring >=2.0.9 in here as well

Add libXft.so, noted missing by HIRATSUKA Kouichirou in PR 20182. PKGREVISION++

Include Xrender/buildlink2.mk so that this builds on XFree86-3.x systems.

Register include files. Pointed out by Douglas Brebner in private mail.
Bump PKGREVISION to 2.

Fix pkgconfig file to have -lXext after -Xrender (why doesn't the library
have the dependency itself?).
Bump PKGREVISION to 1, and depend on latest version in buildlink2.mk.

Initial import of Xft2-2.1. Description follows:

Xft (2.0) provides a client-side font API for X applications. It uses
Fontconfig to select fonts and the X protocol for rendering them. When
available, Xft uses the Render extension to accelerate text drawing.
When Render is not available, Xft uses the core protocol to draw
client-side glyphs. This provides completely compatible support of
client-side fonts for all X servers.

Xft (2.0) hides most of the underlying system details so that developers
can confidently use its API to access client-side fonts in any X
environment.

Approved by wiz.

Initial revision