the new version of xpkgwedge. Changes from xpkgwedge 0.4:
* Redefine ImakeCmd to "imake -I$(PREFIX)/lib/X11/config" to
pick up X11 config files in $(PREFIX)/lib/X11/config before the
ones in the standard X11 tree.
* Install a program called "pkgxmkmf" that's actually xmkmf, but
checks in $(PREFIX)/lib/X11/config before the standard X11 config
directory.
* Create the host.def file in $(PREFIX)/lib/X11/config instead of
always in ${X11BASE}/lib/X11/config.
The benefits of this are:
1) xpkgwedge can now install into $(PREFIX) instead of always into
$(X11BASE).
2) Keeps the X11 tree "pure", and doesn't affect people who want
to run xmkmf and not include all the xpkgwedge stuff, even if
it's installed.
3) Packages that install config files (lesstif, xview-config) can
now do so in $(PREFIX).
4) People only have to use 'pkgxmkmf' instead of 'xmkmf', and
(hopefully) no other changes, if they want to use the config
files in xpkgwedge'd packages.
odd numbers for 'development' versions...
lintpkgsrc:
Rename set_pkgsrcdir to parse_mk_conf, and also extract PACKAGES as well
as PKGSRCDIR. Update check_prebuilt_packages to handle the new package data
structure that allos mulitple versions of the same package to be valid
(for -current packages etc) - Missed in previous changes.
lintpkgsrc tried to break DEPENDS up into a packagename and version
section, so if the version did not match it could lookup the matching
packages and suggest valid versions. Unfortunately this excessive
helpfulness meant globs that cover both sides such as
'perl-{5.0*,5.6.0nb2,base-5.[6-9]*}' gave it a certain degree of
indigestion. It also didn't handle the '.if ${BINNAME} != common'
correctly in www/ns-plugger-common/Makefile.
I believe now that any outstanding -i or -d warnings are genuine...
Rework substitution handling to correctly deal with
${DISTNAME:S/-/-gnome-/:S/$/nb1/} and friends. I remember being
in something of a hurry when that code was fist written. Slight
cleanup to not completely blow up on DEPENDS such as
perl-{5.0*,5.6.0nb2,base-5.[6-9]*}, though we still do not
handle globbing that includes packagename and version.
Update to 2.22
Major changes: .include lines are honoured now, and FILESDIR, PATCHESDIR,
PKGDIR, SCRIPTSDIR, MD5_FILE, and PATCH_SUM_FILE aren't hardcoded anymore,
but the corresponding Makefile variables are used.
Adapt lintpkgsrc to the changes.
Step to 2.20 to mark the occasion.
Reviewed by hubertf.
bsd.pkg.mk target, which was changed as part of the bulk package
infrastructure additions.
To protect against this happenning again, define a compile-time
definition called PACKAGE_DEPENDS_TARGET, which is by default
"run-depends-list", so that we can specify the bsd.pkg.mk target
at compile-time.
* should not cause any conflicts with the new bulk-package targets,
* didn't contain a reason for why they were disabled or
* were disabled for some false reason (and a IGNORE/BROKEN in the pkg's
Makefile would be more appropriate)
Change is a bug-fix - when finding out the pre-requisite packages, use
the "package-depends" target instead of "depends-list". Bug and fix
pointed out by Bernd Ernesti.
This includes a buffer overflow bug fix in pkg_add which was causing pkg_add
to segfault on teTeX on pmax. The bug was present on all ports though. As
far as I can tell this was a non-exploitable overflow.
(Users can still set it if they want, but it won't make much
difference).
In bsd.pkg.mk, check for the presence of the xpkgwedge package to
determine whether to use LOCALBASE for X11 programs. Set
_USE_LOCALBASE_FOR_X11 (an internal definition) if xpkgwedge is
installed. Remove BUILD_DEPENDS on xpkgwedge (it would always have
been true anyway).
Add a new X11PREFIX definition, which reflects the PREFIX for X11
packages, and set it to LOCALBASE or X11BASE accordingly.
Remove all references to USE_LOCALBASE_FOR_X11 from the xpkgwedge
package.
In all, make the installation of xpkgwedge a tad less clumsy.
Patch submitted by Thomas Klausner in private mail.
* Mention that the user has to create pkg/COMMENT and pkg/DESCR manually
This file should probably be moved to pkgsrc...
* Properly recognize .tar.bz2 archives (Patch by Antti Kantee <pooka@iki.fi>)
* Some old configure scripts don't understand --version and may nuke
our just-generated Makefile. Prevent this by cd'ing into $WRKSRC.
