Commit graph

22 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
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
wiz
b8e0eb28f4 Remove FreeBSD RCS Ids. pkgsrc has diverged too much for syncing to be
useful.
2005-03-24 21:12:50 +00:00
taca
0f010b9a66 Bump PKGREVISION with introduce of ruby16-base/ruby18-base pacakge. 2005-03-06 17:19:05 +00:00
wiz
393af94024 Add RMD160 checksums to the SHA1 ones. 2005-02-23 17:36:09 +00:00
taca
9635da7103 Oops, fix path name in patch-aa. 2005-01-24 03:06:56 +00:00
taca
34b2e8ca73 Update to Ruby 1.8.2 base and this change:
* ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
2005-01-23 17:36:59 +00:00
taca
05a0ff5ab1 Switch to use RUBY_DLEXT as suffix of extention library. 2004-12-04 17:20:46 +00:00
taca
d3eb9e68f8 Update ruby-tcltk pacakge to 1.8.1 with new framework for Ruby packages. 2004-11-27 14:50:12 +00:00
taca
61ee4e388d Revert ruby-tcltk package to use tcl83.
Unfortunately, Ruby has problem with thread library even if recent
release of 1.8.1.  So, a program using ruby's library shouldn't link
with thread library.

Bump PKGREVISION.
2004-03-29 07:55:25 +00:00
minskim
7fa907333d Switch to Tcl/Tk 8.4. OK'ed by taca@.
Bump PKGREVISION.
2004-03-16 23:54:25 +00:00
taca
d428fd9d93 Add ruby to CATEGORIES. 2004-03-16 02:01:09 +00:00
taca
4ebeb28b9f Bump pacakge revision with ruby-base package's update. 2004-03-12 05:02:55 +00:00
minskim
2827f5b2d8 Enable tk84 and replace x11/tk with x11/tk83. Packages compatible
with 8.4 will be updated to depend on x11/tk after Tk update.
2004-03-08 20:27:13 +00:00
minskim
ac690cf634 Replace lang/tcl with lang/tcl83. Packages compatible with 8.4 will
be updated to depend on lang/tcl after Tcl/Tk update.
2004-03-08 19:52:50 +00:00
agc
24a46ed346 Move WRKSRC definition away from the first paragraph in a Makefile. 2004-01-20 12:28:26 +00:00
sketch
c9989faa7d Bump PKGREVISION for packages which install files into RUBY_ARCHLIBDIR,
which has changed for Solaris installs.
2003-12-19 12:04:20 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +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
taca
3da93261cf Update ruby-tcltklib to ruby 1.6.6 based. 2001-12-30 16:24:58 +00:00
zuntum
d3db18607d Move pkg/ files into package's toplevel directory 2001-10-31 22:03:21 +00:00
taca
01854af618 Importing Ruby interface to Tcl/Tk libraries.
This will be part of ruby meta-package.
2001-06-30 08:19:52 +00:00