$NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $

--- ./sample.cf.orig	Wed Aug 27 09:00:31 1997
+++ ./sample.cf	Tue Jun  8 10:55:13 1999
@@ -7,5 +7,5 @@
 # $whereami -- What machine am I running on?
 #
-$whereami = "example.com";
+$whereami = "@HOSTNAME@";
 
 # $whoami -- Who do users send requests to me as?
@@ -17,5 +17,5 @@
 $whoami_owner = "Majordomo-Owner\@$whereami";
 
-# $homedir -- Where can I find my extra .pl files, like majordomo.pl?
+# $homedir -- Where can I find my lists?
 # the environment variable HOME is set by the wrapper
 #
@@ -23,5 +23,14 @@
      $homedir = $ENV{"HOME"};
 } else {
-     $homedir = "/usr/test/majordomo";
+     $homedir = "@HOME@/@MAJORDOMO_USER@";
+}
+
+# $bindir -- Where can I find my extra .pl files, like majordomo.pl?
+# the environment variable BIN is set by the wrapper
+#
+if ( defined $ENV{"BIN"}) {
+     $bindir = $ENV{"BIN"};
+} else {
+     $bindir = "@PREFIX@/libexec/majordomo";
 }
 
@@ -33,8 +42,8 @@
 # Each list must have a subdirectory under this directory in order for
 # digest to work. E.G. The bblisa list would use:
-# 	/usr/local/mail/digest/bblisa
+# 	@HOME@/@MAJORDOMO_USER@/digests/bblisa
 # as its directory.
 #
-$digest_work_dir = "/usr/local/mail/digest";
+$digest_work_dir = "$homedir/digests";
 
 # $log -- Where do I write my log?
@@ -46,6 +55,6 @@
 #                      seem to prefer /usr/sbin/sendmail
 #
-$sendmail_command = "/usr/lib/sendmail";
-# $sendmail_command = "/usr/sbin/sendmail";
+# $sendmail_command = "/usr/lib/sendmail";
+$sendmail_command = "/usr/sbin/sendmail";
 
 # $mailer -- What program and args do I use to send mail to the list?
@@ -69,5 +78,5 @@
 # To use TLB and use no outgoing alias:
 # if ($main'program_name eq 'mj_resend' && $opt_l eq 'test-list') {
-#   $mailer = "/usr/local/majordomo/tlb /usr/local/lists/${opt_l}.tlb";
+#   $mailer = "@HOME@/@MAJORDOMO_USER@/tlb @HOME@/@MAJORDOMO_USER@/lists/${opt_l}.tlb";
 # }
 #
@@ -128,6 +137,6 @@
 # directory "$filedir/$list$filedir_suffix", so set $filedir and
 # $filedir_suffix appropriately.  For instance, to look in
-# /usr/local/mail/files/$list, use:
-#   $filedir = "/usr/local/mail/files";
+# @HOME@/@MAJORDOMO_USER@/mail/files/$list, use:
+#   $filedir = "@HOME@/@MAJORDOMO_USER@/mail/files";
 #   $filedir_suffix = "";		# empty string
 # or to look in $listdir/$list.archive, use:
@@ -135,6 +144,6 @@
 #   $filedir_suffix = ".archive";
 
-$filedir = "$listdir";
-$filedir_suffix = ".archive";
+$filedir = "@HOME@/@MAJORDOMO_USER@/archives";
+$filedir_suffix = "";
 
 # What command should I use to process an "index" request?
@@ -191,5 +200,5 @@
 # Uses the environment variable TMPDIR, since that's pretty common
 #
-$TMPDIR = $ENV{'TMPDIR'} || "/usr/tmp";
+$TMPDIR = $ENV{'TMPDIR'} || "@TMPDIR@";
 
 # Tune how long set_lock tries to obtain a lock before giving up. Each