Commit graph

96 commits

Author SHA1 Message Date
wiz
e1cc9cb651 Fix .pc file to include X11 dir in rpath. Bump PKGREVISION. 2007-01-03 22:12:25 +00:00
joerg
5e43280b23 Replace mk/bsd.prefs.mk includes with bsd.fast.prefs.mk includes.
The redundant parsing of bsd.prefs.mk is mostly avoided now and
parse time e.g. for x11/kdebase3 gets reduced by up to 10%.
2006-12-12 21:52:34 +00:00
joerg
f75176b39c 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".
2006-10-09 12:52:34 +00:00
reed
e1ad5d86e3 Conflict with libXrender (currently in pkgsrc-wip).
This version of Xrender 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.
2006-07-31 21:27:46 +00:00
joerg
2e9212ffa1 Partly backout: Xrender and Xrandr are not provided by xorg-libs. 2006-07-12 12:31:01 +00:00
joerg
19338c63c5 Don't use the builtin framework for the various Xorg components
when X11_TYPE=xorg. Let them include x11.buildlink3.mk directly.
Remove the manual USE_BUILTIN declarations from xorg-libs/b3.mk.
This fixes a symmetry in the dependency list depending on whether
xorg-libs is installed already or not.

Discussed with jlam@
2006-07-11 14:42:03 +00:00
jlam
c16221a4db Change the format of BUILDLINK_ORDER to contain depth information as well,
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
2006-07-08 23:10:35 +00:00
jlam
9430e49307 Track information in a new variable BUILDLINK_ORDER that informs us
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.
2006-07-08 22:38:58 +00:00
reed
e422a7df78 Fix typo or mispelling. 2006-04-22 02:57:31 +00:00
reed
7f11dab227 Change to use new mainatined *proto headers instead of
unmaintained *ext packages.
In some cases, the headers are identical.

I tested on DragonFly using X11_TYPE=xorg and on NetBSD
using native XFree86 (and more).
2006-04-18 19:23:46 +00:00
rillig
96fc47c14f Aligned the last line of the buildlink3.mk files with the first line, so
that they look nicer.
2006-04-12 10:26:59 +00:00
reed
5abef9be14 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).
2006-04-06 06:21:32 +00:00
jlam
d71a98aa8e Avoid extra stat() calls by not repeatedly checking whether a file
exists on the disk -- we can just check whether a variable defined by
find-files.mk is "__nonexistent__" or not.
2006-03-30 18:06:17 +00:00
jlam
9c8b5ede43 Point MAINTAINER to pkgsrc-users@NetBSD.org 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.
2006-03-04 21:28:51 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
wiz
16a1ea46a4 Update to 0.9.0:
Update to protocol 0.9 which includes RenderAddTraps request.
2005-10-15 16:37:21 +00:00
jmmv
89179b8abb Fix previous (finally, I hope): do not check for the existence of the .pc
file using make constructions, as BUILDLINK_PREFIX.Xrender is not defined
at this point.  Delay evaluation until the target is executed by using
shell code.
2005-10-09 21:30:55 +00:00
jmmv
1813b60c95 Fix some problems in xrender.pc generation. 2005-10-08 10:17:44 +00:00
jmmv
021e40e8d0 When using the Xrender builtin, generate a fake pkg-config file in the
buildlink directory (or use the one provided by the X11 installation, if
any) so that packages needing this file can use it.  Should fix build
problems of applications using cairo (whose cairo.pc file needs xrender.pc).
Reported in tech-pkg@ by Ian Zagorskih.

Note that this solution is suboptimal, although we are already using it
in xextensions.  If someone wants to use, e.g., cairo outside pkgsrc, he
won't be able to because its .pc file won't be able to find xrender.pc...
2005-10-07 19:40:11 +00:00
reed
4ee6e716a4 Fix MASTER_SITES as the old site does not exist anymore.
This is from Leonard Schmidt via tech-pkg.
2005-09-07 16:49:40 +00:00
jlam
7820875fff 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.
2005-08-10 20:56:10 +00:00
wiz
d774725534 Change path from devel/pkgconfig to devel/pkg-config.
No PKGREVISION bump since pkg-config is only a BUILD_DEPENDS.
2005-07-21 16:29:42 +00:00
grant
57f0ab7840 check variable is defined before testing its value. 2005-07-09 04:36:42 +00:00
jlam
6d3ef740cb render doesn't require X11 to build, but Xrender does, so move the
inclusion of x11.buildlink3.mk from render into Xrender.
2005-06-06 19:08:56 +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
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
xtraeme
bd7351b254 Look for XORG_VERSION_* defs from ${X11BASE}/lib/X11/config/xorgversion.def
before xorg.cf, which in xorg from pkgsrc does not contain them.
(This is required by our xorg-* packages).
2005-03-01 18:56:43 +00:00
wiz
393af94024 Add RMD160 checksums to the SHA1 ones. 2005-02-23 17:36:09 +00:00
sketch
9a6f4c6ef2 Backout previous, the root cause has been fixed via pkgtools/x11-links. There
were going to be far too many packages requiring small tweaks like this one.
2004-11-11 17:49:07 +00:00
sketch
c1fc13a3ae Turn on ANSI when compiling with SunPro to work around certain revisions of
OpenWindows headers which incorrectly check __STDC__ and lead to macro
concatenation breakage with the SunPro compiler.
2004-11-11 13:47:32 +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
cbf9e7c372 update to libXrender-0.8.4
changes:
bug-fixes only
2004-08-05 22:19:17 +00:00
grant
a8c0d67d4f handle X.org 6.7 and treat it the same way as XFree86 4.4 for the
moment.
2004-07-25 07:34:38 +00:00
wiz
4237d54a34 Unused. 2004-07-06 22:41:15 +00:00
jlam
e8132b3fbf Relinquish maintainership of packages to tech-pkg@NetBSD.org. 2004-04-24 22:46:08 +00:00
minskim
0fffcc439f Enable pkgviews installation. 2004-04-19 17:37:19 +00:00
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
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