diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-05 04:32:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-05 04:32:10 +0000 |
| commit | bb74d3bb13a575c8daf48ec498241f861b6a695c (patch) | |
| tree | 277a5763fbfdd2b78add7ae1a7e7f936b5fa447a /mk/bsd.pkg.use.mk | |
| parent | 5dd869d58bce9ac77979e476e6e2743bbacce7dd (diff) | |
| download | pkgsrc-bb74d3bb13a575c8daf48ec498241f861b6a695c.tar.gz | |
Teach the tools framework about the following new tools:
itools, intltool, diff3, sdiff, msgmerge
* Adding USE_TOOLS+=itools to a package Makefile will cause the
tool-directory versions of imake, makedepend, mkdirhier and xmkmf
to point to the ones from the devel/nbitools package.
This change will remove the need for nbitools/buildlink3.mk, which
currently does a bit of hackery to force the "right" imake tools to
be used by packages that need it.
* Adding USE_TOOLS+=intltool to a package Makefile will cause the
local versions of intltool-* inside ${WRKSRC} to be replaced by
copies from the textproc/intltool package. If "intltool" is not
specified as a tool, then we create "broken" intltool-* tools in
the tools directory to help highlight hidden dependencies on the
intltool package.
In addition, modify the tools framework so that if "perl" is not
specified as a tool, then we create a "broken" perl tool in the
tools directory for the same reason as for "intltool".
These two changes together will remove the need for
intltools/buildlink3.mk and should also catch all cases where the
sources' intltools may have been silently used because perl was
found on the system.
* Adding USE_TOOLS+=diff3, USE_TOOLS+=sdiff, or USE_TOOLS+=msgmerge
to a package Makefile will cause the corresponding tool to be pulled
into the tools directory.
These are convenience tools to help simplify dependencies for some
packages.
Diffstat (limited to 'mk/bsd.pkg.use.mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 787471604b5..0851aa33b44 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.34 2006/06/03 23:11:42 jlam Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.35 2006/07/05 04:32:10 jlam Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -24,8 +24,11 @@ PLIST_SUBST+= IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX:Q} PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q} .endif -.if defined(USE_IMAKE) +.if defined(USE_IMAKE) && empty(USE_TOOLS:Mitools) USE_X11BASE?= implied +.endif + +.if defined(USE_IMAKE) MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .endif @@ -98,6 +101,7 @@ LIBTOOL_OVERRIDE?= libtool */libtool */*/libtool .if (defined(USE_X11BASE) || \ defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake) || \ !empty(USE_TOOLS:Mimake\:*:Nimake\:pkgsrc)) && \ + empty(USE_TOOLS:Mitools) && \ empty(PKGPATH:Mpkgtools/xpkgwedge) && \ !empty(USE_XPKGWEDGE:M[yY][eE][sS]) BUILD_DEPENDS+= xpkgwedge>=${_XPKGWEDGE_REQD:U1.15}:../../pkgtools/xpkgwedge |