Commit graph

55 commits

Author SHA1 Message Date
jlam
47b3573672 Allow the last known version information to match all future versions of
XFree86 until we know for certain that it's different.  This makes us more
bulletproof to updates in xsrc.
2004-03-30 17:10:16 +00:00
jlam
88588c9c0b Use "XF86_VERSION" instead of "_XF86_VERSION" as the variable name since
we use it in several places within pkgsrc as a public variable.
2004-03-30 17:04:06 +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
recht
4de5532b13 Use tab instead of spaces for indentation to make pkglint happy. 2004-02-29 00:22:43 +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
7c786e9ed4 Check the version of the XFree86-provided Xft2 library. 2004-02-17 16:48:45 +00:00
jlam
a341a51bdd Typo. 2004-02-16 22:55:24 +00:00
jlam
f8b4024272 Xft2 only needs Xrender>=0.8. 2004-02-16 21:05:57 +00:00
jlam
4669f7fef1 Remove patches made redundant since we override libtool. 2004-02-16 21:05:13 +00:00
jlam
a567665fad 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.
2004-02-16 12:49:29 +00:00
minskim
7a47c8d303 Sync required Xrender version with that in Makefile. 2004-02-14 20:43:27 +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
1b2674fcd7 The BUILDLINK_DEPENDS.<pkg> lines should match between the buildlink3.mk
and any pre-existing buildlink2.mk files.
2004-02-10 20:45:01 +00:00
jlam
bbdd151ce7 BUILDLINK_DEPENDS.<pkg> lines should _always_ use += to _append_ to the
existing value.  This is critical to set the correct list of dependencies
for a package.
2004-02-09 23:56:32 +00:00
xtraeme
ad5aa60d5d bl3ify, enable libtool now we have 1.5.2, remove useless PLIST_SUBST. 2004-02-09 04:17:28 +00:00
recht
9843bb9f40 add buildlink3.mk (needed by graphics/cairo)
noted by xtraeme@
2004-02-03 14:29:29 +00:00
grant
398893a6b4 replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-22 08:36:03 +00:00
recht
09bc9903f8 regen after previous patch removal 2003-12-20 10:02:06 +00:00
recht
320392b805 remove freetype2 2.1.17 related patches after freetype2 has been reverted
to 2.1.15
2003-12-19 14:34:18 +00:00
recht
5711082f24 fix build with new freetype 2003-12-18 16:28:34 +00:00
recht
a24cdf520e Xft2 needs Xrender >= 0.8.2, so depend on it. 2003-11-09 12:33:51 +00:00
jdolecek
c640eaadc7 depend on Xrender 0.8 (rather than 0.8.2), so that the Xrender bundled
with XFree 4.x would match the dependency (if present)
2003-11-07 20:19:46 +00:00
reed
205eb5c3f7 Make sure that correct xft-config is used. (Discussed
on tech-pkg and okay'd by wiz off-list.)
2003-11-02 00:58:18 +00:00
dmcmahill
b87989e965 change the libtool (1.5) versioning from linux to sunos on Solaris to
avoid PLIST problems. No effect on other operating systems.
2003-10-31 03:10:07 +00:00
xtraeme
7eb99a0106 Add a comment explaining why we have to use PLIST_SUBST over FreeBSD/Linux.
(Suggested by seb@)
2003-10-04 08:12:02 +00:00
xtraeme
10b66df982 Fix installation on systems where libXft.so.$(MAJOR_VERSION).$(MINOR_VERSION)
was not built (at least FreeBSD/Linux).
2003-10-03 20:13:52 +00:00
grant
8e755fb517 quote EGREP in MAKE_ENV. 2003-09-27 18:50:11 +00:00
grant
1f409dd46a this needs zlib, so include devel/zlib/buildlink2.mk. 2003-09-27 15:41:53 +00:00
recht
08419aa147 Add missing PKGCONFIG_OVERRIDE.
Bump PKGREVISION because of the changed *.pc files.
ok'ed by wiz@
2003-09-22 21:55:55 +00:00
wiz
a07227d893 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.
2003-09-19 17:23:16 +00:00
markd
838dea21aa Update Xft2 to version 2.1.2.
Not sure of precise changes but does again build correctly against the
current fontconfig package.
2003-09-19 15:46:51 +00:00
grant
cee5402dfd use += for USE_GNU_TOOLS. 2003-09-19 01:56:45 +00:00
drochner
ee3a6dc4ba USE_GNU_TOOLS=awk 2003-08-02 13:45:22 +00:00
grant
8aea3201dc get a working awk on Solaris, sort includes. 2003-07-30 15:41:10 +00:00
grant
4083b24390 s/netbsd.org/NetBSD.org/ 2003-07-17 21:31:04 +00:00
jschauma
e366d0c694 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.
2003-06-02 01:15:31 +00:00
jmc
6a7b453074 One more pass to make sure freetype versions get included correctly when
also using Xft2/fontconfig
2003-03-29 19:11:06 +00:00
jmc
08851ece92 Clean up freetype2 requirements so Xft2 and fontconfig also require the right
version via buildlink'ing
2003-03-29 19:00:18 +00:00
jmmv
0916498c1b Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz. 2003-03-29 12:40:00 +00:00
tron
a62d25bc20 Revert last change because XFree86 4.3.0's "fontconfig" and "Xft" library
are linked with the bundled "expat" library which is quite old. This would
lead to shared library conflicts sooner or later.
2003-03-18 13:56:31 +00:00
tron
cae2631eb6 Use XFree86 4.3.0's "Xft2" if available. 2003-03-13 20:40:01 +00:00
jmmv
87f161a502 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.
2003-03-09 13:26:53 +00:00
jmc
1f16aba201 Bump PKGREVISION 2003-03-09 06:13:30 +00:00
jmc
296f4dd375 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
2003-03-08 23:49:27 +00:00
wiz
2b4114e17b Add libXft.so, noted missing by HIRATSUKA Kouichirou in PR 20182. PKGREVISION++ 2003-02-03 17:41:08 +00:00