Catch up to projects/

4 files changed, 8 insertions, 43 deletions

diff --git a/CVSROOT/avail b/CVSROOT/avail
index 3b12233b3bc5..089fb4151f66 100644
--- a/CVSROOT/avail
+++ b/CVSROOT/avail
@@ -12,15 +12,6 @@ group|penaltybox|!badcommitters
 
 unavail
 avail||CVSROOT
-avail||distrib
-avail||doc
 avail||ports
-avail||projects
-avail||src
-unavail||src/contrib/binutils,src/contrib/file
-avail|obrien|src/contrib/binutils,src/contrib/file
-unavail||src/contrib/tcpdump
-avail|fenner,nectar|src/contrib/tcpdump
-avail||www
 avail|:meisters
 unavail|:penaltybox
diff --git a/CVSROOT/cfg_local.pm b/CVSROOT/cfg_local.pm
index e3f54f0a4274..923a37ec26d8 100644
--- a/CVSROOT/cfg_local.pm
+++ b/CVSROOT/cfg_local.pm
@@ -29,15 +29,16 @@ $UNEXPAND_RCSID = 1;
 $MAILCMD = "/usr/local/bin/mailsend -H";
 $MAIL_BRANCH_HDR  = "X-FreeBSD-CVS-Branch";
 $ADD_TO_LINE = 0;
+$MAILBANNER = "FreeBSD ports repository";
 
 # Sanity check to make sure we've been run through the wrapper and are
-# now primary group 'ncvs'.
+# now primary group 'pcvs'.
 #
 $COMMITCHECK_EXTRA = sub {
 	my $GRP=`/usr/bin/id -gn`;
 	chomp $GRP;
-	unless ( $GRP =~ /^ncvs$/ ) {
-		print "You do not have group ncvs (commitcheck)!\n";
+	unless ( $GRP =~ /^pcvs$/ ) {
+		print "You do not have group pcvs (commitcheck)!\n";
 		exit 1;	# We could return false here.  But there's
 			# nothing to stop us taking action here instead.
 	}
@@ -50,7 +51,7 @@ my $hostname = `/bin/hostname`;
 die "Can't determine hostname!\n" if $? >> 8;
 chomp $hostname;
 if ($hostname =~ /^repoman\.freebsd\.org$/i) {
-	$MAILADDRS='cvs-committers@FreeBSD.org cvs-all@FreeBSD.org';
+	$MAILADDRS='ports-committers@FreeBSD.org cvs-ports@FreeBSD.org cvs-all@FreeBSD.org';
 	$MAILADDRS = 'cvs@FreeBSD.org' if $DEBUG;
 
 	@COMMIT_HOSTS = qw(repoman.freebsd.org);
@@ -59,35 +60,7 @@ if ($hostname =~ /^repoman\.freebsd\.org$/i) {
 
 @LOG_FILE_MAP = (
 	'CVSROOT'	=> '^CVSROOT/',
-	'distrib'	=> '^distrib/',
-	'doc'		=> '^doc/',
 	'ports'		=> '^ports/',
-	'projects'	=> '^projects/',
-	'www'		=> '^www/',
-
-	'bin'		=> '^src/bin/',
-	'contrib'	=> '^src/contrib/',
-	'crypto'	=> '^src/crypto/',
-	'eBones'	=> '^src/eBones/',
-	'etc'		=> '^src/etc/',
-	'games'		=> '^src/games/',
-	'gnu'		=> '^src/gnu/',
-	'include'	=> '^src/include/',
-	'kerberos5'	=> '^src/kerberos5/',
-	'kerberosIV'	=> '^src/kerberosIV/',
-	'lib'		=> '^src/lib/',
-	'libexec'	=> '^src/libexec/',
-	'lkm'		=> '^src/lkm/',
-	'release'	=> '^src/release/',
-	'sbin'		=> '^src/sbin/',
-	'secure'	=> '^src/secure/',
-	'share'		=> '^src/share/',
-	'sys'		=> '^src/sys/',
-	'tools'		=> '^src/tools/',
-	'usrbin'	=> '^src/usr\.bin/',
-	'usrsbin'	=> '^src/usr\.sbin/',
-	'user'		=> '^src/',
-
 	'other'		=> '.*'
 );
 
diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl
index 7da38b1e2579..85e2b8fef483 100755
--- a/CVSROOT/log_accum.pl
+++ b/CVSROOT/log_accum.pl
@@ -697,6 +697,7 @@ if ($input_params =~ /Imported sources/) {
 
 	&do_changes_file(@text);
 	&mail_notification(@text);
+	system("/usr/local/bin/awake", $directory);
 	&cleanup_tmpfiles();
 	exit 0;
 }
@@ -895,6 +896,7 @@ for (my $i = 0; ; $i++) {
 	&mail_notification(@log_msg);
 }
 
+system("/usr/local/bin/awake", $directory);
 &cleanup_tmpfiles();
 exit 0;
 # EOF
diff --git a/CVSROOT/verifymsg b/CVSROOT/verifymsg
index 376d011ee364..6369ed636666 100644
--- a/CVSROOT/verifymsg
+++ b/CVSROOT/verifymsg
@@ -23,6 +23,5 @@
 # supported.  There can be only one entry that matches a given
 # repository.
 
-# peter's edit post-processor..
+# Sanity check commit messages for obvious problems
 DEFAULT			$CVSROOT/CVSROOT/logcheck
-