CVS commit: pkgsrc/mk

[Jeremy C. Reed]

Module Name: pkgsrc
Committed By: reed
Date: Sat May 6 03:28:45 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk
pkgsrc/mk/buildlink3: bsd.buildlink3.mk

Log Message:
If USE_ABI_DEPENDS=no, do not add the BUILDLINK_ABI_DEPENDS.$pkg
to BUILD_DEPENDS. (I posted about this to pkgsrc-users on April 14.)


To generate a diff of this commit:
cvs rdiff -r1.1820 -r1.1821 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.174 -r1.175 pkgsrc/mk/buildlink3/bsd.buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Todd Vierling]

Module Name: pkgsrc
Committed By: tv
Date: Sat May 6 15:20:05 UTC 2006

Modified Files:
pkgsrc/mk: compiler.mk

Log Message:
Force unrequested languages to be unavailable by setting them to ${FALSE}.
This way, missing language dependencies will be caught at build time.

(Tested without problems on several C++ packages by unsetting LANGUAGES in
them. I don't have a machine fast enough to bulk build, but I shall be
watching the next round on pkgsrc-bulk to fix what I may not know about
right now.)


To generate a diff of this commit:
cvs rdiff -r1.47 -r1.48 pkgsrc/mk/compiler.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Joerg Sonnenberger]

Module Name: pkgsrc
Committed By: joerg
Date: Mon May 8 21:29:07 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.check.mk

Log Message:
CHECK_FILES is now active by default for PKG_DEVELOPER.

"Just commit it whenever you want" -- jlam


To generate a diff of this commit:
cvs rdiff -r1.30 -r1.31 pkgsrc/mk/bsd.pkg.check.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Matthias Scheler]

Module Name: pkgsrc
Committed By: tron
Date: Tue May 9 10:05:04 UTC 2006

Modified Files:
pkgsrc/mk: apache.mk

Log Message:
Make the "apache2" package the default. Apache 1.3.x is very outdated.


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 pkgsrc/mk/apache.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Min Sik Kim]

Module Name: pkgsrc
Committed By: minskim
Date: Wed May 10 07:25:03 UTC 2006

Modified Files:
pkgsrc/mk: java-vm.mk

Log Message:
Allow to use sun-jdk15 on Darwin-8, and sun-jdk14 on Darwin-[678].
Also make sun-jdk15 the default java on Darwin-8. This addresses PR pkg/32013.


To generate a diff of this commit:
cvs rdiff -r1.45 -r1.46 pkgsrc/mk/java-vm.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Wed May 10 16:09:08 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.check.mk

Log Message:
Made the "check-files" target work even when PREFIX is a symlink by
searching in "${PREFIX}/." instead of ${PREFIX} alone. To get the same
output as before, each "/./" is replaced with "/" in the output.


To generate a diff of this commit:
cvs rdiff -r1.31 -r1.32 pkgsrc/mk/bsd.pkg.check.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Wed May 10 17:53:35 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Fixed some pkglint warnings in the do-configure, do-build, do-test and
do-install targets. This fixes an endless loop occuring when running "make"
in regress/make-quoting.


To generate a diff of this commit:
cvs rdiff -r1.1821 -r1.1822 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Thu May 11 22:13:19 UTC 2006

Modified Files:
pkgsrc/mk: compiler.mk

Log Message:
Make build failures due to the previous commit less mysterious by using
a wrapper script that emits a hint of what went wrong.


To generate a diff of this commit:
cvs rdiff -r1.48 -r1.49 pkgsrc/mk/compiler.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Post by Jeremy C. Reed
Module Name: pkgsrc
Committed By: jlam
Date: Thu May 11 22:13:19 UTC 2006
pkgsrc/mk: compiler.mk
Make build failures due to the previous commit less mysterious by using
a wrapper script that emits a hint of what went wrong.

Nice try, but it doesn't give any hint to me. After commenting out the
USE_LANGUAGES line in wm/icewm/Makefile.common I get:

===> Configuring for icewm-1.2.25
=> Fixing locale directory references.
WARNING: [subst.mk] Ignoring non-text file "./src/Makefile.in".
configure: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used.
configure: error: C++ compiler cannot create executables
See `config.log' for more details.
*** Error code 77


I cannot see any hint here. What about printing the warning (which is
currently in config.log) also to the terminal, so the user can see it
more directly?

By the way, I would prefer to only create the fail-wrappers when
PKG_DEVELOPER is set. For a typical user (even more for unexperienced
users) this is just annoying.

Roland

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Fri May 12 21:37:08 UTC 2006

Modified Files:
pkgsrc/mk: compiler.mk

Log Message:
Fix a problem that occurs if compiler.mk is included in a package's
Makefile, which means it occurs before bsd.tools.mk is included and
thus misses the definition of TOOLS_DIR. We now create a new subdirectory
of ${WRKDIR} to house the wrappers instead of re-using ${TOOLS_DIR}.
Problem noted by Roland Illig on tech-pkg:

http://mail-index.netbsd.org/tech-pkg/2006/05/12/0011.html


To generate a diff of this commit:
cvs rdiff -r1.49 -r1.50 pkgsrc/mk/compiler.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Tue May 16 21:25:38 UTC 2006

Modified Files:
pkgsrc/mk: java-env.mk

Log Message:
This file needs bsd.prefs.mk, since the variable WRKDIR is used in a
dependency line, which gets resolved during load time.


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 pkgsrc/mk/java-env.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Perry E. Metzger]

Module Name: pkgsrc
Committed By: perry
Date: Fri May 19 02:21:24 UTC 2006

Modified Files:
pkgsrc/mk: bsd.sites.mk

Log Message:
Now that ftp.netbsd.org has an http server, include it in the list for
MASTER_SITE_BACKUP for the benefit of people behind broken firewalls
that screw up ftp.


To generate a diff of this commit:
cvs rdiff -r1.62 -r1.63 pkgsrc/mk/bsd.sites.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Sun May 21 13:24:44 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.check.mk

Log Message:
Replaced ECHO_MSG with STEP_MSG.


To generate a diff of this commit:
cvs rdiff -r1.32 -r1.33 pkgsrc/mk/bsd.pkg.check.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun May 21 14:41:29 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Pass PKG_PHASE=install when recursively calling make from within the
real-su-install target so that the {pre,do,post}-install target command
lists will see the correct, fully-expanded definitions of certain
phase-specific variables.


To generate a diff of this commit:
cvs rdiff -r1.1822 -r1.1823 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun May 21 23:50:15 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk
Added Files:
pkgsrc/mk/pkginstall: bsd.pkginstall.mk deinstall deinstall-pre dirs
files fonts footer header info-files install install-post perms
shell usergroup usergroup-check usergroupfuncs
usergroupfuncs.DragonFly usergroupfuncs.FreeBSD
Removed Files:
pkgsrc/mk/install: bsd.pkginstall.mk deinstall deinstall-pre dirs files
fonts footer header info-files install install-post perms shell
usergroup usergroup-check usergroupfuncs usergroupfuncs.DragonFly
usergroupfuncs.FreeBSD

Log Message:
Move mk/install to mk/pkginstall to better reflect the contents (the
pkginstall framework).


To generate a diff of this commit:
cvs rdiff -r1.1823 -r1.1824 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.53 -r0 pkgsrc/mk/install/bsd.pkginstall.mk
cvs rdiff -r1.40 -r0 pkgsrc/mk/install/deinstall
cvs rdiff -r1.3 -r0 pkgsrc/mk/install/deinstall-pre \
pkgsrc/mk/install/install-post
cvs rdiff -r1.15 -r0 pkgsrc/mk/install/dirs
cvs rdiff -r1.14 -r0 pkgsrc/mk/install/files
cvs rdiff -r1.11 -r0 pkgsrc/mk/install/fonts
cvs rdiff -r1.2 -r0 pkgsrc/mk/install/footer
cvs rdiff -r1.36 -r0 pkgsrc/mk/install/header
cvs rdiff -r1.5 -r0 pkgsrc/mk/install/info-files pkgsrc/mk/install/perms
cvs rdiff -r1.47 -r0 pkgsrc/mk/install/install
cvs rdiff -r1.6 -r0 pkgsrc/mk/install/shell
cvs rdiff -r1.16 -r0 pkgsrc/mk/install/usergroup
cvs rdiff -r1.1 -r0 pkgsrc/mk/install/usergroup-check
cvs rdiff -r1.9 -r0 pkgsrc/mk/install/usergroupfuncs
cvs rdiff -r1.7 -r0 pkgsrc/mk/install/usergroupfuncs.DragonFly
cvs rdiff -r1.8 -r0 pkgsrc/mk/install/usergroupfuncs.FreeBSD
cvs rdiff -r0 -r1.1 pkgsrc/mk/pkginstall/bsd.pkginstall.mk \
pkgsrc/mk/pkginstall/deinstall pkgsrc/mk/pkginstall/deinstall-pre \
pkgsrc/mk/pkginstall/dirs pkgsrc/mk/pkginstall/files \
pkgsrc/mk/pkginstall/fonts pkgsrc/mk/pkginstall/footer \
pkgsrc/mk/pkginstall/header pkgsrc/mk/pkginstall/info-files \
pkgsrc/mk/pkginstall/install pkgsrc/mk/pkginstall/install-post \
pkgsrc/mk/pkginstall/perms pkgsrc/mk/pkginstall/shell \
pkgsrc/mk/pkginstall/usergroup pkgsrc/mk/pkginstall/usergroup-check \
pkgsrc/mk/pkginstall/usergroupfuncs \
pkgsrc/mk/pkginstall/usergroupfuncs.DragonFly \
pkgsrc/mk/pkginstall/usergroupfuncs.FreeBSD

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Joerg Sonnenberger]

Module Name: pkgsrc
Committed By: joerg
Date: Mon May 22 16:54:54 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.check.mk

Log Message:
POSIX doesn't specify -or as operand for find, only -o.
Fix from PR 33531 by Gilles Dauphin.


To generate a diff of this commit:
cvs rdiff -r1.33 -r1.34 pkgsrc/mk/bsd.pkg.check.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Joerg Sonnenberger]

Module Name: pkgsrc
Committed By: joerg
Date: Mon May 22 17:10:41 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.subdir.mk

Log Message:
Add show-subdir-var to get the value of SUBDIR of the top-level and
category Makefiles.


To generate a diff of this commit:
cvs rdiff -r1.61 -r1.62 pkgsrc/mk/bsd.pkg.subdir.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Post by Jeremy C. Reed
Module Name: pkgsrc
Committed By: joerg
Date: Mon May 22 17:10:41 UTC 2006
pkgsrc/mk: bsd.pkg.subdir.mk
Add show-subdir-var to get the value of SUBDIR of the top-level and
category Makefiles.

Why did you call this target "show-subdir-var" and not "show-subdirs"?

Roland

[j***@britannica.bec.de]

Post by Roland Illig

Post by Jeremy C. Reed
Module Name: pkgsrc
Committed By: joerg
Date: Mon May 22 17:10:41 UTC 2006
pkgsrc/mk: bsd.pkg.subdir.mk
Add show-subdir-var to get the value of SUBDIR of the top-level and
category Makefiles.

Why did you call this target "show-subdir-var" and not "show-subdirs"?

That was the name Johnny suggested. I have no strong relationship to it.

Joerg

[Johnny Lam]

Post by j***@britannica.bec.de

Post by Roland Illig

Post by Jeremy C. Reed
Module Name: pkgsrc
Committed By: joerg
Date: Mon May 22 17:10:41 UTC 2006
pkgsrc/mk: bsd.pkg.subdir.mk
Add show-subdir-var to get the value of SUBDIR of the top-level and
category Makefiles.

Why did you call this target "show-subdir-var" and not "show-subdirs"?

That was the name Johnny suggested. I have no strong relationship to it.

I think there was some miscommunication there. I had intended that a
target "show-subdir-var" be created which mimicked "show-var", e.g.

make show-subdir-var VARNAME=SUBDIR

Cheers,

-- Johnny Lam <***@pkgsrc.org>

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Tue May 23 07:39:23 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Packages may set the variable FETCH_MESSAGE to a list of lines that are
printed when some distfile must be fetched manually. After printing
them, the build is aborted.

This deprecates the old _FETCH_MESSAGE, as packages should never need to
define variables with leading underscores.


To generate a diff of this commit:
cvs rdiff -r1.1825 -r1.1826 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Joerg Sonnenberger]

Module Name: pkgsrc
Committed By: joerg
Date: Tue May 23 15:20:17 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.subdir.mk

Log Message:
Resolve misunderstanding with jlam, show-subdir-var works like
show-var, but doesn't recurse.


To generate a diff of this commit:
cvs rdiff -r1.62 -r1.63 pkgsrc/mk/bsd.pkg.subdir.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Thomas Klausner]

Module Name: pkgsrc
Committed By: wiz
Date: Thu May 25 11:00:39 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.use.mk

Log Message:
No package is using USE_RMAN any longer, remove it.


To generate a diff of this commit:
cvs rdiff -r1.32 -r1.33 pkgsrc/mk/bsd.pkg.use.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Joerg Sonnenberger]

Module Name: pkgsrc
Committed By: joerg
Date: Mon May 29 14:26:33 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.subdir.mk

Log Message:
Don't test existence of a file, touch it and compare the content,
but compare the content only if the file existed in first place.


To generate a diff of this commit:
cvs rdiff -r1.63 -r1.64 pkgsrc/mk/bsd.pkg.subdir.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Thomas Klausner]

Module Name: pkgsrc
Committed By: wiz
Date: Tue May 30 23:51:38 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.extract.mk
pkgsrc/mk/scripts: extract

Log Message:
Recognize -tar.gz as tar.gz files. PR 33571 by Dieter Roelants.


To generate a diff of this commit:
cvs rdiff -r1.21 -r1.22 pkgsrc/mk/bsd.pkg.extract.mk
cvs rdiff -r1.20 -r1.21 pkgsrc/mk/scripts/extract

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Stoned Elipot]

Module Name: pkgsrc
Committed By: seb
Date: Sat Jun 3 08:44:46 UTC 2006

Modified Files:
pkgsrc/mk: bsd.options.mk

Log Message:
I usually have the following stuffed in a mk.conf target or a script
and that is 3 make process to run...
make show-options; v=$(make show-var VARNAME=PKG_OPTIONS_VAR); echo $v=$(make sh
ow-var VARNAME=$v)

Hence add trailing part about PKG_OPTIONS_VAR and its value to
show-options target like the one found in supported-options-message target.


To generate a diff of this commit:
cvs rdiff -r1.53 -r1.54 pkgsrc/mk/bsd.options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun Jun 4 00:39:05 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk
pkgsrc/mk/pkginstall: bsd.pkginstall.mk

Log Message:
Convert just-in-time su targets to use su-target instead of ${_SU_TARGET}.
Garbage-collect the (now) unused _SU_TARGET.


To generate a diff of this commit:
cvs rdiff -r1.1827 -r1.1828 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/pkginstall/bsd.pkginstall.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun Jun 4 04:31:47 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.extract.mk bsd.pkg.mk bsd.pkg.patch.mk
pkgsrc/mk/pkginstall: bsd.pkginstall.mk

Log Message:
Drop the use of _ACQUIRE_LOCK and _RELEASE_LOCK and replace with
acquire-lock and release-lock macro targets. Take advantage of using
a make target by breaking up the _ACQUIRE_LOCK script into smaller
pieces, and make better use of the *_MSG definitions for printing
messages within the acquire-lock and release-lock targets.


To generate a diff of this commit:
cvs rdiff -r1.23 -r1.24 pkgsrc/mk/bsd.pkg.extract.mk
cvs rdiff -r1.1828 -r1.1829 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.21 -r1.22 pkgsrc/mk/bsd.pkg.patch.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/pkginstall/bsd.pkginstall.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun Jun 4 05:25:08 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Move test for the lockfile within the target's shell code instead of
testing for it at the Makefile level.


To generate a diff of this commit:
cvs rdiff -r1.1829 -r1.1830 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun Jun 4 05:26:45 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Include bsd.pkg.update.mk to get the "update" targets and variables.


To generate a diff of this commit:
cvs rdiff -r1.1830 -r1.1831 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun Jun 4 06:09:36 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Make LOCKFILE into a "private" variable by prepending with an underscore.


To generate a diff of this commit:
cvs rdiff -r1.1831 -r1.1832 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun Jun 4 08:25:53 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk bsd.pkg.update.mk

Log Message:
Move some "update"-only variables from bsd.pkg.mk to bsd.pkg.update.mk.


To generate a diff of this commit:
cvs rdiff -r1.1832 -r1.1833 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/bsd.pkg.update.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Todd Vierling]

Module Name: pkgsrc
Committed By: tv
Date: Sun Jun 4 20:10:14 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Fix problem in su-target: the exitcode of the make command is discarded,
so it would exit successfully even if the sub-make failed. This caused
rather interesting behavior with SU_CMD=sudo, and sudo timed out. Ensure
that the result code is preserved by using a && chain rather than ;.


To generate a diff of this commit:
cvs rdiff -r1.1833 -r1.1834 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Mon Jun 5 01:42:58 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Backout previous and fix in another way -- use "set -e" to force the
shell to exit if any untested command fails. This is based on Roland
Illig's recommendation from his pkglint talk at pkgsrcCon/Paris.


To generate a diff of this commit:
cvs rdiff -r1.1834 -r1.1835 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Mon Jun 5 02:22:50 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Ensure the directory containing the lockfile is created prior to the
lockfile's creation. Fixes the "depends" step when PKGSRC_LOCKTYPE
is not "none".


To generate a diff of this commit:
cvs rdiff -r1.1835 -r1.1836 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Joerg Sonnenberger]

Module Name: pkgsrc
Committed By: joerg
Date: Mon Jun 5 17:11:37 UTC 2006

Modified Files:
pkgsrc/mk: bsd.prefs.mk x11.version.mk
pkgsrc/mk/defaults: mk.conf

Log Message:
Move the default value of X11_TYPE from x11.version.mk into
bsd.prefs.mk. Add a coment to defaults/mk.conf, why the entry should
be left commented out there.


To generate a diff of this commit:
cvs rdiff -r1.221 -r1.222 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/x11.version.mk
cvs rdiff -r1.120 -r1.121 pkgsrc/mk/defaults/mk.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Mon Jun 5 17:21:55 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk bsd.pkg.update.mk
pkgsrc/mk/depends: bsd.depends.mk
pkgsrc/mk/flavor/pkg: deinstall.mk
pkgsrc/mk/install: replace.mk

Log Message:
Move definitions for UPDATE_TARGET and DEPENDS_TARGET closer to where
they are used. Also, move UPDATE_RUNNING into the install module where
it is used, and make it "private" by prepending with an underscore.


To generate a diff of this commit:
cvs rdiff -r1.1836 -r1.1837 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/bsd.pkg.update.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/depends/bsd.depends.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/flavor/pkg/deinstall.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/install/replace.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Mon Jun 5 17:41:11 UTC 2006

Modified Files:
pkgsrc/mk/depends: bsd.depends.mk depends.mk
pkgsrc/mk/install: bsd.install.mk deinstall.mk install.mk replace.mk
pkgsrc/mk/package: bsd.package.mk package.mk

Log Message:
Allow overrides of the public targets, e.g. "install", "package", etc.
if PKG_SKIP_REASON or PKG_FAIL_REASON is defined. This commit adds
!target(...) guards around those target definitions to avoid "duplicate
target definition" warnings.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/depends/bsd.depends.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/depends/depends.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/install/bsd.install.mk \
pkgsrc/mk/install/deinstall.mk pkgsrc/mk/install/install.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/install/replace.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/package/bsd.package.mk \
pkgsrc/mk/package/package.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Mon Jun 5 17:56:11 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Remove spurious comment.


To generate a diff of this commit:
cvs rdiff -r1.1837 -r1.1838 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Mon Jun 5 22:49:44 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.clean.mk bsd.pkg.extract.mk bsd.pkg.mk
bsd.pkg.patch.mk bsd.pkg.update.mk
pkgsrc/mk/check: check-vulnerable.mk
pkgsrc/mk/flavor/pkg: depends.mk install.mk metadata.mk package.mk
replace.mk views.mk
pkgsrc/mk/install: deinstall.mk install.mk replace.mk
pkgsrc/mk/package: bsd.package.mk package.mk
pkgsrc/mk/pkginstall: bsd.pkginstall.mk

Log Message:
Use PHASE_MSG, STEP_MSG, WARNING_MSG, and ERROR_MSG in place of ECHO_MSG
in various places.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/bsd.pkg.clean.mk pkgsrc/mk/bsd.pkg.update.mk
cvs rdiff -r1.24 -r1.25 pkgsrc/mk/bsd.pkg.extract.mk
cvs rdiff -r1.1838 -r1.1839 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.22 -r1.23 pkgsrc/mk/bsd.pkg.patch.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/check/check-vulnerable.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/flavor/pkg/depends.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/flavor/pkg/install.mk \
pkgsrc/mk/flavor/pkg/metadata.mk pkgsrc/mk/flavor/pkg/package.mk \
pkgsrc/mk/flavor/pkg/replace.mk pkgsrc/mk/flavor/pkg/views.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/install/deinstall.mk \
pkgsrc/mk/install/install.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/install/replace.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/package/bsd.package.mk \
pkgsrc/mk/package/package.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/pkginstall/bsd.pkginstall.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Stoned Elipot]

Module Name: pkgsrc
Committed By: seb
Date: Tue Jun 6 00:15:45 UTC 2006

Modified Files:
pkgsrc/mk: bsd.options.mk

Log Message:
Make show-options target output shorter as requested by dillo@


To generate a diff of this commit:
cvs rdiff -r1.55 -r1.56 pkgsrc/mk/bsd.options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Tue Jun 6 03:05:48 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk bsd.prefs.mk
Added Files:
pkgsrc/mk/extract: bsd.extract-vars.mk bsd.extract.mk extract
extract.mk
pkgsrc/mk/fetch: bsd.fetch-vars.mk bsd.fetch.mk distclean.mk fetch.mk
sites.mk
Removed Files:
pkgsrc/mk: bsd.pkg.extract.mk bsd.sites.mk
pkgsrc/mk/scripts: extract

Log Message:
Refactor "fetch" and "extract" code into correspondingly named
subdirectories of pkgsrc/mk. Move the following files around for
locality:

pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract
pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk

Also get rid of the recursive make for the "fetch" and "extract"
targets. This basically merges the "fetch" and "extract" phases into
the "patch" phase.

There is still much more work to do to simplify the fetch code, but
this is a good start.


To generate a diff of this commit:
cvs rdiff -r1.25 -r0 pkgsrc/mk/bsd.pkg.extract.mk
cvs rdiff -r1.1839 -r1.1840 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.222 -r1.223 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.63 -r0 pkgsrc/mk/bsd.sites.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/extract/bsd.extract-vars.mk \
pkgsrc/mk/extract/bsd.extract.mk pkgsrc/mk/extract/extract \
pkgsrc/mk/extract/extract.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/fetch/bsd.fetch-vars.mk \
pkgsrc/mk/fetch/bsd.fetch.mk pkgsrc/mk/fetch/distclean.mk \
pkgsrc/mk/fetch/fetch.mk pkgsrc/mk/fetch/sites.mk
cvs rdiff -r1.21 -r0 pkgsrc/mk/scripts/extract

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Tue Jun 6 04:48:19 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk bsd.prefs.mk
Added Files:
pkgsrc/mk/patch: bsd.patch-vars.mk bsd.patch.mk patch.mk
Removed Files:
pkgsrc/mk: bsd.pkg.patch.mk

Log Message:
Refactor "patch" code into correspondingly named subdirectory of
pkgsrc/mk. Also get rid of the recursive make for the "patch" target.
This basically merges the "patch" phase into the "tools" phase.

There should eventually be a standalone script that can be used to
verify checksums listed in distinfo that should be used instead of
the roll-your-own code in the do-pkgsrc-patch target.


To generate a diff of this commit:
cvs rdiff -r1.1840 -r1.1841 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.23 -r0 pkgsrc/mk/bsd.pkg.patch.mk
cvs rdiff -r1.223 -r1.224 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/patch/bsd.patch-vars.mk \
pkgsrc/mk/patch/bsd.patch.mk pkgsrc/mk/patch/patch.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Tue Jun 6 06:30:29 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk bsd.prefs.mk
pkgsrc/mk/extract: extract.mk
pkgsrc/mk/tools: bsd.tools.mk replace.mk
Added Files:
pkgsrc/mk/tools: create.mk

Log Message:
Separate out the part of bsd.tools.mk that actually created the tools
into a new file pkgsrc/mk/tools/create.mk. This leaves bsd.tools.mk
as a file that pulls in all of the other ones. Also move the
tools-related targets from bsd.pkg.mk into bsd.tools.mk.

The tools cookie file has been removed, as well as hooks for
{pre,do,post}-tools. Instead, there is now only a single public target
"tools" which may be invoked. Invoking "tools" will always cause all
of the tools in ${TOOLS_DIR} to be created.

The "tools" step has been moved and is now just after the "depends"
step and before sources are extracted. This is the earliest place
where the "tools" step can be taken, and it allows the created tools
to be used in all steps/phases after it, starting with "extract". As
a consequence, we should just invoke tools by their bare names in
targets, e.g. awk, sed, patch, etc., instead of with the ${VARIABLE}
names, e.g. ${AWK}, ${SED}, ${PATCH}, etc.


To generate a diff of this commit:
cvs rdiff -r1.1841 -r1.1842 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.224 -r1.225 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/extract/extract.mk
cvs rdiff -r1.34 -r1.35 pkgsrc/mk/tools/bsd.tools.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/tools/create.mk
cvs rdiff -r1.167 -r1.168 pkgsrc/mk/tools/replace.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Tue Jun 6 15:28:52 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk bsd.prefs.mk
pkgsrc/mk/check: bsd.check-vars.mk
pkgsrc/mk/depends: bsd.depends-vars.mk
pkgsrc/mk/extract: bsd.extract-vars.mk
pkgsrc/mk/fetch: bsd.fetch-vars.mk
pkgsrc/mk/install: bsd.install-vars.mk
pkgsrc/mk/patch: bsd.patch-vars.mk

Log Message:
Move some variable definitions out of bsd.prefs.mk and back into
bsd.pkg.mk. They didn't actually need to be defined in bsd.prefs.mk,
just somewhere before the "main" bsd.<phase>.mk files were included.
This moves some conditional (?=) definitions back into bsd.pkg.mk so
they won't conflict with any conditional definitions in package
Makefiles.

This should fix the "checksum" problems in lang/php-gd as noted here:

http://mail-index.netbsd.org/pkgsrc-users/2006/06/05/0012.html

where EXTRACT_SUFX had the wrong value due to the order in while *.mk
files were included.


To generate a diff of this commit:
cvs rdiff -r1.1842 -r1.1843 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.225 -r1.226 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/check/bsd.check-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/depends/bsd.depends-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/extract/bsd.extract-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/fetch/bsd.fetch-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/install/bsd.install-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/patch/bsd.patch-vars.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Tue Jun 6 19:26:00 UTC 2006

Modified Files:
pkgsrc/mk/defaults: mk.conf
pkgsrc/mk/tools: replace.mk

Log Message:
Stop supporting user-specified definition for IMAKE in /etc/mk.conf --
it's now all handled exclusively by the tools framework.


To generate a diff of this commit:
cvs rdiff -r1.121 -r1.122 pkgsrc/mk/defaults/mk.conf
cvs rdiff -r1.168 -r1.169 pkgsrc/mk/tools/replace.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Joerg Sonnenberger]

Module Name: pkgsrc
Committed By: joerg
Date: Tue Jun 6 19:43:43 UTC 2006

Modified Files:
pkgsrc/mk: pgsql.buildlink3.mk

Log Message:
One more reminder of PostgreSQL 7.3 to remove...


To generate a diff of this commit:
cvs rdiff -r1.15 -r1.16 pkgsrc/mk/pgsql.buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Tue Jun 6 19:49:52 UTC 2006

Modified Files:
pkgsrc/mk/flavor/pkg: install.mk metadata.mk
pkgsrc/mk/pkginstall: bsd.pkginstall.mk

Log Message:
Avoid using PKGNAME in target names since they are "immediately"
resolved in much the same manner as variables set using :=. PKGNAME
could be set after including bsd.pkg.mk (which is poor form), and it's
too close to the pkgsrc-2006Q2 branch to fix that all over pkgsrc at
this time). This fixes building shells/static-bash2.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/flavor/pkg/install.mk \
pkgsrc/mk/flavor/pkg/metadata.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/pkginstall/bsd.pkginstall.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Matthias Scheler]

Module Name: pkgsrc
Committed By: tron
Date: Wed Jun 7 10:04:04 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.update.mk
pkgsrc/mk/install: install.mk
pkgsrc/mk/package: package.mk

Log Message:
1.) Remove all instances of '@${WARNING_MSG} "Warning: ...' which resulted
in error message like 'WARNING: Warning: ...'.
2.) Replace "WARN_MSG" with "WARNING_MSG" which makes the "make package"
target work again for restricted packages like "acroread7".


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/bsd.pkg.update.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/install/install.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/package/package.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Wed Jun 7 17:00:03 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Add WARNING_CAT and ERROR_CAT which are filters for outputting file
contents to standard error. They prefix the output with "WARNING: "
and "ERROR: " respectively.


To generate a diff of this commit:
cvs rdiff -r1.1843 -r1.1844 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Wed Jun 7 17:05:25 UTC 2006

Modified Files:
pkgsrc/mk/check: check-wrkref.mk
pkgsrc/mk/flavor/pkg: metadata.mk

Log Message:
Rewrite to avoid using "grep -H", which Solaris' grep does not support.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/check/check-wrkref.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/flavor/pkg/metadata.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Wed Jun 7 17:44:29 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk
pkgsrc/mk/pkginstall: bsd.pkginstall.mk

Log Message:
Move _ZERO_FILESIZE_P ftom bsd.pkginstall.mk to bsd.pkg.mk so it can more
clearly be used in other modules.


To generate a diff of this commit:
cvs rdiff -r1.1844 -r1.1845 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/pkginstall/bsd.pkginstall.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Wed Jun 7 18:37:07 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
If there is _ZERO_FILESIZE_P, then it's natural to have _NONZERO_FILESIZE_P
to test for the opposite condition.


To generate a diff of this commit:
cvs rdiff -r1.1845 -r1.1846 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Thu Jun 8 08:01:54 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk
pkgsrc/mk/flavor/pkg: depends.mk install.mk metadata.mk views.mk
pkgsrc/mk/patch: patch.mk
pkgsrc/mk/pkginstall: bsd.pkginstall.mk

Log Message:
Replaced PHASE_MSG with STEP_MSG in many (but not all) places where it
wasn't used to identify a ``phase'', as defined in the pkgsrc guide.


To generate a diff of this commit:
cvs rdiff -r1.1846 -r1.1847 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/flavor/pkg/depends.mk \
pkgsrc/mk/flavor/pkg/metadata.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/flavor/pkg/install.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/flavor/pkg/views.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/patch/patch.mk
cvs rdiff -r1.8 -r1.9 pkgsrc/mk/pkginstall/bsd.pkginstall.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Thu Jun 8 16:21:51 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk
pkgsrc/mk/extract: extract.mk

Log Message:
Introduce "makedirs" as a helper target to create directories with
unprivileged ownership.


To generate a diff of this commit:
cvs rdiff -r1.1847 -r1.1848 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/extract/extract.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Fri Jun 9 13:59:08 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk compiler.mk
pkgsrc/mk/check: check-files.mk check-interpreter.mk check-shlibs.mk
check-wrkref.mk
pkgsrc/mk/depends: depends.mk
pkgsrc/mk/extract: extract.mk
pkgsrc/mk/flavor/pkg: install.mk
pkgsrc/mk/install: install.mk
pkgsrc/mk/package: package.mk
pkgsrc/mk/patch: patch.mk
pkgsrc/mk/tools: bsd.tools.mk
Added Files:
pkgsrc/mk: bsd.pkg.error.mk

Log Message:
Introduce the capability to gather all the warnings and errors that
are generated for a target and output them all at once at the conclusion
of the target's invocation. The implementation is in bsd.pkg.error.mk,
which defines a macro target "error-check" that will print out any
non-empty warning and error files in ${WARNING_DIR} and ${ERROR_DIR}
and exit appropriately if there were errors.

Convert some targets that were just long sequences of ${ERROR_MSG} or
${WARNING_MSG} within a single shell statement to use the new delayed
error output via error-check.

Modify the compiler "fail" wrappers for C++ and Fortran to be less
verbose during invocation. Instead collect the warnings and only
print them at the end of the completed phase, e.g. after "configure"
and/or "build" completes.


To generate a diff of this commit:
cvs rdiff -r0 -r1.1 pkgsrc/mk/bsd.pkg.error.mk
cvs rdiff -r1.1848 -r1.1849 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.50 -r1.51 pkgsrc/mk/compiler.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/check/check-files.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/check/check-interpreter.mk \
pkgsrc/mk/check/check-wrkref.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/check/check-shlibs.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/depends/depends.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/extract/extract.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/flavor/pkg/install.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/install/install.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/package/package.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/patch/patch.mk
cvs rdiff -r1.35 -r1.36 pkgsrc/mk/tools/bsd.tools.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Post by Jeremy C. Reed
Module Name: pkgsrc
Committed By: jlam
Date: Fri Jun 9 13:59:08 UTC 2006
pkgsrc/mk: bsd.pkg.mk compiler.mk
pkgsrc/mk/check: check-files.mk check-interpreter.mk check-shlibs.mk
check-wrkref.mk
pkgsrc/mk/depends: depends.mk
pkgsrc/mk/extract: extract.mk
pkgsrc/mk/flavor/pkg: install.mk
pkgsrc/mk/install: install.mk
pkgsrc/mk/package: package.mk
pkgsrc/mk/patch: patch.mk
pkgsrc/mk/tools: bsd.tools.mk
pkgsrc/mk: bsd.pkg.error.mk
Introduce the capability to gather all the warnings and errors that
are generated for a target and output them all at once at the conclusion
of the target's invocation. The implementation is in bsd.pkg.error.mk,
which defines a macro target "error-check" that will print out any
non-empty warning and error files in ${WARNING_DIR} and ${ERROR_DIR}
and exit appropriately if there were errors.

Now the code looks pretty weird, at least in
mk/check/check-interpreter.mk. The command ${WARNING_MSG} is still used,
but instead of ${ERROR_MSG}, you are using a simple ${ECHO}, which in my
opinion doesn't express clearly enough what the code wants to say.

Roland

[Johnny C. Lam]

Post by Roland Illig

Module Name: pkgsrc
Committed By: jlam
Date: Fri Jun 9 13:59:08 UTC 2006
pkgsrc/mk: bsd.pkg.mk compiler.mk
pkgsrc/mk/check: check-files.mk check-interpreter.mk check-shlibs.mk
check-wrkref.mk
pkgsrc/mk/depends: depends.mk
pkgsrc/mk/extract: extract.mk
pkgsrc/mk/flavor/pkg: install.mk
pkgsrc/mk/install: install.mk
pkgsrc/mk/package: package.mk
pkgsrc/mk/patch: patch.mk
pkgsrc/mk/tools: bsd.tools.mk
pkgsrc/mk: bsd.pkg.error.mk
Introduce the capability to gather all the warnings and errors that
are generated for a target and output them all at once at the conclusion
of the target's invocation. The implementation is in bsd.pkg.error.mk,
which defines a macro target "error-check" that will print out any
non-empty warning and error files in ${WARNING_DIR} and ${ERROR_DIR}
and exit appropriately if there were errors.

Now the code looks pretty weird, at least in
mk/check/check-interpreter.mk. The command ${WARNING_MSG} is still used,
but instead of ${ERROR_MSG}, you are using a simple ${ECHO}, which in my
opinion doesn't express clearly enough what the code wants to say.

The code will now print out missing interpreters in all files instead of
stopping at the first one. I didn't think it was necessary to modify
the WARNING_MSG ones to print to a file in ${WARNING_DIR}, though it
could easily have been done.

Cheers,

-- Johnny Lam <***@pkgsrc.org>

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Fri Jun 9 16:41:09 UTC 2006

Modified Files:
pkgsrc/mk/check: check-files.mk
pkgsrc/mk/flavor/pkg: depends.mk metadata.mk
pkgsrc/mk/pkginstall: bsd.pkginstall.mk

Log Message:
make(1) will automatically delete partially made targets if the target
creation fails, so remove instances where temporary files were created
then moved to the final target filename, and just directly create the
target. This is just for brevity/clarity, and saves a few tool calls.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/check/check-files.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/flavor/pkg/depends.mk \
pkgsrc/mk/flavor/pkg/metadata.mk
cvs rdiff -r1.9 -r1.10 pkgsrc/mk/pkginstall/bsd.pkginstall.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sat Jun 10 03:23:46 UTC 2006

Modified Files:
pkgsrc/mk/install: install.mk
pkgsrc/mk/package: package.mk

Log Message:
Restore missing ${SETENV} ${BUILD_ENV} that was dropped during the initial
package system flavors commit.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/install/install.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/package/package.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Sun Jun 11 02:14:45 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Split out the "work" symlink creation into a separate step and add it
as a source for the "makedirs" target. This ensures the symlink is
created regardless of whether ${WRKDIR} already exists or not.


To generate a diff of this commit:
cvs rdiff -r1.1849 -r1.1850 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Mon Jun 12 16:30:04 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Move the common make command executed in su-target into a separate make
variable to try to get rid of potential quoting problems.


To generate a diff of this commit:
cvs rdiff -r1.1850 -r1.1851 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Wed Jun 14 07:51:47 UTC 2006

Modified Files:
pkgsrc/mk/install: install.mk
pkgsrc/mk/package: package.mk

Log Message:
Insert cookie checks into the "real-install" and "real-package" targets,
which are invoked in recursive make calls for the "install" and
"package" targets respectvely. These recursive make calls prevent
the top-level make from seeing all of the targets and computing a full
dependency graph, so it becomes possible for some targets to be invoked
more than once. This change passes enough information along to the
recursive make calls and ensures that the source targets for the real-*
targets are only invoked once.


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 pkgsrc/mk/install/install.mk
cvs rdiff -r1.7 -r1.8 pkgsrc/mk/package/package.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Wed Jun 14 15:09:34 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.error.mk
pkgsrc/mk/check: check-interpreter.mk

Log Message:
Create DELAYED_{ERROR,WARNING}_MSG macros that can be used to output
error and warning messages that are picked up by the error-check
target. Use them instead of using a bare ${ECHO} for more code clarity.
Implemented as suggested by Roland Illig.


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/bsd.pkg.error.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/check/check-interpreter.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Thu Jun 15 02:24:41 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Allow the standard build target to be overridden by the one generated
if PKG_{FAIL,SKIP}_REASON is set. This fixes the behavior when one
invokes "make build" in a package that sets a fail or skip reason to
stop as soon as the reason is printed.


To generate a diff of this commit:
cvs rdiff -r1.1851 -r1.1852 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Johnny C. Lam]

Module Name: pkgsrc
Committed By: jlam
Date: Thu Jun 15 02:39:19 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Output PKG_{FAIL,SKIP}_REASON messages to standard error instead of
standard output. These are error or warning messages, so they shouldn't
be "seen" by anything expecting the output of a "make" command to make
sense. This addresses PR pkg/32239 by following the suggestions by
Roland Illig.


To generate a diff of this commit:
cvs rdiff -r1.1852 -r1.1853 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Sat Jun 17 21:27:31 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Added a variable OVERRIDE_GNU_CONFIG_SCRIPTS that allows a package to
override the config.guess, config.sub and config.rpath scripts even if
GNU_CONFIGURE is not defined. This is needed for devel/tla.


To generate a diff of this commit:
cvs rdiff -r1.1853 -r1.1854 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[j***@britannica.bec.de]

Post by Jeremy C. Reed
Module Name: pkgsrc
Committed By: rillig
Date: Sat Jun 17 21:27:31 UTC 2006
pkgsrc/mk: bsd.pkg.mk
Added a variable OVERRIDE_GNU_CONFIG_SCRIPTS that allows a package to
override the config.guess, config.sub and config.rpath scripts even if
GNU_CONFIGURE is not defined. This is needed for devel/tla.

Grep the tree, this is already done in a number of places already.

Joerg

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Sat Jun 17 22:42:00 UTC 2006

Modified Files:
pkgsrc/mk: subst.mk

Log Message:
Simplified the code by reducing the number of different targets that are
evaluated. Now the SUBST_MESSAGE is only printed once when the
substitution is actually done. Before this change it had been printed
also when the subst-<class> target had been invoked a second time, but
the substitution didn't take place again, which had confused me. Also,
converted the code to use ${WARNING_MSG} and ${STEP_MSG}.


To generate a diff of this commit:
cvs rdiff -r1.32 -r1.33 pkgsrc/mk/subst.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Sun Jun 18 09:34:07 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Fixed wrong indentation of .if/.else/.endif.


To generate a diff of this commit:
cvs rdiff -r1.1854 -r1.1855 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Sun Jun 18 09:37:56 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
Define CONFIG_{GUESS,SUB,RPATH}_OVERRIDE also when
OVERRIDE_GNU_CONFIG_SCRIPTS is defined.


To generate a diff of this commit:
cvs rdiff -r1.1855 -r1.1856 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Sun Jun 18 09:40:25 UTC 2006

Modified Files:
pkgsrc/mk: bsd.pkg.mk

Log Message:
devel/tla has the GNU config scripts in a */*/* directory.


To generate a diff of this commit:
cvs rdiff -r1.1856 -r1.1857 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

[j***@britannica.bec.de]

Post by Jeremy C. Reed
Module Name: pkgsrc
Committed By: rillig
Date: Sun Jun 18 09:40:25 UTC 2006
pkgsrc/mk: bsd.pkg.mk
devel/tla has the GNU config scripts in a */*/* directory.

Can such a change please be discussed first? Quite a number of packages
have a nastily deep directory hiearchy, but seldom any configure scripts
in levels deeper than 2. This can add quite some overhead and I do't
like it for exactly that reason.

Joerg

[Roland Illig]

Module Name: pkgsrc
Committed By: rillig
Date: Thu Jun 22 20:45:48 UTC 2006

Modified Files:
pkgsrc/mk: subst.mk

Log Message:
SUBST_STAGE.* is currently not defined by all SUBST blocks, so disable
PKG_FAIL_REASON in that case. It didn't have an effect anyway for normal
builds, since subst.mk is included after checking PKG_FAIL_REASON.

Discussed with jlam.


To generate a diff of this commit:
cvs rdiff -r1.33 -r1.34 pkgsrc/mk/subst.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.