Commit graph

38 commits

Author SHA1 Message Date
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
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
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
wiz
a41bf2b7b2 Add missing file+dir to PLIST. Bump PKGREVISION. 2006-02-22 20:58:01 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
rillig
b71a1d488b Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
2005-12-05 20:49:47 +00:00
tron
f66c5f2ae1 Update comment about architectures using "ocamlopt" and check the
architectures only once.
2005-07-30 15:45:11 +00:00
tron
cf4abd9f8c Synchronize platforms which support optimization with the "ocaml" package.
This should fix the "configure" problems in the "mldonkey-gui" package.
2005-07-30 13:48:26 +00:00
hira
10db67de5d Add missing RCS Id tag to patch-aa. 2005-06-16 13:09:34 +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
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
wiz
393af94024 Add RMD160 checksums to the SHA1 ones. 2005-02-23 17:36:09 +00:00
dillo
0893183d09 regen for patch-aa. noted by wiz 2005-02-09 17:58:17 +00:00
dillo
73a078f40a Commit patch from PR 29219 (Linux install fix), untested as I have
no Linux withpkgsrc.
2005-02-09 15:22:30 +00:00
dillo
d172dfa528 Drop maintainership. 2005-02-09 15:17:27 +00:00
adrianp
0e9f2ac695 - update of lablgtk from 1.2.6 to 1.2.7
- ok'ed dillo@

2002.10.30
  * add GWindow.file_selection#dir_list  (Francois Pessaux)
2005-02-04 22:47:24 +00:00
jmmv
42bf039418 Undo previous, now that ocaml has some wrappers that handle the problem
for us.
2004-12-24 18:49:35 +00:00
jmmv
6d54efda39 Make sure the rpaths reach the compiler; otherwise, lablgtk can't find the
X11 libraries.

I suspect this was not noticed before because the whole ocaml was linked
against these libraries, so they were pulled in at runtime anyway.
2004-12-24 18:33:09 +00:00
jmmv
c33d2074af Adjust dependencies after ocaml has been splitted into three different
packages: ocaml, ocaml-graphics and labltk.  Bump PKGREVISION.
2004-12-24 17:21:01 +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
wiz
c09ed9e57d Unused. 2004-05-03 22:27:33 +00:00
tron
26d44a0171 Fix some issues:
- add a full dependence on the "ocaml" package because this packages shares
  its directory structure
- remove support for handling "ocaml" package without threading support,
  because it is no longer necessary
Bump package revision because of these changes.
2004-04-22 09:20:31 +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
430351a890 Conform to template in revision 1.101 of bsd.buildlink3.mk. 2004-03-06 23:46:06 +00:00
wiz
ac10c147b4 Update lablgtk to 1.2.6:
* fixed a problem of SpinButton.get_value_as_int for the case of
    the value is minus' src/gtkEdit.ml (Jun Furuse)
  * ocamllex is abstracted by CAMLLEX in Makefiles (Jun Furuse)
  * more parametrizations in config.make.nt (Jun)
  * added the selection method to clist. (Jun)
  * Glib.Io.add_watch returns event source, so that we can remove it later (J)
  * added Glib.Io.read (J)
  * added a new module Gdk.Input (J)
  * various improvements to GtkText (Antoine Mine)
  * fix Glib.IO (Henri Dubois-Ferriere)
  * fixes in ml_gdk.c: win32 and ClientData
  * GtkThread.main switches GtkMain.Main.main to call GtkThread.thread_main
  * added GList.clist#get_row_state and GWindow.file_selection#file_list
    (by Francois Pessaux)
  * added META (by Stefano Zacchiroli)
  * fixed applications/camlirc (Tim Freeman)
  * add gdk_property_*
  * fix GdkPixbuf.create_pixmap
  * add GdkEventClient (requested by Didier le Botlan)
  * add Gdk.Window.get_pointer_location (Tim Freeman)
2004-03-04 16:13:35 +00:00
grant
9b4feec99c replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-24 15:30:32 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +00:00
wiz
43fa0c7cb6 PKGREVISION bump for libiconv update. 2003-07-13 13:50:19 +00:00
tron
504afeddda Fix package list for system where "ocaml" with compiled with threading
support. Bump package revision to reflect change.
2003-06-24 14:09:53 +00:00
wiz
7166660e08 Dependency bumps, needed because of devel/pth's major bump, and related
dependency bumps.
2003-05-02 11:53:34 +00:00
dmcmahill
4bd5f5d5c2 Make this go on non-i386 systems. Currently ocamlopt is only available
on i386 so avoid using that on non-i386 systems.  Compiles and seems to work
on alpha.
2003-03-17 11:56:22 +00:00
salo
8ae430e40c s/INSTALL_*/BSD_INSTALL_*/ in patch-aa, remove unnecessary MAKE_ENV. 2003-01-19 10:59:00 +00:00
dillo
a7e8c2606c build and install native version 2002-10-16 17:24:45 +00:00
dillo
a04d56660d fix BUILDLINK_PKGSRCDIR.lablgtk, spotted by wiz 2002-10-16 16:45:37 +00:00
dillo
de5e4646ea initial import of lablgtk 1.2.5
LablGTK is is an Objective Caml interface to gtk+.
2002-10-16 16:40:24 +00:00