Commit graph

79 commits

Author SHA1 Message Date
hira
217f67e27d Clean up additional font path. OK'd by reed@.
If you installed fontconfig-2.3.2, please remove <dir></dir> entry
from ${LOCALBASE}/etc/fontconfig/fonts.conf.
2005-09-05 15:18:42 +00:00
reed
a8c2f2c6fb Remove the MESSAGE. It is not required. The library will build
caches for individuals as needed.

Remove gnome from CATEGORIES.

Redo the added font paths because ${LOCALBASE}/lib/X11/fonts is
already default as configured above, so don't need to add again.
And don't need to list sub-directories of "fonts" because fontconfig
already looks in sub-directories too. (I have been using this over
a year on various systems like this.)

Update to 2.3.2. Changes include:
        * fc-cache/fc-cache.c: (scanDirs):
        Fix a few minor leaks in error cases.
        * fc-cache/fc-cache.c: (main):
        Destroy font configuration on exit to help valgrind
        * fonts.conf.in:
        * src/fcfreetype.c: (FcSfntNameTranscode), (FcFreeTypeCharIndex),
        (FcFreeTypeCheckGlyph):
        Use own transcoding routines in preference to iconv
        which appears to have leaks in some translators.
        Call iconv_close after using iconv (oops).

        Prefer unicode encoding of Euro char as some
        fonts mis-encode Euro in other ones.

        Must fetch bitmap glyphs to get width values
        to check for monospace/dual-width fonts.

Complete changes at
http://www.fontconfig.org/release/ChangeLog-2.3.2

Note that manpage for fc-cache(1) is not installed yet. It is in SGML.

Also note that the new version provides same library version
libfontconfig.so.1.0.4. This was reported to developer and was an
accidently oversite. Nevertheless, it is still ABI compatible.
2005-07-28 16:40:03 +00:00
jlam
7d6695d6cf Never use docbook2html to regenerate documentation files. That's too
heavy of a build dependency to drag in, and the SGML template files
are not completely standardized.  This should fix PR pkg/29392.
2005-06-07 19:38:52 +00:00
jlam
08c60ab83d Coalesce the common makefile code in the builtin.mk file that inspect
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.
2005-06-03 19:12:49 +00:00
jlam
c85165ac07 Only check for the existence of the first word of ${IMAKE} since it may
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]}
2005-06-03 17:02:36 +00:00
jlam
88aeda0672 Don't require a read-write pkgsrc tree when invoking imake. We avoid
this requirement by using TMPDIR as the read-write location demanded
by using imake.
2005-06-03 16:03:09 +00:00
jlam
7debfabe11 Use IMAKE_MAKE instead of MAKE to process the makefile generated by imake. 2005-06-01 18:33:02 +00:00
jlam
95fd1f6ec9 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.
2005-06-01 18:02:37 +00:00
jlam
585534220c 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
2005-05-22 20:07:36 +00:00
kristerw
c360d873c9 Include converters/libiconv/buildlink3.mk. 2005-04-21 17:40:19 +00:00
dmcmahill
8daea2c9a3 add libiconv buildlink3.mk file. fontconfig directly calls iconv().
Should address the 'fontconfig core dumps' on solaris bug reported in
PR29837
2005-04-12 12:38:40 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
wiz
faef6faeff Update to 2.3.1:
* Fix manuals in section 3 so they get built and installed.

 * Rework GSUB/GPOS script parsing to avoid crashing when presented
   with broken fonts.

 * Add a few more example configuration files to /etc/fonts/conf.d
   from the debian packaging.
2005-03-22 14:05:54 +00:00
wiz
f36b8499cb Sort. 2005-03-01 23:39:02 +00:00
wiz
3ad11e5ab4 Update to 2.3.0:
Fix memory leak of patterns rejected by configuration (#2518)

Create prototype $PREFIX/etc/fontconfig/conf.d directory and populate
it with a few sample files.  These samples are unused as the file
names don't start with numbers.

Update documentation.
2005-03-01 23:38:14 +00:00
wiz
0b23075977 Update to 2.2.99:
Fontconfig 2.2.99 contains a few minor bug fixes plus the addition of
polite type warnings for the config file. This latter change could use a
bit of exposure to existing config files to see if it whines about
legitimate configurations.
2005-02-26 16:39:51 +00:00
agc
c1e24f7e2b Add RMD160 digests to the SHA1 ones. 2005-02-23 19:18:25 +00:00
drochner
64ccfae37a update to 2.2.98
changes:
2.2.97
Fc-cache sleeps before exiting to ensure filesystem timestamps are well
ordered.
Added Punjai orthography.
The timestamp in fonts.conf is gone now.  Too many problems.
The default font path includes all of the X fonts; use selectfont/rejectfont
to eliminate bitmaps, as shown in the sample local.conf file.
<include> configuration elements may now reference a directory.  Files
in that directory matching [0-9]* are loaded in UTF-8 collating sequence order.
<selectfont> configuration added to control which fonts are used.
fontformat font pattern elements built from the FT_Get_X11_Font_Format
function in newer versions of FreeType.
'capability' list constructed from gsub/gpos and silf values in TrueType
files.
Multi-lingual names (style, family, fullname) extracted and stored with
parallel <foo>lang properties marking language.
2.2.98
Share object name strings (Michael Meeks)
Eliminate a couple of codepoints from Russian orthography (John Thacker)
Add synthetic emboldening configuration changes (Jakub Pavelek)
Change FcFontSetSort to ignore language after fonts with the requested
languages have been found. (Owen Taylor)
Add some RedHat font configuration changes (Owen Tayler).
Add full Unicode case folding support to case-ignoring string functions
(Keith Packard)
Remove Han characters from Korean orthography (Tor Andersson)
2005-01-18 12:15:46 +00:00
xtraeme
48b939b96d Make sure we have defined GNU_CONFIGURE and USE_LIBTOOL before including
bsd.prefs.mk, otherwise the check for _OPSYS_MAX_CMDLEN is skipped.
2004-12-20 18:49:37 +00:00
tv
c487cb967a 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.
2004-10-03 00:12:51 +00:00
jlam
1a280185e1 Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.
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".
2004-09-22 08:09:14 +00:00
recht
9a98eccc53 update to fontconfig-2.2.96
changes:
2004-06-30  Keith Packard  <keithp@keithp.com>

	* README:
	* configure.in:
	* fontconfig/fontconfig.h:
	Update for 2.2.96

2004-06-30  Keith Packard  <keithp@keithp.com>

	Provided by: Lubos Lunak <l.lunak@suse.cz>

	* src/fccfg.c: (FcConfigUptoDate):
	However FcConfigUptoDate() doesn't seem to work. See the attached
	patch.  First there's an obvious misplaced parenthesis making it
	return always false, and second, even this call fails to detect font
	changes (e.g.  adding a new font to
	/usr/X11R6/lib/X11/fonts/truetype). The patch should fix that as
	well. The problem seems to be triggered by my fonts.conf specifying
	only /usr/X11R6/lib/X11/fonts , and therefore config->configDirs
	doesn't include subdirs, unlike config->fontDirs.

2004-06-03  Keith Packard  <keithp@keithp.com>

	* fontconfig/fontconfig.h:
	Remove comma at end of FcResult enum definition.

2004-05-29  Keith Packard  <keithp@keithp.com>

	* INSTALL:
	Add steps to md5sum release
2004-08-05 22:17:25 +00:00
wiz
4237d54a34 Unused. 2004-07-06 22:41:15 +00:00
dmcmahill
7e6a637bdd Update to 2.2.95 development release. Several bugs have been fixed,
in particular this fixes a problem where no font matches can be found
by gtk2 apps.  This should fix the problem where even the gtk-demo
program fails run.
2004-06-07 23:37:41 +00:00
dillo
3ad6fb7831 Update HOMEPAGE and MASTER_SITES. 2004-04-28 14:33:58 +00:00
adam
b25cfc9575 Changes 2.2.2:
* Changed #include syntax to follow new Freetype rules
* Made external compilation work
2004-04-27 15:09:10 +00:00
minskim
0fffcc439f Enable pkgviews installation. 2004-04-19 17:37:19 +00:00
jlam
6d92080aa2 Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
2004-03-29 05:43:28 +00:00
jlam
7db11b582a Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
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.
2004-03-18 09:12:08 +00:00
jlam
d0b4c54eb6 Split out the code that deals with checking whether the software is
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.
2004-03-10 17:57:14 +00:00
jlam
356defdb76 Add BUILDLINK_DEPENDS.<pkg> for dependencies in a section that is invoked
only if we're not using the built-in versions of the package.
2004-02-19 19:12:26 +00:00
jlam
555f2ef6ff Move the settings, which force the use of builtin versions of dependencies
if the builtin version of the package is being used, into a global
location so that they're always executed.
2004-02-19 18:51:01 +00:00
jlam
d51a733eeb If we're using the built-in version of the software, then we must also
be using built-in versions of any other software pulled in via
buildlink3.mk files.
2004-02-18 16:53:52 +00:00
jlam
bf6e059da4 Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
2004-02-18 16:35:27 +00:00
jlam
db721b59fc fontconfig had a really weird version numbering system. Version 2.0 is
practically verbatim with the "1.0.1" release that's in XFree86 4.3.x.
There have in fact been only function additions to the fontconfig API
since 2.0, so fontconfig has never actually had a bump in the shared
library major.  Therefore, allow "fontconfig>=1.0.1" as the base
requirement.
2004-02-18 14:58:37 +00:00
jmmv
167c65d18a When using the native version of this library, symlink the .pc file into
the buildlink directory so that pkg-config can find it.  Ok'ed by jlam@.
2004-02-17 16:27:54 +00:00
jlam
bf00d4220b Missing a "=" in the ">=". 2004-02-17 14:44:10 +00:00
jlam
0eb0b64bfb Don't include other buildlink3.mk files if we're just checking whether the
software is built-in.
2004-02-17 09:13:33 +00:00
jlam
aa4cae6de8 fontconfig is in the "fonts" category. 2004-02-16 22:47:23 +00:00
jlam
f7749f386b Typo. 2004-02-16 19:24:14 +00:00
jlam
e8ddff44ae Do the dance to check the version of the XFree86-provided fontconfig.
Also correct the list of buildlink2.mk files included by
fontconfig/buildlink2.mk.
2004-02-16 19:16:59 +00:00
jlam
a9a825bd0a The GNU configure script now only accepts --with-freetype-config to set
the location of freetype2 headers and libraries.
2004-02-16 19:15:21 +00:00
jmmv
ab17dd00b3 PKGCONFIG_OVERRIDE is relative to WRKSRC. 2004-02-14 18:26:26 +00:00
jlam
ec993afa1a 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.
2004-02-14 17:21:32 +00:00
jlam
c0b4f234f1 Don't try to build the docbook documentation. Fixes PR 24367. 2004-02-12 20:52:55 +00:00
reed
7baa7e4a1d Raise BUILDLINK_DEPENDS.freetype2 to at least 2.1.3.
Even 2.0.9 is not good enough for newer fontconfig; for example,
gtk2 won't buildlink correctly (and will use older X version of
include/freetype2/freetype/ftbdf.h) and libfontconfig needs
FT_Get_BDF_Property which is not defined.

No PKGREVISION bump is needed, because would not even build in
first place.
2004-02-09 20:20:43 +00:00
jlam
a7d877ca6a Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives
a value only once due to the multiple inclusion protection in the
bulldlink3.mk files.  In the case where a package includes several
buildlink3.mk files that each want a slightly different version of another
dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the
strictest <pkg> dependency to be matched.
2004-01-24 03:26:45 +00:00
jlam
6d445ed124 Append to BUILDLINK_DEPENDS.freetype2 so that if another package wants an
even newer version, it will still work.
2004-01-24 02:00:26 +00:00
jlam
fb501ae82b bl3ify 2004-01-24 01:57:01 +00:00
grant
398893a6b4 replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-22 08:36:03 +00:00