Commit graph

63 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
wiz
02f8f7c52d Bump BUILDLINK_ABI_DEPENDS.png and PKGREVISION for png-1.2.9nb2 update. 2006-04-17 13:45:57 +00:00
jlam
1cf9796f3c BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with
USE_TOOLS+=msgfmt.
2006-04-13 18:23:29 +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
11993b86ed Bump PKGREVISION for all packages that had broken INSTALL/DEINSTALL
scripts prior to revision 1.43 of bsd.pkginstall.mk.
2006-03-21 06:00:43 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
wiz
768c589c29 Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because
of the shlib major bump.
PKGREVISION++ for the dependencies.
2006-01-24 07:31:52 +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
jmmv
00fd54141f There is no need to set PYTHON to false in the configure environment, since
we already skip the checks from within patch-aa.
2005-06-06 18:37:22 +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
jmmv
97812b5faf Fix typo in gtk2 dependency (found by xtraeme@). 2005-03-22 18:23:13 +00:00
jmmv
db2e299cd4 Update to 2.5.1:
libglade-2.5.1: 11-February-2005
        - Fix toolbar breakage from the 2.4.1/2.5.0 releases.
        - Fix handling of GtkFileChooserDialog internal children.

libglade-2.5.0: 29-November-2004
	- Add support for GtkFileChooserButton, GtkIconView,
	  GtkAboutDialog and GtkMenuToolButton.
	- Register GtkFileChooserDialog correctly.
	- Fix a number of bugs in the libglade-convert utility.
	- Fix some memory leaks in the XML parsing code.
	- Handle tooltips on GtkToolItems properly, and get rid of uses of
	  the old toolbar API.
	- Fix some bugs in setting up ATK relations.
	- Various other bug fixes (see ChangeLog).
2005-03-22 15:57:32 +00:00
jmmv
32c6f27e89 Update to 2.4.2:
- Fix toolbar breakage from the 2.4.1 release.
- Fix handling of GtkFileChooserDialog internal children.
2005-02-26 17:23:12 +00:00
agc
4a3d2f7ce2 Add RMD160 digests. 2005-02-23 22:24:08 +00:00
jmmv
60eaeeb9b4 Drop python dependency. Python is supposed to be used by the libglade-convert
script, but as the package is currently missing another dependency, it's not
being installed.

Therefore, and as we haven't noticed any other package requiring this utility,
simply drop it completely.  (If it's needed some day, we can simply create a
package to install it, but depending on python here is not good.)

Bump PKGREVISION to 1.
2005-01-25 22:42:49 +00:00
jmmv
aef5c8ce0f Update to 2.4.1:
- Register GtkFileChooserDialog correctly.
- Fix a number of bugs in the libglade-convert utility.
- Fix some memory leaks in the XML parsing code.
- Handle tooltips on GtkToolItems properly, and get rid of uses of
  the old toolbar API.
- Fix some bugs in setting up ATK relations.
- Various other bug fixes (see ChangeLog).
2004-12-28 21:41:45 +00:00
reed
bba7bbd21b Revert back BUILDLINK_RECOMMENDED to previous setting.
Probably I was using the packages made when using IGNORE_RECOMMENDED=YES
after the big libtool bump.
2004-12-25 06:43:38 +00:00
reed
e55de9f0ad Bump PKGREVISION and also bump the BUILDLINK_RECOMMENDED.libglade2
to latest, because it was never bumped before when one of its
NEEDED shared libraries was upgraded.
2004-12-24 08:04:26 +00:00
reed
d59acceaec Add a BUILDLINK_RECOMMENDED.libglade2 for at least 2.3.6nb1.
The BUILD_DEPENDS dates back to September and so
libglade shared libraries from then need old (no longer existing)
libxml, pango, and gtk2 libraries.

I noticed this when installing packages on a machine that already had
the (what it thought was) correct dependencies.
2004-12-24 00:09:06 +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
jmmv
aa99bc3546 Update to 2.4.0: the code has been marked as stable and some cleanups have
been done.
2004-09-02 12:14:29 +00:00
snj
f8c1b0bf77 No longer used. 2004-05-03 21:19:03 +00:00
jmmv
7c2abf1d76 Handle the lib/libglade and lib/libglade/2.0 directories properly during
print-PLIST.
2004-04-20 16:14:03 +00:00
jmmv
10b530e852 Require glib2 >= 2.4.0nb2 to get the dlopen(NULL, 0) workaround, because
this functionality is used by this library.  Bump PKGREVISION to 1.
2004-04-17 10:39:23 +00:00
jmmv
ed9518df0d Update to 2.3.6:
libglade-2.3.6: 10-March-2004
- Implement support GtkComboBoxEntry, GtkToolItem, GtkToolButton,
  GtkToggleToolButton, GtkRadioToolButton & GtkSeparatorToolItem (Damon
  Chaplin)
- Fix automake warning (Steve Chaplin)
- Add libglade version number to the docs (Matthias Clasen)
- Fix usage of C++ keyword as an argument name (Bas Driessen)
- Allow additional signal parameter for glademm (Christof Petig)
- Support tooltips in toolbars (Michael Voigt)

libglade-2.3.2: 15-January-2004
- Support disambiguating msgids by prefixing them with a context
  string. (Christian Stimming, Matthias Clasen)

libglade-2.3.1:  14-November-2003
- Register GtkColorButton, GtkComboBox, GtkFileChooser and
  GtkFontButton types (Jonathan Blandford)
- Implemement support for GtkExpander (Mark McLoughlin)
- Fix memory leak and incorrect colour map usage (Morten Welinder)
- Win32 build support (Tor Lillqvist, Masahiro Sakai)
- Build fixes (James Henstridge, Michael Meeks)
2004-04-01 18:16:46 +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
9ff0e10340 Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-03-05 19:25:06 +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
jmmv
a3fcb0717e This needs pkgconfig. 2004-02-12 15:17:49 +00:00
xtraeme
83c0134322 bl3ify 2004-02-11 01:23:36 +00:00
jmmv
39bd9e1ae9 Bump PKGREVISION due to xmlcatmgr update to 2.0beta1 2004-01-23 17:18:31 +00:00
reed
6d9af8d68d Bump package revisions for tiff update.
Tiff is backward compatible, but was broken on amd64 platform
so this makes sure new tiff is used.
2004-01-03 18:49:33 +00:00
wiz
391b5798e6 Bump PKGREVISION for atk library major bump. 2003-12-13 00:45:21 +00:00
xtraeme
f794de2624 Bump PKGREVISION (libxml2, libxslt and imlib2 were updated). 2003-12-04 19:48:24 +00:00
recht
1ff9e4f91f Add missing PKGCONFIG_OVERRIDE.
Bump PKGREVISION because of the changed *.pc files.
ok'ed by wiz@
2003-09-23 12:18:53 +00:00
grant
dfba081206 s/gui/GUI/ 2003-08-10 03:15:28 +00:00
grant
4083b24390 s/netbsd.org/NetBSD.org/ 2003-07-17 21:31:04 +00:00
wiz
43fa0c7cb6 PKGREVISION bump for libiconv update. 2003-07-13 13:50:19 +00:00
jmmv
f1446ddf2b Drop trailing whitespace. Ok'ed by wiz. 2003-05-06 17:40:18 +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
jmmv
87abcff522 Use the XML_ENTRIES variable provided by textproc/xmlcatmgr/catalogs.mk
to register the provided DTD.  Bump PKGREVISION.
2003-01-29 20:28:31 +00:00
jmmv
cc2c03c6c9 Install under LOCALBASE. All GNOME2 stuff is installed in this location,
and this one can't be an exception.  Bump PKGREVISION to 6.
This fixes problems shown in last Hubert's bulk build.
2003-01-12 19:48:34 +00:00
jmmv
67a21559ad Oops, the new -c argument was added in the wrong place, fix it. 2003-01-11 21:14:43 +00:00
jmmv
3796179ed2 Tell xmlcatmgr which catalog to modify. Bump PKGREVISION to 5, because of
latest changes in the xmlcatmgr package.
2003-01-11 21:12:02 +00:00