Index: head/usr.sbin/cron/cron/pathnames.h
===================================================================
--- head/usr.sbin/cron/cron/pathnames.h	(revision 334909)
+++ head/usr.sbin/cron/cron/pathnames.h	(revision 334910)
@@ -1,83 +1,67 @@
 /* Copyright 1993,1994 by Paul Vixie
  * All rights reserved
  *
  * Distribute freely, except: don't remove my name from the source or
  * documentation (don't take credit for my work), mark your changes (don't
  * get me blamed for your possible bugs), don't alter or remove this
  * notice.  May be sold if buildable source is provided to buyer.  No
  * warrantee of any kind, express or implied, is included with this
  * software; use at your own risk, responsibility for damages (if any) to
  * anyone resulting from the use of this software rests entirely with the
  * user.
  *
  * Send bug reports, bug fixes, enhancements, requests, flames, etc., and
  * I'll try to keep a version up to date.  I can be reached as follows:
  * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
  */
 
 /*
  * $FreeBSD$
  */
 
 #if (defined(BSD)) && (BSD >= 199103) || defined(__linux) || defined(AIX)
 # include <paths.h>
 #endif /*BSD*/
 
 #ifndef CRONDIR
 			/* CRONDIR is where crond(8) and crontab(1) both chdir
 			 * to; SPOOL_DIR, ALLOW_FILE, DENY_FILE, and LOG_FILE
 			 * are all relative to this directory.
 			 */
 #define CRONDIR		"/var/cron"
 #endif
 
 			/* SPOOLDIR is where the crontabs live.
 			 * This directory will have its modtime updated
 			 * whenever crontab(1) changes a crontab; this is
 			 * the signal for crond(8) to look at each individual
 			 * crontab file and reload those whose modtimes are
 			 * newer than they were last time around (or which
 			 * didn't exist last time around...)
 			 */
 #define SPOOL_DIR	"tabs"
 
 			/* undefining these turns off their features.  note
 			 * that ALLOW_FILE and DENY_FILE must both be defined
 			 * in order to enable the allow/deny code.  If neither
 			 * LOG_FILE or SYSLOG is defined, we don't log.  If
 			 * both are defined, we log both ways.
 			 */
 #define	ALLOW_FILE	"allow"		/*-*/
 #define DENY_FILE	"deny"		/*-*/
 /*#define LOG_FILE        "log"*/           /*-*/
 
 			/* where should the daemon stick its PID?
 			 */
-#ifdef _PATH_VARRUN
-# define PIDDIR	_PATH_VARRUN
-#else
-# define PIDDIR "/etc/"
-#endif
+#define PIDDIR	_PATH_VARRUN
 #define PIDFILE		"%scron.pid"
 
 			/* 4.3BSD-style crontab */
 #define SYSCRONTAB	"/etc/crontab"
 #define SYSCRONTABS	"/etc/cron.d"
 #define LOCALSYSCRONTABS	"/usr/local/etc/cron.d"
 
 			/* what editor to use if no EDITOR or VISUAL
 			 * environment variable specified.
 			 */
-#if defined(_PATH_VI)
-# define EDITOR _PATH_VI
-#else
-# define EDITOR "/usr/ucb/vi"
-#endif
-
-#ifndef _PATH_BSHELL
-# define _PATH_BSHELL "/bin/sh"
-#endif
-
-#ifndef _PATH_DEFPATH
-# define _PATH_DEFPATH "/usr/bin:/bin"
-#endif
+#define EDITOR _PATH_VI