This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
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
it will live with other "check" targets run after package installation.
Get rid of SHLIB_HANDLING, whose meaning had mutated over the years
from one thing to another. Currently, it is used to basically note
whether the system's "ldd" command can be usefully run on the package's
binaries and libraries. Rename this variable to CHECK_SHLIBS_SUPPORTED
for more clarity.
CHECK_SHLIBS is now a variable set exclusively by the user in /etc/mk.conf
to note whether the check for missing run-time search paths is performed
after a package is installed. It defaults to "no" unless PKG_DEVELOPER
is set.
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).
that these directories will be conditionally removed (based on reference
counts), regardless of the value of PKG_CONFIG. Bump the PKGREVISION
for packages that were modified as a result.
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files. Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
this, we only need some simple logic in java-env.mk to automatically
generate an ALTERNATIVES file for us.
There are two exceptions, though: fastjar and jikes (pointed out by tv@),
which do not use this file; they have to be handled manually.
Bump PKGREVISION for all affected packages.
While doing this, remove the java-wrapper package, obsoleted by the new
functionality provided by pkg_alternatives.
for quite some time after the ${PREFIX}/java migration. Since pkgsrc now
has proper symlink handling in pkg_install, this can now be a simple
PLIST entry rather than an @exec/@unexec pair.
lang/blackdown-jdk13
lang/jdk
lang/sun-jdk13
lang/sun-jdk14
Create a symlink from ${JAVA_HOME} to ${JAVA_HOME}/jre so that the proper
JDK hierarchy is found. This addresses PR 20269 by Todd Vierling
<tv at pobox dot com>. This makes misc/openoffice-linux find the Java2
installation again.
* Install with JAVA_HOME=${LOCALBASE}/java/jdk-1.1.8 instead of into
${LOCALBASE}/java/${PKGNAME}, which lead to the jdk installation moving
even when the PKGREVISION is bumped.
* Cosmetic updates to the package Makefile.
* Sort the PLIST.
subdirectories under ${PREFIX}/java/ -- Change II of many.
Thus, install this jdk in ${PREFIX}/java/jdk-1.1.8, remove
CONFLICTS with other JDKs/JREs and bump PKGREVISION.
pathnames in there.
+ Treat libXm separately from the rest of the libs, since (a) it needs a
separate "intermediate" symlink as well, even for ELF libs, and (b) it
uses a completely different version number from the rest of the libs,
for obvious reasons
themselves, in sync with the new PLIST style. Not tested on a.out
i386 platform, as I don't have one to hand.
Should address PR 12044, from Chris Jones.
