Commit graph

20 commits

Author SHA1 Message Date
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
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
agc
8cef6c454b Add RMD160 digests. 2005-02-23 23:11:54 +00:00
snj
9856a2258e Use bl3, USE_LANGUAGES=c c++, various other cleanup stuff. 2004-03-09 23:06:18 +00:00
grant
4390a2f42b replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-24 13:30:55 +00:00
agc
dc52048e01 Move WRKSRC definition away from the first paragraph in a Makefile. 2004-01-20 12:07:06 +00:00
xtraeme
c1355cc8c3 s/USE_X11BASE/USE_X11/. Provided by Soren Jacobsen in PR pkg/23455.
Bump PKGREVISION.
2003-11-18 14:34:33 +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
jlam
13cc963ef4 buildlink1 -> buildlink2 2002-09-24 08:33:07 +00:00
jlam
ab2d95c376 Strongly buildlink'ify, and use INSTALL_* variables instead of private way
of installing files into ${PREFIX}.
2001-12-05 04:29:32 +00:00
zuntum
37637e483f Move pkg/ files into package's toplevel directory 2001-11-01 00:47:39 +00:00
wiz
daff086c30 Move to sha1 digests, and/or add distfile sizes. 2001-04-21 02:08:16 +00:00
agc
fb467f5ac2 + move the distfile digest/checksum value from files/md5 to distinfo
+ move the patch digest/checksum values from files/patch-sum to distinfo
2001-04-17 11:22:34 +00:00
wiz
9f28a7693e Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-16 15:10:41 +00:00
tron
f0b9164cf1 Use "USE_XPM" option instead of direct dependence on the "xpm" package. 2000-08-23 23:14:21 +00:00
abs
df05aef71f Strip trailing '.', and/or leading '(a|an) ' 2000-01-05 15:37:50 +00:00
agc
a910a6fd62 Add package patch-sum files 1999-07-09 13:50:05 +00:00
agc
f6473207ca Replace all occurrences of USE_X11 with USE_X11BASE. This means "install this
package into ${X11BASE}".
Replace all occurrences of BUILD_USES_X11 with USE_X11. This means "use X11
headers and libraries to build this package".
1999-01-30 23:18:44 +00:00
garbled
cafe756656 Add new pkg for xnibbles-1.0b4
a winding snakes game for X11
1998-08-23 09:55:26 +00:00