sync with HEAD

21 files changed, 707 insertions, 277 deletions

diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index b002584ca94..397d6d0c25e 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,8 +1,10 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.5 2005/01/10 16:15:25 tv Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.6 2005/01/13 20:11:55 tv Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
 
+PREPEND_PATH+=		${LOCALBASE}/bin
+
 ############################################################################
 # ${PREFIX} selection
 ############################################################################
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 4eb29358f2c..52bbf4f960a 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.65.2.1 2004/11/23 20:54:12 tv Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.65.2.2 2005/01/13 20:11:55 tv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -79,46 +79,51 @@ BROKENWRKLOG?=	.broken${BULK_ID}.work.html
 # This file is where the log of the build goes
 BUILDLOG?=	.make${BULK_ID}
 
+# This is the directory in which bulk build global files should be kept.
+# It defaults to ${PKGSRCDIR}, but may be better suited to another directory
+# if pkgsrc is on a remote (e.g., nfs) filesystem.
+BULKFILESDIR?=	${PKGSRCDIR}
+
 # This is a top level file which lists the entire pkgsrc depends tree in the
 # format:
 # foo/bar devel/libfoo
 # meaning 'foo/bar' is requied to build 'devel/libfoo'
 # this is in the format needed by tsort(1)
-DEPENDSTREEFILE?=	${PKGSRCDIR}/.dependstree${BULK_ID}
+DEPENDSTREEFILE?=	${BULKFILESDIR}/.dependstree${BULK_ID}
 
 # This is a top level file which lists the entire pkgsrc depends tree in the
 # format:
 # foo/bar depends on: devel/libfoo devel/libbar devel/baz .....
 # ie, to build foo/bar we need devel/libfoo devel/libbar devel/baz ... installed
-DEPENDSFILE?=	${PKGSRCDIR}/.depends${BULK_ID}
+DEPENDSFILE?=	${BULKFILESDIR}/.depends${BULK_ID}
 
 # This is a top level file which lists the entire pkgsrc depends tree in the
 # format:
 # devel/libfoo is depended upon by: foo/bar graphics/gtkfoo ...
 # ie, to build foo/bar we need devel/libfoo to be installed.
 #     to build graphics/gtkfoo we need devel/libfoo to be installed
-SUPPORTSFILE?=	${PKGSRCDIR}/.supports${BULK_ID}
+SUPPORTSFILE?=	${BULKFILESDIR}/.supports${BULK_ID}
 
 # This is a top level file which cross-references each package name and pkg
 # directory in the format:
 # devel/libfoo libfoo-1.3
-INDEXFILE?=	${PKGSRCDIR}/.index${BULK_ID}
+INDEXFILE?=	${BULKFILESDIR}/.index${BULK_ID}
 
 # File containing a list of all the packages in the correct order for a bulk
 # build.  The correct order is one where packages that are required by others
 # are built before the packages which require them.
-ORDERFILE?=	${PKGSRCDIR}/.order${BULK_ID}
+ORDERFILE?=	${BULKFILESDIR}/.order${BULK_ID}
 
 # File which is used as a timestamp for when the build started.  This is used
 # eventually for looking for leftover files (files not properly deinstalled)
-STARTFILE?=	${PKGSRCDIR}/.start${BULK_ID}
+STARTFILE?=	${BULKFILESDIR}/.start${BULK_ID}
 
 # File which is used as a database for bulk builds in which SPECIFIC_PKGS is
 # defined.  This database is used to hold all the dependency and index
 # information for the specific packages as well as their dependencies.  In a
 # SPECIFIC_PKGS bulk build, this file is created and then used to create the
 # INDEXFILE and DEPENDSTREEFILE.
-BULK_DBFILE?=	${PKGSRCDIR}/.bulk_db${BULK_ID}
+BULK_DBFILE?=	${BULKFILESDIR}/.bulk_db${BULK_ID}
 
 # A list of pkgs which we should _never_ delete during a build.  The primary
 # use is for digest and also for xpkgwedge.  Add pkgtools/xpkgwedge in
@@ -202,8 +207,8 @@ bulk-check-uptodate:
 	fi ; \
 	if [ "$$uptodate" = "1" ]; then \
 		${SHCOMMENT} "Check required binary packages" ; \
-		deps=${DEPENDS:C/:.*//:Q} ; \
-		for dep in $$deps ; do \
+		(${DEPENDS:C/:.*$//:@d@${ECHO} ${d:Q};@} ${TRUE}) | \
+		while read dep; do \
 			${SHCOMMENT} "check against the binary pkg that pkg_add would pick, too:" ; \
 			${SHCOMMENT} "(Only one should be returned here, really...)" ; \
 			pkg=`${PKG_ADMIN} lsbest "${PACKAGES}/All/$$dep"` ; \
diff --git a/mk/bulk/do-sandbox-build b/mk/bulk/do-sandbox-build
index dfedb711583..7950b5efb64 100644
--- a/mk/bulk/do-sandbox-build
+++ b/mk/bulk/do-sandbox-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: do-sandbox-build,v 1.7 2004/01/15 10:02:54 grant Exp $
+#	$NetBSD: do-sandbox-build,v 1.7.8.1 2005/01/13 20:11:55 tv Exp $
 
 #
 # Script to start a sandbox build
@@ -8,4 +8,4 @@
 #
 
 sh=`which sh`
-chroot /usr/sandbox $sh -c "cd /usr/cvs.local/pkgsrc/ ; $sh mk/bulk/build $@"
+chroot /usr/sandbox $sh -c "cd /usr/pkgsrc/ ; $sh mk/bulk/build $@"
diff --git a/mk/bulk/do-sandbox-upload b/mk/bulk/do-sandbox-upload
new file mode 100644
index 00000000000..e5e6c87105b
--- /dev/null
+++ b/mk/bulk/do-sandbox-upload
@@ -0,0 +1,11 @@
+#!/bin/sh
+#	$NetBSD: do-sandbox-upload,v 1.2.2.2 2005/01/13 20:11:55 tv Exp $
+
+#
+# Script to start a sandbox build
+#
+# See pkgsrc/Packages.txt for documentation!
+#
+
+sh=`which sh`
+chroot /usr/sandbox $sh -c "cd /usr/pkgsrc/ ; $sh mk/bulk/upload $@"
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index f825f167ad8..bf894c0f790 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.47.2.1 2004/11/23 20:54:12 tv Exp $
+# $NetBSD: post-build,v 1.47.2.2 2005/01/13 20:11:55 tv Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -7,140 +7,174 @@
 #
 
 use File::Basename;
-use POSIX ();
+use POSIX qw(strftime);
+use strict;
+use warnings;
 
-# Where config vars are stored (/bin/sh syntax)
+my %vars;
+my $verbose = 1; # set to 2 to see more command execution detail
 
-if (-f $ENV{"BULK_BUILD_CONF"}) {
-	$BULK_BUILD_CONF=$ENV{"BULK_BUILD_CONF"};
-} else {
-	$BULK_BUILD_CONF=dirname("$0")."/build.conf";
+sub my_system (@) {
+	print STDERR '> '.join(' ', @_)."\n" if ($verbose >= 2);
+	system(@_);
 }
 
+# Where config vars are stored (/bin/sh syntax)
+
+my $BULK_BUILD_CONF = $ENV{BULK_BUILD_CONF} || (dirname($0).'/build.conf');
+$BULK_BUILD_CONF = "./$BULK_BUILD_CONF" if ($BULK_BUILD_CONF !~ m:^/:);
+
 # Dig given variable out of config file, and set it
-sub getconf {
-	local($var)=@_;
-	local($val);
-
-	if ($BULK_BUILD_CONF =~ /^\//) {
-		chomp($val=`. $BULK_BUILD_CONF ; echo \$$var`);
-	} else {
-		chomp($val=`. ./$BULK_BUILD_CONF ; echo \$$var`);
+sub getconf (@) {
+	open(I, ". $BULK_BUILD_CONF; for var in ".join(' ', @_)."; do eval echo \\\${\$var}; done |") || die 'cannot open pipe';
+	
+	foreach my $var (@_) {
+		$vars{$var} = <I>;
+		chomp $vars{$var};
+		die "\$$var not defined by $BULK_BUILD_CONF" if ($vars{$var} eq '');
+
+		print STDERR "> $var=$vars{$var}\n" if ($verbose >= 2);
 	}
-	eval "\$$var=\"$val\";";
 }
 
-getconf("ADMINSIG");		# "-Your Name"
-getconf("FTPURL");		# "pub/NetBSD/pkgstat/`date +%Y%m%d.%H%M`"
-getconf("FTP");			# "/disk1/ftp/${FTPURL}"
-getconf("FTPHOST");		# ftp://ftp.machi.ne/
-getconf("REPORT");		# "broken.html"
-getconf("USR_PKGSRC");		# "/usr/pkgsrc"
-getconf("osrev");	       	# `uname -r`
-getconf("arch"); 		# `uname -m`
-$reportf=basename($REPORT);
+getconf(
+	'ADMINSIG',		# "-Your Name"
+	'FTPURL',		# "pub/NetBSD/pkgstat/`date +%Y%m%d.%H%M`"
+	'FTP',			# "/disk1/ftp/${FTPURL}"
+	'FTPHOST',		# ftp://ftp.machi.ne/
+	'REPORT',		# "broken.html"
+	'USR_PKGSRC',		# "/usr/pkgsrc"
+	'arch', 		# `uname -m`
+	'osrev',	       	# `uname -r`
+);
+
+my $reportf = basename($vars{REPORT});
+
+my $os = `uname -s`;
+chomp $os;
+
+my $BMAKE = $ENV{BMAKE} || die '$BMAKE not defined in environment';
+
+sub getmakevars (@) {
+	open(I, "cd $vars{USR_PKGSRC}/pkgtools/pkglint && $BMAKE show-vars BATCH=1 VARNAMES='".join(' ', @_)."' |") || die 'cannot open pipe';
+
+	foreach my $var (@_) {
+		$vars{$var} = <I>;
+		chomp $vars{$var};
+		die "\${$var} not defined by $BMAKE" if ($vars{$var} eq '');
 
-chomp($os=`uname -s`);
+		print STDERR "> $var=$vars{$var}\n" if ($verbose >= 2);
+	}
+}
 
 # Extract the names of the files used for the build log and broken build logs.
 # These have defaults set by bsd.bulk-pkg.mk and may be overridden in
 # /etc/mk.conf
-chomp($BROKENFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BROKENFILE )`);
-chomp($BROKENWRKLOG=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BROKENWRKLOG )`);
-
-# Also extract the names of the cache files used during the bulk build.  We'll
-# save a copy of those to help debug if the build messed up.
-chomp($BULK_DBFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BULK_DBFILE )`);
-chomp($DEPENDSTREEFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSTREEFILE )`);
-chomp($DEPENDSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSFILE )`);
-chomp($SUPPORTSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=SUPPORTSFILE )`);
-chomp($INDEXFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=INDEXFILE )`);
-chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=ORDERFILE )`);
-chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=STARTFILE )`);
-chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`);
-chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`);
-chomp($FIND=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=FIND )`);
-chomp($GTAR=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=GTAR )`);
-$bulkdbfile=basename($BULK_DBFILE);
-$dtfile=basename($DEPENDSTREEFILE);
-$depfile=basename($DEPENDSFILE);
-$supfile=basename($SUPPORTSFILE);
-$indfile=basename($INDEXFILE);
-$ordfile=basename($ORDERFILE);
-$startfile=basename($STARTFILE);
-
-$startdate = (stat($STARTFILE))[9];
+getmakevars(qw(
+	BROKENFILE
+	BROKENWRKLOG
+	BULK_DBFILE
+	DEPENDSFILE
+	DEPENDSTREEFILE
+	FIND
+	GTAR
+	INDEXFILE
+	LOCALBASE
+	ORDERFILE
+	PKG_DBDIR
+	STARTFILE
+	SUPPORTSFILE
+	X11BASE
+));
+
+my $bulkdbfile = basename($vars{BULK_DBFILE});
+my $dtfile = basename($vars{DEPENDSTREEFILE});
+my $depfile = basename($vars{DEPENDSFILE});
+my $supfile = basename($vars{SUPPORTSFILE});
+my $indfile = basename($vars{INDEXFILE});
+my $ordfile = basename($vars{ORDERFILE});
+
+my $startdate = (stat($vars{STARTFILE}))[9];
+my $enddate = '';
 if ($startdate == 0) {
 	$startdate = "unknown";
 } else {
 	local $ENV{TZ} = "UTC";
-	$startdate = POSIX::strftime("%c %Z", gmtime($startdate));
-	$enddate = POSIX::strftime("%c %Z", gmtime(time()));
+	$startdate = strftime("%c %Z", gmtime($startdate));
+	$enddate = strftime("%c %Z", gmtime(time()));
 }
 
-$verbose=1;
-
-$report_head = <<EOF;
+my $report_head = <<EOF;
 Package                    Breaks  Maintainer
 --------------------------------------------------------------
 EOF
-$report_form = <<EOF;
+my $report_form = <<EOF;
 @<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<
-$pkg                       $nbrokenby  $maintainer
 EOF
+# $pkg, $nbrokenby, $maintainer
 
-system("mkdir -p ${FTP}");
+
+my_system("mkdir -p $vars{FTP}");
 
 # Copy over the output from the build process
-chdir($USR_PKGSRC);
-system("find . -name $BROKENFILE -print -o -name $BROKENWRKLOG -print | $GTAR -T - -plcf - | (cd $FTP; $GTAR -plxf -)");
+chdir($vars{USR_PKGSRC});
+my_system("/bin/ls -1 $vars{BROKENFILE} $vars{BROKENWRKLOG} */*/$vars{BROKENFILE} */*/$vars{BROKENWRKLOG} 2>/dev/null | $vars{GTAR} -T - -plcf - | (cd $vars{FTP}; $vars{GTAR} -plxf -)");
 
 # Copy over the cache files used during the build
-foreach my $f ($BULK_DBFILE, $DEPENDSTREEFILE, $DEPENDSFILE, $SUPPORTSFILE, $INDEXFILE, $ORDERFILE) {
-	system("cp ${f} ${FTP}") if -f ${f};
+foreach my $f qw(BULK_DBFILE DEPENDSTREEFILE DEPENDSFILE SUPPORTSFILE INDEXFILE ORDERFILE) {
+	my_system("cp $vars{$f} $vars{FTP}") if -f $vars{$f};
 }
 
-chdir($FTP);
+chdir($vars{FTP});
 writeReport();
 
 #
 # Adjust "last" symlink
 #
 {
-	local($base, $dir) = $FTP=~m|^(.*)/([^/]*)$|;
+	my ($base, $dir) = ($vars{FTP} =~ m|^(.*)/([^/]*)$|);
 
 	unlink("$base/last");
 	symlink($dir, "$base/last");
 }
 
 #
-# Generate leftovers-${arch}.html: files not deleted
-# Leftover files are copied to leftovers-${arch} dir, and linked from
-# leftovers-${arch}.html
+# Generate leftovers-$vars{arch}.html: files not deleted
+# Leftover files are copied to leftovers-$vars{arch} dir, and linked from
+# leftovers-$vars{arch}.html
 #
 {
-	chdir($FTP);
-	system("mkdir -p leftovers-${arch}");
+	chdir($vars{FTP});
+	my_system("mkdir -p leftovers-$vars{arch}");
 
 	# Find files since last build:
-	$leftovers_txt = "leftovers-${arch}.txt";
-	$leftovers_html = "leftovers-${arch}.html";
-	system("${FIND} ${LOCALBASE} -newer ${USR_PKGSRC}/${startfile} -type f -print >>$leftovers_txt");
-	system("${FIND} ${X11BASE} -newer ${USR_PKGSRC}/${startfile} -type f -print >>$leftovers_txt");
+	my $leftovers_txt = "leftovers-$vars{arch}.txt";
+	my $leftovers_html = "leftovers-$vars{arch}.html";
+
+	my_system("$vars{FIND} $vars{LOCALBASE}/ -newer $vars{STARTFILE} -type f -print >>$leftovers_txt");
+	my_system("$vars{FIND} $vars{X11BASE}/ -newer $vars{STARTFILE} -type f -print >>$leftovers_txt");
 
 	# Strip perl-files:
+	my $perlfiles;
 	{
 		local $/;
 		undef $/;
 		$perlfiles = `pkg_info -qL perl*`;
 	}
-	($perlfiles_pattern = $perlfiles) =~ s/\n/|/g;
+
+	my $perlfiles_pattern = $perlfiles;
+	$perlfiles_pattern =~ s/\n/|/g;
 	$perlfiles_pattern =~ s/|$//;
 
 	open (LEFT, $leftovers_txt) or die "can't read $leftovers_txt: $!";
-	@left = <LEFT>;
+	my @left = <LEFT>;
 	close (LEFT);
-	@leftovers = grep(!/^(${perlfiles_pattern})$/, @left);
+	my @leftovers = grep(!/^(?:${perlfiles_pattern})$/, @left);
+
+	if (index($vars{PKG_DBDIR}, $vars{LOCALBASE}) == 0) {
+		# If PKG_DBDIR is inside LOCALBASE, exclude it from the leftovers.
+		@leftovers = grep { index($_, $vars{PKG_DBDIR}) != 0 } @leftovers;
+	}
 
 	open (LEFT, ">$leftovers_txt") or die "can't write $leftovers_txt: $!";
 	print LEFT @leftovers;
@@ -148,7 +182,7 @@ writeReport();
 
 	if (scalar(@leftovers)) {
 		# Store leftovers, for easier identification:
-		system("$GTAR -T $leftovers_txt -plcf - | (cd leftovers-${arch}; $GTAR -plxf -)");
+		my_system("$vars{GTAR} -T $leftovers_txt -plcf - | (cd leftovers-$vars{arch}; $vars{GTAR} -plxf -)");
 	}
 
 	# Add links to leftover list:
@@ -161,7 +195,7 @@ writeReport();
 EOOUT
 	foreach (@leftovers) {
 		chomp;
-	    	print OUT "<a href=\"${FTPHOST}/${FTPURL}/leftovers-${arch}$_\">$_</a>\n";
+	    	print OUT "<a href=\"$vars{FTPHOST}/$vars{FTPURL}/leftovers-$vars{arch}$_\">$_</a>\n";
 	}
 	print OUT <<EOOUT2;
 </pre>
@@ -172,17 +206,17 @@ EOOUT2
 }
 
 # print the result of a single broken package
-sub pkgResult {
+sub pkgResult ($$) {
 	my ($pinfo, $state) = @_;
 	my $pkg = $pinfo->{pkg};
 	my $nbrokenby = $pinfo->{nbrokenby};
 	my $nerrors = $pinfo->{nerrors};
 
-	@idents = `${FIND} ${USR_PKGSRC}/${pkg} -type f -print | xargs grep \\\$NetBSD`;
-	$datetime = "";
-	$file = "";
-	$ver = "";
-	foreach $ident (@idents) {
+	my @idents = `$vars{FIND} $vars{USR_PKGSRC}/$pkg -type f -print | xargs grep \\\$NetBSD`;
+	my $datetime = "";
+	my $file = "";
+	my $ver = "";
+	foreach my $ident (@idents) {
 		$ident =~ /\$[N]etBSD: ([^ ]*),v ([^ ]*) ([^ ]*) ([^ ]*) ([^ ]*) Exp \$/;
 		if ("$3 $4" gt $datetime) {
 			$datetime = "$3 $4";
@@ -191,7 +225,7 @@ sub pkgResult {
 		}
 	}
 
-	$maintainer = `grep ^MAINTAINER $USR_PKGSRC/$pkg/Makefile`;
+	my $maintainer = `grep ^MAINTAINER $vars{USR_PKGSRC}/$pkg/Makefile`;
 	$maintainer =~ s/MAINTAINER=[ \t]*//;
 	$maintainer =~ s/</&lt;/g;
 	$maintainer =~ s/>/&gt;/g;
@@ -199,7 +233,7 @@ sub pkgResult {
 
 	(my $state_style = $state) =~ s/ //g;
 
-	$nbrokenby_html = '<td>&nbsp;</td>'; 
+	my $nbrokenby_html = '<td>&nbsp;</td>'; 
 	$nbrokenby_html =
 		'<td align="right" class="pkg-'.$state_style.'">'.$nbrokenby.'</td>'
 		if $nbrokenby > 0;
@@ -222,14 +256,14 @@ EOHTML
 # write the build report
 sub writeReport {
 	my $broken = getBroken();
-	$nbroken = scalar(@{$broken->{"broken"}});
-	$nbrokendep = scalar(@{$broken->{"broken depends"}});
-	$nunpackaged = scalar(@{$broken->{"not packaged"}});
-	$nbrokentot = $nbroken + $nbrokendep;
-	$ntotal = $nunpackaged + $nbroken + $nbrokendep;
+	my $nbroken = scalar(@{$broken->{"broken"}});
+	my $nbrokendep = scalar(@{$broken->{"broken depends"}});
+	my $nunpackaged = scalar(@{$broken->{"not packaged"}});
+	my $nbrokentot = $nbroken + $nbrokendep;
+	my $ntotal = $nunpackaged + $nbroken + $nbrokendep;
 
 	# determine the number of packages attempted, and then successful
-	open(ORDER, $ordfile) || die "can't open $ordfile: $!";
+	open(ORDER, $vars{ORDERFILE}) || die "can't open $vars{ORDERFILE}: $!";
 	my @order = <ORDER>;
 	close(ORDER);
 	my $nattempted = scalar(@order);
@@ -238,7 +272,7 @@ sub writeReport {
 	if ($verbose) {
 		print <<EOF;
 pkgsrc bulk build results
-$os $osrev/$arch
+$os $vars{osrev}/$vars{arch}
 
 Summary:
 
@@ -248,7 +282,7 @@ EOF
 EOF
 		print swrite($summary_form, "Build started:", $startdate);
 		print swrite($summary_form, "Build ended:", $enddate);
-		print swrite($summary_form);
+		print swrite($summary_form, '', '');
 		print swrite($summary_form, "Successfully packaged:", $nsuccessful);
 		print swrite($summary_form, "Packages really broken:", $nbroken);
 		print swrite($summary_form, "Pkgs broken due to them:", $nbrokendep);
@@ -260,15 +294,15 @@ EOF
 Packages not listed here resulted in a binary package. The build
 report, including logs of failed/not-packaged is available from:
 
-$FTPHOST/$FTPURL/$reportf
+$vars{FTPHOST}/$vars{FTPURL}/$reportf
 EOF
 	}
 
-	open(HTML,">$REPORT") or die "Can't write $REPORT: $!\n";
+	open(HTML, ">$vars{REPORT}") or die "Can't write $vars{REPORT}: $!\n";
 	print HTML <<EOHTML;
 <html>
 <head>
-<title>$os $osrev/$arch bulk package build</title>
+<title>$os $vars{osrev}/$vars{arch} bulk package build</title>
 <style type="text/css">
 <!--
 
@@ -362,9 +396,9 @@ tt.filename {
 
 <body bgcolor="white" text="black" link="#3535c5" vlink="#700080" alink="#3535c5">
 
-<a name="top"/>
+<a name="top"></a>
 <h1>pkgsrc bulk build results</h1>
-<h2>$os $osrev/$arch</h2>
+<h2>$os $vars{osrev}/$vars{arch}</h2>
 
 <h3>Summary</h3>
 
@@ -400,13 +434,13 @@ tt.filename {
 
 <p>
   Packages not listed here resulted in a <a
-  href="../../packages/" title="binary packages for $os $osrev/$arch">binary
+  href="../../packages/" title="binary packages for $os $vars{osrev}/$vars{arch}">binary
   package</a>. Results of failed packages are available below.
 </p>
 
 <p>
   Files leftover from the build (because of broken PLISTs, etc.) can be
-  found in <a href="leftovers-${arch}.html" title="leftover files">this
+  found in <a href="leftovers-$vars{arch}.html" title="leftover files">this
   list</a>.
 </p>
 
@@ -438,7 +472,7 @@ EOHTML
 
 		print HTML <<EOHTML;
 
-<a name="$state"/>
+<a name="$state"></a>
 <h2>$state_head{$state}</h2>
 <table width="100%">
 <tr align="left">
@@ -478,7 +512,6 @@ The following cache files were used during the build:
 
 <p>    
 <ul>
-<!-- <li>View the <a href="$prog">progress</a> of the build. -->
 <!-- <li>See the list of <a href="../index.html">all log files</a>. -->
 <li>Visit the <a href="http://www.NetBSD.org">NetBSD web site</a>.
 <li>Learn more about
@@ -492,25 +525,28 @@ EOHTML
 	close(HTML);
 
 	if ($verbose) {
-		print "\n\n$ADMINSIG\n\n";
+		print "\n\n$vars{ADMINSIG}\n\n";
 		print "[* This message was created by the Packages Collection bulk build software *]\n";
 	}
 }
 
 # get and sort the broken packages
 sub getBroken {
-	if (!open (BF, $BROKENFILE)) {
-		return undef;
-	}
-		
+	my $res = {
+		'broken' => [],
+		'broken depends' => [],
+		'not packaged' => [],
+	};
+
+	open (BF, $vars{BROKENFILE}) || return $res;
 	my @in = <BF>;
 	close (BF);
 
-	my $res = {};
 	foreach (@in) {
 		chomp;
 		my ($nerrors, $bf, $nbrokenby) = split;
-		(my $pkg = $bf) =~ s,/$BROKENFILE,,;
+		my $pkg = $bf;
+		$pkg =~ s,/$vars{BROKENFILE},,;
 		my %tmp = (
 			bf => $bf,
 			pkg => $pkg,
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index e941f9a946c..4ae1398ba77 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.40 2004/11/16 18:34:12 jlam Exp $
+# $NetBSD: pre-build,v 1.40.2.1 2005/01/13 20:11:55 tv Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -135,10 +135,9 @@ rm -fr /tmp/mod*
 
 # Clean up state files
 cd ${USR_PKGSRC}
-rm -f $BROKENF */*/$BROKENF
-rm -f $BRKWRKLOG */*/$BRKWRKLOG
-rm -f $BLDLOG */*/$BLDLOG
-rm -f $STARTFILE
+echo Cleaning up leftover state files from previous runs
+rm -f */*/$BROKENF */*/$BRKWRKLOG */*/$BLDLOG
+rm -f $BROKENF $BRKWRKLOG $BLDLOG $STARTFILE
 
 
 
diff --git a/mk/compiler.mk b/mk/compiler.mk
index 0dcabb24735..1b537359643 100644
--- a/mk/compiler.mk
+++ b/mk/compiler.mk
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.38.2.4 2005/01/10 16:15:25 tv Exp $
+# $NetBSD: compiler.mk,v 1.38.2.5 2005/01/13 20:11:55 tv Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -13,6 +13,7 @@
 #		ccc		Compaq C Compilers (Tru64)
 #		ccache		compiler cache (chainable)
 #		distcc		distributed C/C++ (chainable)
+#		f2c		Fortran 77 to C compiler (chainable)
 #		gcc		GNU
 #		mipspro		Silicon Graphics, Inc. MIPSpro (n32/n64)
 #		mipspro-ucode	Silicon Graphics, Inc. MIPSpro (o32)
@@ -20,10 +21,12 @@
 #				ONE Studio
 #		xlc		IBM's XL C/C++ compiler suite
 #
-#	The default is "gcc".  You can use ccache and/or distcc with an
-#	appropriate PKGSRC_COMPILER setting, e.g. "ccache distcc gcc".
-#	The chain should always end in a real compiler.  This should only
-#	be set in /etc/mk.conf.
+#	The default is "gcc".  You can use ccache and/or distcc with
+#	an appropriate PKGSRC_COMPILER setting, e.g. "ccache distcc
+#	gcc".  You can also use "f2c" to overlay the lang/f2c package
+#	over the C compiler instead of using the system Fortran
+#	compiler.  The chain should always end in a real compiler.
+#	This should only be set in /etc/mk.conf.
 #
 # GCC_REQD
 #	A list of version numbers used to determine the minimum
@@ -45,7 +48,7 @@
 #	Lists the languages used in the source code of the package,
 #	and is used to determine the correct compilers to install.
 #	Valid values are: c, c++, fortran, java, objc.  The default
-#	is "c".
+#	is "c" ("c" is actually _always_ implicitly in this list).
 #
 # The following variables are defined, and available for testing in
 # package Makefiles:
@@ -65,17 +68,21 @@ BSD_COMPILER_MK=	defined
 
 .include "../../mk/bsd.prefs.mk"
 
-# By default, assume that the package requires a C compiler.
+# Always require a C compiler for proper compiler detection.
 USE_LANGUAGES?=	c
+.if empty(USE_LANGUAGES:Mc)
+USE_LANGUAGES:=	c ${USE_LANGUAGES}
+.endif
 
 # For environments where there is an external gcc too, but pkgsrc
 # should use the pkgsrc one for consistency.
+#
 .if defined(USE_PKGSRC_GCC)
 _USE_PKGSRC_GCC=	yes
 .endif
 
 _COMPILERS=		ccc gcc mipspro mipspro-ucode sunpro xlc
-_PSEUDO_COMPILERS=	ccache distcc
+_PSEUDO_COMPILERS=	ccache distcc f2c
 
 .if defined(NOT_FOR_COMPILER) && !empty(NOT_FOR_COMPILER)
 .  for _compiler_ in ${_COMPILERS}
diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index e563d6d4f0c..0cb8318f964 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -1,4 +1,39 @@
-# $NetBSD: ccache.mk,v 1.20.2.3 2005/01/10 16:15:25 tv Exp $
+# $NetBSD: ccache.mk,v 1.20.2.4 2005/01/13 20:11:55 tv Exp $
+#
+# Copyright (c) 2004 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
 
 .if !defined(COMPILER_CCACHE_MK)
 COMPILER_CCACHE_MK=	defined
@@ -41,14 +76,14 @@ _CCACHE_VARS=	# empty
 PKG_CC?=	${CC}
 _CCACHE_VARS+=	CC
 _CCACHE_CC:=	${_CCACHE_DIR}/bin/${PKG_CC:T}
-_ALIASES.CC?=	cc
+_ALIASES.CC+=	cc
 PKG_CC:=	${_CCACHE_CC}
 .  endif
 .  if !empty(_LANGUAGES.ccache:Mc++)
 PKG_CXX?=	${CXX}
 _CCACHE_VARS+=	CXX
 _CCACHE_CXX:=	${_CCACHE_DIR}/bin/${PKG_CXX:T}
-_ALIASES.CXX?=	c++
+_ALIASES.CXX+=	c++
 PKG_CXX:=	${_CCACHE_CXX}
 .  endif
 
diff --git a/mk/compiler/ccc.mk b/mk/compiler/ccc.mk
index ce77dfe0f7b..96294db08ad 100644
--- a/mk/compiler/ccc.mk
+++ b/mk/compiler/ccc.mk
@@ -1,51 +1,38 @@
-# $NetBSD: ccc.mk,v 1.2.2.2 2004/11/30 15:06:35 tv Exp $
+# $NetBSD: ccc.mk,v 1.2.2.3 2005/01/13 20:11:55 tv Exp $
 
 .if !defined(COMPILER_CCC_MK)
 COMPILER_CCC_MK=	defined
 
 .include "../../mk/bsd.prefs.mk"
 
-# LANGUAGES.<compiler> is the list of supported languages by the compiler.
-# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
-# requested by the package in USE_LANGUAGES.
-# 
+# LANGUAGES.<compiler> is the list of supported languages by the
+# compiler.
+#
+LANGUAGES.ccc=		# empty
 
-LANGUAGES.ccc=		c
-.if exists(/usr/lib/cmplrs/cxx)
-LANGUAGES.ccc+=		c++
-.endif
-_LANGUAGES.ccc=		# empty
-.for _lang_ in ${USE_LANGUAGES}
-_LANGUAGES.ccc+=	${LANGUAGES.ccc:M${_lang_}}
-.endfor
-
-_CCC_DIR=	${WRKDIR}/.ccc
-_CCC_VARS=	# empty
+_CCC_DIR=		${WRKDIR}/.ccc
+_CCC_VARS=		# empty
 .if exists(/usr/bin/cc)
-_CCC_VARS+=	CC
-_CCC_CC=	${_CCC_DIR}/cc
-_ALIASES.CC=	cc
-CCPATH=		/usr/bin/cc
-PKG_CC:=	${_CCC_CC}
-.  if !empty(CC:M*gcc)
-CC:=		${PKG_CC:T}	# ${CC} should be named "cc".
-.  endif
+LANGUAGES.ccc+=		c
+_CCC_VARS+=		CC
+_CCC_CC=		${_CCC_DIR}/cc
+_ALIASES.CC=		cc
+CCPATH=			/usr/bin/cc
+PKG_CC:=		${_CCC_CC}
 .endif
-.if exists(/usr/bin/cxx)
-_CCC_VARS+=	CXX
-_CCC_CXX=	${_CCC_DIR}/cxx
-_ALIASES.CXX=	c++ cxx
-CXXPATH=	/usr/bin/cxx
-PKG_CXX:=	${_CCC_CXX}
-.  if !empty(CXX:M*g++)
-CXX:=		${PKG_CXX:T}	 # ${CXX} should be named "cxx"
-.  endif
+.if exists(/usr/bin/cxx) && exists(/usr/lib/cmplrs/cxx)
+LANGUAGES.ccc+=		c++
+_CCC_VARS+=		CXX
+_CCC_CXX=		${_CCC_DIR}/cxx
+_ALIASES.CXX=		c++ cxx
+CXXPATH=		/usr/bin/cxx
+PKG_CXX:=		${_CCC_CXX}
 .endif
 _COMPILER_STRIP_VARS+=	${_CCC_VARS}
 
 .if exists(${CCPATH}) && !defined(CC_VERSION_STRING)
-CC_VERSION_STRING!=	${CCPATH} -V 2>&1 | awk '{print; exit(0);}'
-CC_VERSION!=		${CCPATH} -V 2>&1 | awk '{print "CCC-"$3; exit(0);}'
+CC_VERSION_STRING!=	${CCPATH} -V 2>&1 | ${AWK} '{print; exit(0);}'
+CC_VERSION!=		${CCPATH} -V 2>&1 | ${AWK} '{print "CCC-"$3; exit(0);}'
 .else
 CC_VERSION_STRING?=	${CC_VERSION}
 CC_VERSION?=		CCC
@@ -61,8 +48,21 @@ _LINKER_RPATH_FLAG=	-rpath
 _COMPILER_RPATH_FLAG=	${_COMPILER_LD_FLAG}${_LINKER_RPATH_FLAG},
 
 # Most packages assume ieee floats, make that the default.
-CFLAGS+=-ieee
-CXXFLAGS+=-ieee
+CFLAGS+=	-ieee
+CXXFLAGS+=	-ieee
+
+# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the
+# ones requested by the package in USE_LANGUAGES.
+# 
+_LANGUAGES.ccc=		# empty
+.for _lang_ in ${USE_LANGUAGES}
+_LANGUAGES.ccc+=	${LANGUAGES.ccc:M${_lang_}}
+.endfor
+
+# Prepend the path to the compiler to the PATH.
+.if !empty(_LANGUAGES.ccc)
+PREPEND_PATH+=	${_CCC_DIR}/bin
+.endif
 
 # Create compiler driver scripts in ${WRKDIR}.
 .for _var_ in ${_CCC_VARS}
@@ -84,4 +84,14 @@ ${_CCC_${_var_}}:
 .  endif
 .endfor
 
+# Force the use of f2c-f77 for compiling Fortran.
+_CCC_USE_F2C=	no
+FCPATH=		/nonexistent
+.if !exists(${FCPATH})
+_CCC_USE_F2C=	yes
+.endif
+.if !empty(_CCC_USE_F2C:M[yY][eE][sS])
+.  include "../../mk/compiler/f2c.mk"
+.endif
+
 .endif	# COMPILER_CCC_MK
diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk
index e53bfd638c8..8419441dd6d 100644
--- a/mk/compiler/distcc.mk
+++ b/mk/compiler/distcc.mk
@@ -1,4 +1,39 @@
-# $NetBSD: distcc.mk,v 1.21.2.3 2005/01/10 16:15:25 tv Exp $
+# $NetBSD: distcc.mk,v 1.21.2.4 2005/01/13 20:11:55 tv Exp $
+#
+# Copyright (c) 2004 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
 
 .if !defined(COMPILER_DISTCC_MK)
 COMPILER_DISTCC_MK=	defined
@@ -41,14 +76,14 @@ _DISTCC_VARS=	# empty
 PKG_CC?=	${CC}
 _DISTCC_VARS+=	CC
 _DISTCC_CC:=	${_DISTCC_DIR}/bin/${PKG_CC:T}
-_ALIASES.CC?=	cc
+_ALIASES.CC+=	cc
 PKG_CC:=	${_DISTCC_CC}
 .  endif
 .  if !empty(_LANGUAGES.distcc:Mc++)
 PKG_CXX?=	${CXX}
 _DISTCC_VARS+=	CXX
 _DISTCC_CXX:=	${_DISTCC_DIR}/bin/${PKG_CXX:T}
-_ALIASES.CXX?=	c++
+_ALIASES.CXX+=	c++
 PKG_CXX:=	${_DISTCC_CXX}
 .  endif
 
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk
new file mode 100644
index 00000000000..49d5a8369c4
--- /dev/null
+++ b/mk/compiler/f2c.mk
@@ -0,0 +1,128 @@
+# $NetBSD: f2c.mk,v 1.3.2.2 2005/01/13 20:11:55 tv Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+.if !defined(COMPILER_F2C_MK)
+COMPILER_F2C_MK=	defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(PKGPATH:Mlang/f2c) || !empty(PKGPATH:Mdevel/patch) || \
+    !empty(PKGPATH:Mdevel/libtool-base)
+IGNORE_F2C=	yes
+MAKEFLAGS+=	IGNORE_F2C=yes
+.endif
+
+.if defined(IGNORE_F2C)
+_USE_F2C=	NO
+.endif
+
+# LANGUAGES.<compiler> is the list of supported languages by the compiler.
+# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
+# requested by the package in USE_LANGUAGES.
+# 
+LANGUAGES.f2c=	fortran
+_LANGUAGES.f2c=	# empty
+.for _lang_ in ${USE_LANGUAGES}
+_LANGUAGES.f2c+=	${LANGUAGES.f2c:M${_lang_}}
+.endfor
+.if empty(_LANGUAGES.f2c)
+_USE_F2C=	NO
+.endif
+
+.if !defined(_USE_F2C)
+_USE_F2C=	YES
+.endif
+
+.if !empty(_USE_F2C:M[yY][eE][sS])
+EVAL_PREFIX+=		_F2CBASE=f2c
+_F2CBASE_DEFAULT=	${LOCALBASE}
+_F2CBASE?=		${LOCALBASE}
+
+_F2C_DIR=	${WRKDIR}/.f2c
+_F2C_VARS=	# empty
+.  if !empty(_LANGUAGES.f2c:Mfortran)
+PKG_FC?=	${FC}
+_F2C_VARS+=	FC
+_F2C_FC:=	${_F2C_DIR}/bin/${PKG_FC:T}
+_ALIASES.FC+=	f77 f2c-f77
+FCPATH=		${_F2CBASE}/bin/f2c-f77
+PKG_FC:=	${_F2C_FC}
+#
+# The f2c-f77 shell script invokes the C compiler, so ensure that it finds
+# the cc wrapper for proper transformations.
+#
+# XXX This shouldn't really be leaking into here, as it breaks encapsulation.
+# XXX It should really be handled within the wrapper framework.
+#
+_WRAP_ENV.FC=	PATH="${WRAPPER_BINDIR}:${_WRAP_PATH}"; export PATH
+.  endif
+
+# Prepend the path the to the compiler to the PATH
+.  if !empty(_LANGUAGES.f2c)
+PREPEND_PATH+=	${_F2C_DIR}/bin
+.  endif
+
+# Add the dependency on f2c.
+.  if !empty(USE_BUILDLINK3:M[yY][eE][sS])
+.    include "../../lang/f2c/buildlink3.mk"
+.  else
+DEPENDS+=	f2c>=20001205nb3:../../lang/f2c
+.  endif
+
+.  if defined(F2C_DIR) && !empty(F2C_DIR)
+BUILD_ENV+=	F2C_DIR=${F2C_DIR:Q}
+.  endif
+
+# Create symlinks for the compiler into ${WRKDIR}.
+.  for _var_ in ${_F2C_VARS}
+.    if !target(${_F2C_${_var_}})
+override-tools: ${_F2C_${_var_}}
+${_F2C_${_var_}}:
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${.TARGET}
+.      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	if [ ! -x "${_alias_}" ]; then					\
+		${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${_alias_};		\
+	fi
+.      endfor
+.    endif
+.  endfor
+.endif	# _USE_F2C == "yes"
+
+.endif	# COMPILER_F2C_MK
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index e1899feb0df..dd5a7b5180e 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.74.2.2 2004/11/30 15:06:35 tv Exp $
+# $NetBSD: gcc.mk,v 1.74.2.3 2005/01/13 20:11:55 tv Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=	defined
@@ -436,4 +436,21 @@ ${_GCC_${_var_}}:
 .  endif
 .endfor
 
+# On older NetBSD systems and where the Fortran compiler doesn't exist,
+# force the use of f2c-f77.
+#
+_GCC_USE_F2C=	no
+.if !exists(${FCPATH})
+_GCC_USE_F2C=	yes
+.else
+.  for _pattern_ in 0.* 1.[0-4] 1.[0-4].*
+.    if !empty(MACHINE_PLATFORM:MNetBSD-${_pattern_}-*)
+_GCC_USE_F2C=	yes
+.    endif
+.  endfor
+.endif
+.if !empty(_GCC_USE_F2C:M[yY][eE][sS])
+.  include "../../mk/compiler/f2c.mk"
+.endif
+
 .endif	# COMPILER_GCC_MK
diff --git a/mk/compiler/mipspro-ucode.mk b/mk/compiler/mipspro-ucode.mk
index 60136fb5303..1e9dabee0fb 100644
--- a/mk/compiler/mipspro-ucode.mk
+++ b/mk/compiler/mipspro-ucode.mk
@@ -1,4 +1,39 @@
-# $NetBSD: mipspro-ucode.mk,v 1.2 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: mipspro-ucode.mk,v 1.2.8.1 2005/01/13 20:11:55 tv Exp $
+#
+# Copyright (c) 2004 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by 
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
 
 .if !defined(COMPILER_MIPSPRO_UCODE_MK)
 COMPILER_MIPSPRO_UCODE_MK=	defined
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index 51a76c93078..b15154d1c22 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.26.2.2 2004/11/30 15:06:35 tv Exp $
+# $NetBSD: mipspro.mk,v 1.26.2.3 2005/01/13 20:11:55 tv Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=	defined
@@ -7,37 +7,28 @@ COMPILER_MIPSPRO_MK=	defined
 
 MIPSPROBASE?=	/usr
 
-# LANGUAGES.<compiler> is the list of supported languages by the compiler.
-# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
-# requested by the package in USE_LANGUAGES.
-# 
-LANGUAGES.mipspro=	c c++
-_LANGUAGES.mipspro=	# empty
-.for _lang_ in ${USE_LANGUAGES}
-_LANGUAGES.mipspro+=	${LANGUAGES.mipspro:M${_lang_}}
-.endfor
+# LANGUAGES.<compiler> is the list of supported languages by the
+# compiler.
+#
+LANGUAGES.mipspro=	# empty
 
 _MIPSPRO_DIR=		${WRKDIR}/.mipspro
 _MIPSPRO_VARS=		# empty
 .if exists(${MIPSPROBASE}/bin/cc)
+LANGUAGES.mipspro+=	c
 _MIPSPRO_VARS+=		CC
 _MIPSPRO_CC=		${_MIPSPRO_DIR}/bin/cc
 _ALIASES.CC=		cc
 CCPATH=			${MIPSPROBASE}/bin/cc
 PKG_CC:=		${_MIPSPRO_CC}
-.  if !empty(CC:M*gcc)
-CC:=			${PKG_CC:T}	# ${CC} should be named "cc".
-.  endif
 .endif
 .if exists(${MIPSPROBASE}/bin/CC)
+LANGUAGES.mipspro+=	c++
 _MIPSPRO_VARS+=		CXX
 _MIPSPRO_CXX=		${_MIPSPRO_DIR}/bin/CC
 _ALIASES.CXX=		CC c++
 CXXPATH=		${MIPSPROBASE}/bin/CC
 PKG_CXX:=		${_MIPSPRO_CXX}
-.  if !empty(CXX:M*g++)
-CXX:=			${PKG_CXX:T}	 # ${CXX} should be named "CC"
-.  endif
 .endif
 _COMPILER_STRIP_VARS+=	${_MIPSPRO_VARS}
 
@@ -64,6 +55,14 @@ _COMPILER_ABI_FLAG.o32=	# empty
 _COMPILER_ABI_FLAG.n32=	-n32
 _COMPILER_ABI_FLAG.64=	-64
 
+# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the
+# ones requested by the package in USE_LANGUAGES.
+# 
+_LANGUAGES.mipspro=	# empty
+.for _lang_ in ${USE_LANGUAGES}
+_LANGUAGES.mipspro+=	${LANGUAGES.mipspro:M${_lang_}}
+.endfor
+
 # Prepend the path to the compiler to the PATH.
 .if !empty(_LANGUAGES.mipspro)
 PREPEND_PATH+=	${_MIPSPRO_DIR}/bin
@@ -95,4 +94,14 @@ CFLAGS+=        ${MABIFLAG}
 LDFLAGS+=       ${MABIFLAG}
 .endif
 
+# Force the use of f2c-f77 for compiling Fortran.
+_MIPSPRO_USE_F2C=	no
+FCPATH=			/nonexistent
+.if !exists(${FCPATH})
+_MIPSPRO_USE_F2C=	yes
+.endif
+.if !empty(_MIPSPRO_USE_F2C:M[yY][eE][sS])
+.  include "../../mk/compiler/f2c.mk"
+.endif
+
 .endif	# COMPILER_MIPSPRO_MK
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index 2362d3a61cb..d04faa5ae2c 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.22.2.2 2004/11/30 15:06:35 tv Exp $
+# $NetBSD: sunpro.mk,v 1.22.2.3 2005/01/13 20:11:55 tv Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=	defined
@@ -7,37 +7,28 @@ COMPILER_SUNPRO_MK=	defined
 
 SUNWSPROBASE?=	/opt/SUNWspro
 
-# LANGUAGES.<compiler> is the list of supported languages by the compiler.
-# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
-# requested by the package in USE_LANGUAGES.
+# LANGUAGES.<compiler> is the list of supported languages by the
+# compiler.
 #
-LANGUAGES.sunpro=	c c++
-_LANGUAGES.sunpro=	# empty
-.for _lang_ in ${USE_LANGUAGES}
-_LANGUAGES.sunpro+=	${LANGUAGES.sunpro:M${_lang_}}
-.endfor
+LANGUAGES.sunpro=	# empty
 
-_SUNPRO_DIR=	${WRKDIR}/.sunpro
-_SUNPRO_VARS=	# empty
+_SUNPRO_DIR=		${WRKDIR}/.sunpro
+_SUNPRO_VARS=		# empty
 .if exists(${SUNWSPROBASE}/bin/cc)
-_SUNPRO_VARS+=	CC
-_SUNPRO_CC=	${_SUNPRO_DIR}/bin/cc
-_ALIASES.CC=	cc
-CCPATH=		${SUNWSPROBASE}/bin/cc
-PKG_CC:=	${_SUNPRO_CC}
-.  if !empty(CC:M*gcc)
-CC:=		${PKG_CC:T}	# ${CC} should be named "cc".
-.  endif
+LANGUAGES.sunpro+=	c
+_SUNPRO_VARS+=		CC
+_SUNPRO_CC=		${_SUNPRO_DIR}/bin/cc
+_ALIASES.CC=		cc
+CCPATH=			${SUNWSPROBASE}/bin/cc
+PKG_CC:=		${_SUNPRO_CC}
 .endif
 .if exists(${SUNWSPROBASE}/bin/CC)
-_SUNPRO_VARS+=	CXX
-_SUNPRO_CXX=	${_SUNPRO_DIR}/bin/CC
-_ALIASES.CXX=	CC c++
-CXXPATH=	${SUNWSPROBASE}/bin/CC
-PKG_CXX:=	${_SUNPRO_CXX}
-.  if !empty(CXX:M*g++)
-CXX:=		${PKG_CXX:T}	# ${CXX} should be named "CC".
-.  endif
+LANGUAGES.sunpro+=	c++
+_SUNPRO_VARS+=		CXX
+_SUNPRO_CXX=		${_SUNPRO_DIR}/bin/CC
+_ALIASES.CXX=		CC c++
+CXXPATH=		${SUNWSPROBASE}/bin/CC
+PKG_CXX:=		${_SUNPRO_CXX}
 .endif
 _COMPILER_STRIP_VARS+=	${_SUNPRO_VARS}
 
@@ -58,6 +49,14 @@ CC_VERSION_STRING?=	${CC_VERSION}
 CC_VERSION?=		cc: Sun C
 .endif
 
+# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the
+# ones requested by the package in USE_LANGUAGES.
+#
+_LANGUAGES.sunpro=	# empty
+.for _lang_ in ${USE_LANGUAGES}
+_LANGUAGES.sunpro+=	${LANGUAGES.sunpro:M${_lang_}}
+.endfor
+
 # Prepend the path to the compiler to the PATH.
 .if !empty(_LANGUAGES.sunpro)
 PREPEND_PATH+=	${_SUNPRO_DIR}/bin
@@ -83,4 +82,14 @@ ${_SUNPRO_${_var_}}:
 .  endif
 .endfor
 
+# Force the use of f2c-f77 for compiling Fortran.
+_SUNPRO_USE_F2C=	no
+FCPATH=			/nonexistent
+.if !exists(${FCPATH})
+_SUNPRO_USE_F2C=	yes
+.endif
+.if !empty(_SUNPRO_USE_F2C:M[yY][eE][sS])
+.  include "../../mk/compiler/f2c.mk"
+.endif
+
 .endif	# COMPILER_SUNPRO_MK
diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk
index 161dda7a9bd..b1dc2905a80 100644
--- a/mk/compiler/xlc.mk
+++ b/mk/compiler/xlc.mk
@@ -1,4 +1,39 @@
-# $NetBSD: xlc.mk,v 1.2.2.3 2004/11/30 15:06:35 tv Exp $
+# $NetBSD: xlc.mk,v 1.2.2.4 2005/01/13 20:11:55 tv Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Grant Beattie.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
 
 .if !defined(COMPILER_XLC_MK)
 COMPILER_XLC_MK=	defined
@@ -7,37 +42,28 @@ COMPILER_XLC_MK=	defined
 
 XLCBASE?=	/opt/ibmcmp/vacpp/6.0
 
-# LANGUAGES.<compiler> is the list of supported languages by the compiler.
-# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
-# requested by the package in USE_LANGUAGES.
+# LANGUAGES.<compiler> is the list of supported languages by the
+# compiler.
 #
-LANGUAGES.xlc=		c c++
-_LANGUAGES.xlc=		# empty
-.for _lang_ in ${USE_LANGUAGES}
-_LANGUAGES.xlc+=	${LANGUAGES.xlc:M${_lang_}}
-.endfor
+LANGUAGES.xlc=		# empty
 
-_XLC_DIR=	${WRKDIR}/.xlc
-_XLC_VARS=	# empty
+_XLC_DIR=		${WRKDIR}/.xlc
+_XLC_VARS=		# empty
 .if exists(${XLCBASE}/bin/xlc)
-_XLC_VARS+=	CC
-_XLC_CC=	${_XLC_DIR}/bin/xlc
-_ALIASES.CC=	cc xlc
-CCPATH=		${XLCBASE}/bin/xlc
-PKG_CC:=	${_XLC_CC}
-.  if !empty(CC:M*gcc)
-CC:=		${PKG_CC:T}	# ${CC} should be named "xlc".
-.  endif
+LANGUAGES.xlc+=		c
+_XLC_VARS+=		CC
+_XLC_CC=		${_XLC_DIR}/bin/xlc
+_ALIASES.CC=		cc xlc
+CCPATH=			${XLCBASE}/bin/xlc
+PKG_CC:=		${_XLC_CC}
 .endif
 .if exists(${XLCBASE}/bin/xlc++)
-_XLC_VARS+=	CXX
-_XLC_CXX=	${_XLC_DIR}/bin/xlc++
-_ALIASES.CXX=	c++ xlc++
-CXXPATH=	${XLCBASE}/bin/xlc++
-PKG_CXX:=	${_XLC_CXX}
-.  if !empty(CXX:M*g++)
-CXX:=		${PKG_CXX:T}	# ${CXX} should be named "xlc++".
-.  endif
+LANGUAGES.xlc+=		c++
+_XLC_VARS+=		CXX
+_XLC_CXX=		${_XLC_DIR}/bin/xlc++
+_ALIASES.CXX=		c++ xlc++
+CXXPATH=		${XLCBASE}/bin/xlc++
+PKG_CXX:=		${_XLC_CXX}
 .endif
 _COMPILER_STRIP_VARS+=	${_XLC_VARS}
 
@@ -49,15 +75,23 @@ CC_VERSION_STRING?=	${CC_VERSION}
 CC_VERSION?=		IBM XL C
 .endif
 
+# Most packages assume alloca is available without #pragma alloca, so
+# make it the default.
+CFLAGS+=	-ma
+
+# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the
+# ones requested by the package in USE_LANGUAGES.
+#
+_LANGUAGES.xlc=		# empty
+.for _lang_ in ${USE_LANGUAGES}
+_LANGUAGES.xlc+=	${LANGUAGES.xlc:M${_lang_}}
+.endfor
+
 # Prepend the path to the compiler to the PATH.
 .if !empty(_LANGUAGES.xlc)
 PREPEND_PATH+=	${_XLC_DIR}/bin
 .endif
 
-# Most packages assume alloca is available without #pragma alloca, so
-# make it the default.
-CFLAGS+=-ma
-
 # Create compiler driver scripts in ${WRKDIR}.
 .for _var_ in ${_XLC_VARS}
 .  if !target(${_XLC_${_var_}})
@@ -78,4 +112,14 @@ ${_XLC_${_var_}}:
 .  endif
 .endfor
 
+# Force the use of f2c-f77 for compiling Fortran.
+_XLC_USE_F2C=	no
+FCPATH=		/nonexistent
+.if !exists(${FCPATH})
+_XLC_USE_F2C=	yes
+.endif
+.if !empty(_XLC_USE_F2C:M[yY][eE][sS])
+.  include "../../mk/compiler/f2c.mk"
+.endif
+
 .endif	# COMPILER_XLC_MK
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 5e2005e0a8b..fd4852a0ef4 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.14.2.5 2005/01/10 16:15:25 tv Exp $
+# $NetBSD: mk.conf,v 1.14.2.6 2005/01/13 20:11:55 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -217,6 +217,18 @@ MLDONKEY_USER?= mldonkey
 # Possible: any user name
 # Default: mldonkey
 
+MONOTONE_GROUP?= monotone
+# System group to run the dedicated Monotone server as.  Used by the
+# monotone-server package.
+# Possible: any group name
+# Default: monotone
+
+MONOTONE_USER?= monotone
+# System user to run the dedicated Monotone server as.  Used by the
+# monotone-server package.
+# Possible: any user name
+# Default: monotone
+
 #MOTIFBASE?=	/usr/X11R6
 # Where Motif-2.0-compatible headers and libraries are installed
 # on the system.
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 1e54729edac..61cc81181e5 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.34.2.2 2004/12/20 20:46:00 tv Exp $
+# $NetBSD: java-vm.mk,v 1.34.2.3 2005/01/13 20:11:55 tv Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -44,10 +44,10 @@ PKG_JVMS_ACCEPTED?=	${_PKG_JVMS}
 #
 .if defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS])
 _PKG_JVMS?=		sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka \
-			sun-jdk15 jdk14 win32-jdk
+			sun-jdk15 jdk14 # win32-jdk
 .else
 _PKG_JVMS?=		jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe \
-			wonka sun-jdk15 jdk14 win32-jdk
+			wonka sun-jdk15 jdk14 # win32-jdk
 .endif
 
 # To be deprecated: if PKG_JVM is explicitly set, then use it as the
@@ -72,8 +72,8 @@ _PKG_JVM_DEFAULT?=	jdk
 _PKG_JVM_DEFAULT?=	blackdown-jdk13
 .  elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
 _PKG_JVM_DEFAULT?=	sun-jdk
-.  elif !empty(MACHINE_PLATFORM:MInterix-*-*)
-_PKG_JVM_DEFAULT?=	win32-jdk
+#.  elif !empty(MACHINE_PLATFORM:MInterix-*-*)
+#_PKG_JVM_DEFAULT?=	win32-jdk
 .  else
 _PKG_JVM_DEFAULT?=	kaffe
 .  endif
@@ -101,8 +101,8 @@ _ONLY_FOR_PLATFORMS.sun-jdk14= \
 _ONLY_FOR_PLATFORMS.sun-jdk15= \
 	NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 \
 	Linux-*-i[3-6]86
-_ONLY_FOR_PLATFORMS.win32-jdk= \
-	Interix-*-*
+#_ONLY_FOR_PLATFORMS.win32-jdk= \
+#	Interix-*-*
 _ONLY_FOR_PLATFORMS.wonka= \
 	*-*-arm *-*-arm32 *-*-i386
 
@@ -122,7 +122,7 @@ _JAVA_PKGBASE.kaffe=		kaffe
 _JAVA_PKGBASE.sun-jdk13=	sun-jdk13
 _JAVA_PKGBASE.sun-jdk14=	sun-jdk14
 _JAVA_PKGBASE.sun-jdk15=	sun-jdk15
-_JAVA_PKGBASE.win32-jdk=	win32-jdk
+#_JAVA_PKGBASE.win32-jdk=	win32-jdk
 _JAVA_PKGBASE.wonka=		wonka
 
 # Mark the acceptable JVMs and check which JVM packages are installed.
@@ -208,7 +208,7 @@ BUILDLINK_DEPENDS.sun-jdk14?=		sun-jdk14-[0-9]*
 BUILDLINK_DEPENDS.sun-jre14?=		sun-jre14-[0-9]*
 BUILDLINK_DEPENDS.sun-jdk15?=		sun-jdk15-[0-9]*
 BUILDLINK_DEPENDS.sun-jre15?=		sun-jre15-[0-9]*
-BUILDLINK_DEPENDS.win32-jdk?=		win32-jdk>=0.1
+#BUILDLINK_DEPENDS.win32-jdk?=		win32-jdk>=0.1
 BUILDLINK_DEPENDS.wonka?=		wonka-[0-9]*
 
 _JRE.blackdown-jdk13=	blackdown-jre13
@@ -218,7 +218,7 @@ _JRE.kaffe=		kaffe
 _JRE.sun-jdk13=		sun-jre13
 _JRE.sun-jdk14=		sun-jre14
 _JRE.sun-jdk15=		sun-jre15
-_JRE.win32-jdk=		win32-jdk
+#_JRE.win32-jdk=		win32-jdk
 _JRE.wonka=		wonka
 
 _JAVA_BASE_CLASSES=	classes.zip
@@ -257,10 +257,10 @@ _JDK_PKGSRCDIR=		../../lang/sun-jdk15
 _JRE_PKGSRCDIR=		../../lang/sun-jre15
 _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-1.5
 UNLIMIT_RESOURCES+=	datasize
-.elif ${_PKG_JVM} == "win32-jdk"
-_JDK_PKGSRCDIR=		../../lang/win32-jdk
-_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/win32
+#.elif ${_PKG_JVM} == "win32-jdk"
+#_JDK_PKGSRCDIR=		../../lang/win32-jdk
+#_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
+#_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/win32
 .elif ${_PKG_JVM} == "wonka"
 _JDK_PKGSRCDIR=		../../lang/wonka
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 726be82815b..9439819a9ac 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.4.2.1 2004/12/31 20:25:30 tv Exp $
+# $NetBSD: DragonFly.mk,v 1.4.2.2 2005/01/13 20:11:55 tv Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -132,7 +132,7 @@ _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_LIBTOOL_REQD=	1.5.10nb9
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
-_PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
+_PATCH_CAN_BACKUP=	no	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 178106b6612..603287e62d4 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,40 @@
-# $NetBSD: texinfo.mk,v 1.24 2003/10/07 09:09:56 seb Exp $
+# $NetBSD: texinfo.mk,v 1.24.10.1 2005/01/13 20:11:55 tv Exp $
+#
+# Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Stoned Elipot.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
 #
 # This Makefile fragment is included by bsd.pkg.mk when INFO_FILES is
 # not empty or USE_MAKEINFO is not "no".
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index a9e84a2452a..d17fbb2e5ce 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.12.2.6 2005/01/10 16:15:25 tv Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.12.2.7 2005/01/13 20:11:55 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -187,7 +187,7 @@ _WRAP_LOGIC?=			${WRAPPER_TMPDIR}/logic
 _WRAP_REORDERLIBS?=		${WRAPPER_TMPDIR}/reorderlibs
 _WRAP_SCAN?=			${WRAPPER_TMPDIR}/scan
 _WRAP_SHELL_LIB?=		${WRAPPER_TMPDIR}/shell-lib
-_WRAP_SKIP_TRANSFORM?=		yes
+_WRAP_SKIP_TRANSFORM?=		no
 _WRAP_TRANSFORM?=		${_WRAP_EMPTY_FILE}
 _WRAP_TRANSFORM_SED?=		# empty
 _WRAP_TRANSFORM_SEDFILE?=	${WRAPPER_TMPDIR}/transform.sed
@@ -264,7 +264,7 @@ _WRAP_TRANSFORM.CXX=	${_WRAP_TRANSFORM.CC}
 .endif
 
 _WRAP_CMD_SINK.LD=		${WRAPPER_TMPDIR}/cmd-sink-ld
-_WRAP_TRANSFORM_SED.IMAKE=	# empty
+_WRAP_SKIP_TRANSFORM.IMAKE=	yes
 
 # XXX
 # XXX This section is ${OPSYS}-specific and shouldn't be here.