Upgrade to version 1.60.

Note! I have fixed a bogon from previous versions where I was putting the
executables in $(PREFIX)/bin. They now go in $(PREFIX)/sbin, so make
sure your previous binaries have been properly removed!

12 files changed, 93 insertions, 69 deletions

diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
index f3093a709db0..d31932d6b3ec 100644
--- a/mail/exim-devel/distinfo
+++ b/mail/exim-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-1.59.tar.gz) = 7fff2e5da33553f0a971e821a2131c13
-MD5 (exim-texinfo-1.58.tar.gz) = 992a0fb7db218fefd111873682def9b9
+MD5 (exim-1.60.tar.gz) = 407d501c807e88e2ee4ddb6cf50c4c8a
+MD5 (exim-texinfo-1.60.tar.gz) = 46c7261ef8332700c8dfa062eaf0f552
diff --git a/mail/exim-devel/files/Makefile b/mail/exim-devel/files/Makefile
index 55796487c8db..43498e492bda 100644
--- a/mail/exim-devel/files/Makefile
+++ b/mail/exim-devel/files/Makefile
@@ -29,7 +29,7 @@
 # installed in this directory. There is no default for this variable built into
 # the source files; it must be set in one of the local configuration files.
 
-BIN_DIRECTORY=/usr/local/bin
+BIN_DIRECTORY=/usr/local/sbin
 
 
 # The info directory: This variable defines where the exim info file will be
diff --git a/mail/exim-devel/files/patch-aa b/mail/exim-devel/files/patch-aa
index 10178af22133..123517f32a26 100644
--- a/mail/exim-devel/files/patch-aa
+++ b/mail/exim-devel/files/patch-aa
@@ -1,5 +1,5 @@
---- scripts/exim_install.ORG	Tue Oct 29 17:46:05 1996
-+++ scripts/exim_install	Thu Oct 31 20:53:16 1996
+--- scripts/exim_install.orig	Tue Feb 25 11:12:33 1997
++++ scripts/exim_install	Wed Feb 26 15:17:09 1997
 @@ -8,6 +8,8 @@
  # This script also installs a default configuration file in CONFIGURE_FILE
  # if there is no configuration file there.
@@ -25,11 +25,11 @@
 @@ -76,6 +80,7 @@
  
  # Allow the user to over-ride xx
- case "$dest" in ?*) BIN_DIRECTORY="$dest";; esac
-+case "$info" in ?*) INFO_DIRECTORY="$info";; esac
- case "$conf" in ?*) CONFIGURE_FILE="$conf";; esac
- case "$cp" in ?*) CP="$cp";; esac
- case "$mv" in ?*) MV="$mv";; esac
+ case "$inst_dest" in ?*) BIN_DIRECTORY="$inst_dest";; esac
++case "$inst_info" in ?*) INFO_DIRECTORY="$inst_info";; esac
+ case "$inst_conf" in ?*) CONFIGURE_FILE="$inst_conf";; esac
+ case "$inst_cp"   in ?*) CP="$inst_cp";; esac
+ case "$inst_mv"   in ?*) MV="$inst_mv";; esac
 @@ -101,6 +106,20 @@
    fi
  fi
@@ -51,7 +51,7 @@
  # If no arguments, install everything
  
  if [ $# -gt 0 ]; then
-@@ -166,12 +185,24 @@
+@@ -166,12 +185,30 @@
    fi
  done
  
@@ -60,9 +60,15 @@
 +echo $com ""
 +
 +if [ -f ../doc/spec.texinfo ]; then
++    makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
++    echo ${CP} exim_overview.info ${INFO_DIRECTORY}
++    ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
 +    makeinfo --no-split --output exim.info ../doc/spec.texinfo
 +    echo ${CP} exim.info ${INFO_DIRECTORY}
 +    ${real} ${CP} exim.info ${INFO_DIRECTORY}
++    makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
++    echo ${CP} exim_filter.info ${INFO_DIRECTORY}
++    ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
 +fi
 +
  # If there is no configuration file, install the default,
diff --git a/mail/exim-devel/pkg-plist b/mail/exim-devel/pkg-plist
index e8892bc5ec9a..15320d7afc08 100644
--- a/mail/exim-devel/pkg-plist
+++ b/mail/exim-devel/pkg-plist
@@ -1,14 +1,16 @@
-bin/exim
-bin/eximon
-bin/eximon.bin
-bin/exim_dumpdb
-bin/exim_fixdb
-bin/exim_tidydb
-bin/exinext
-bin/exiwhat
-bin/exim_dbmbuild
-bin/exicyclog
-bin/exigrep
-bin/eximstats
+sbin/exim
+sbin/eximon
+sbin/eximon.bin
+sbin/exim_dumpdb
+sbin/exim_fixdb
+sbin/exim_tidydb
+sbin/exinext
+sbin/exiwhat
+sbin/exim_dbmbuild
+sbin/exicyclog
+sbin/exigrep
+sbin/eximstats
 etc/exim/configure
+info/exim_overview.info
 info/exim.info
+info/exim_filter.info
diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo
index f3093a709db0..d31932d6b3ec 100644
--- a/mail/exim-old/distinfo
+++ b/mail/exim-old/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-1.59.tar.gz) = 7fff2e5da33553f0a971e821a2131c13
-MD5 (exim-texinfo-1.58.tar.gz) = 992a0fb7db218fefd111873682def9b9
+MD5 (exim-1.60.tar.gz) = 407d501c807e88e2ee4ddb6cf50c4c8a
+MD5 (exim-texinfo-1.60.tar.gz) = 46c7261ef8332700c8dfa062eaf0f552
diff --git a/mail/exim-old/files/Makefile b/mail/exim-old/files/Makefile
index 55796487c8db..43498e492bda 100644
--- a/mail/exim-old/files/Makefile
+++ b/mail/exim-old/files/Makefile
@@ -29,7 +29,7 @@
 # installed in this directory. There is no default for this variable built into
 # the source files; it must be set in one of the local configuration files.
 
-BIN_DIRECTORY=/usr/local/bin
+BIN_DIRECTORY=/usr/local/sbin
 
 
 # The info directory: This variable defines where the exim info file will be
diff --git a/mail/exim-old/files/patch-aa b/mail/exim-old/files/patch-aa
index 10178af22133..123517f32a26 100644
--- a/mail/exim-old/files/patch-aa
+++ b/mail/exim-old/files/patch-aa
@@ -1,5 +1,5 @@
---- scripts/exim_install.ORG	Tue Oct 29 17:46:05 1996
-+++ scripts/exim_install	Thu Oct 31 20:53:16 1996
+--- scripts/exim_install.orig	Tue Feb 25 11:12:33 1997
++++ scripts/exim_install	Wed Feb 26 15:17:09 1997
 @@ -8,6 +8,8 @@
  # This script also installs a default configuration file in CONFIGURE_FILE
  # if there is no configuration file there.
@@ -25,11 +25,11 @@
 @@ -76,6 +80,7 @@
  
  # Allow the user to over-ride xx
- case "$dest" in ?*) BIN_DIRECTORY="$dest";; esac
-+case "$info" in ?*) INFO_DIRECTORY="$info";; esac
- case "$conf" in ?*) CONFIGURE_FILE="$conf";; esac
- case "$cp" in ?*) CP="$cp";; esac
- case "$mv" in ?*) MV="$mv";; esac
+ case "$inst_dest" in ?*) BIN_DIRECTORY="$inst_dest";; esac
++case "$inst_info" in ?*) INFO_DIRECTORY="$inst_info";; esac
+ case "$inst_conf" in ?*) CONFIGURE_FILE="$inst_conf";; esac
+ case "$inst_cp"   in ?*) CP="$inst_cp";; esac
+ case "$inst_mv"   in ?*) MV="$inst_mv";; esac
 @@ -101,6 +106,20 @@
    fi
  fi
@@ -51,7 +51,7 @@
  # If no arguments, install everything
  
  if [ $# -gt 0 ]; then
-@@ -166,12 +185,24 @@
+@@ -166,12 +185,30 @@
    fi
  done
  
@@ -60,9 +60,15 @@
 +echo $com ""
 +
 +if [ -f ../doc/spec.texinfo ]; then
++    makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
++    echo ${CP} exim_overview.info ${INFO_DIRECTORY}
++    ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
 +    makeinfo --no-split --output exim.info ../doc/spec.texinfo
 +    echo ${CP} exim.info ${INFO_DIRECTORY}
 +    ${real} ${CP} exim.info ${INFO_DIRECTORY}
++    makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
++    echo ${CP} exim_filter.info ${INFO_DIRECTORY}
++    ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
 +fi
 +
  # If there is no configuration file, install the default,
diff --git a/mail/exim-old/pkg-plist b/mail/exim-old/pkg-plist
index e8892bc5ec9a..15320d7afc08 100644
--- a/mail/exim-old/pkg-plist
+++ b/mail/exim-old/pkg-plist
@@ -1,14 +1,16 @@
-bin/exim
-bin/eximon
-bin/eximon.bin
-bin/exim_dumpdb
-bin/exim_fixdb
-bin/exim_tidydb
-bin/exinext
-bin/exiwhat
-bin/exim_dbmbuild
-bin/exicyclog
-bin/exigrep
-bin/eximstats
+sbin/exim
+sbin/eximon
+sbin/eximon.bin
+sbin/exim_dumpdb
+sbin/exim_fixdb
+sbin/exim_tidydb
+sbin/exinext
+sbin/exiwhat
+sbin/exim_dbmbuild
+sbin/exicyclog
+sbin/exigrep
+sbin/eximstats
 etc/exim/configure
+info/exim_overview.info
 info/exim.info
+info/exim_filter.info
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index f3093a709db0..d31932d6b3ec 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-1.59.tar.gz) = 7fff2e5da33553f0a971e821a2131c13
-MD5 (exim-texinfo-1.58.tar.gz) = 992a0fb7db218fefd111873682def9b9
+MD5 (exim-1.60.tar.gz) = 407d501c807e88e2ee4ddb6cf50c4c8a
+MD5 (exim-texinfo-1.60.tar.gz) = 46c7261ef8332700c8dfa062eaf0f552
diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile
index 55796487c8db..43498e492bda 100644
--- a/mail/exim/files/Makefile
+++ b/mail/exim/files/Makefile
@@ -29,7 +29,7 @@
 # installed in this directory. There is no default for this variable built into
 # the source files; it must be set in one of the local configuration files.
 
-BIN_DIRECTORY=/usr/local/bin
+BIN_DIRECTORY=/usr/local/sbin
 
 
 # The info directory: This variable defines where the exim info file will be
diff --git a/mail/exim/files/patch-aa b/mail/exim/files/patch-aa
index 10178af22133..123517f32a26 100644
--- a/mail/exim/files/patch-aa
+++ b/mail/exim/files/patch-aa
@@ -1,5 +1,5 @@
---- scripts/exim_install.ORG	Tue Oct 29 17:46:05 1996
-+++ scripts/exim_install	Thu Oct 31 20:53:16 1996
+--- scripts/exim_install.orig	Tue Feb 25 11:12:33 1997
++++ scripts/exim_install	Wed Feb 26 15:17:09 1997
 @@ -8,6 +8,8 @@
  # This script also installs a default configuration file in CONFIGURE_FILE
  # if there is no configuration file there.
@@ -25,11 +25,11 @@
 @@ -76,6 +80,7 @@
  
  # Allow the user to over-ride xx
- case "$dest" in ?*) BIN_DIRECTORY="$dest";; esac
-+case "$info" in ?*) INFO_DIRECTORY="$info";; esac
- case "$conf" in ?*) CONFIGURE_FILE="$conf";; esac
- case "$cp" in ?*) CP="$cp";; esac
- case "$mv" in ?*) MV="$mv";; esac
+ case "$inst_dest" in ?*) BIN_DIRECTORY="$inst_dest";; esac
++case "$inst_info" in ?*) INFO_DIRECTORY="$inst_info";; esac
+ case "$inst_conf" in ?*) CONFIGURE_FILE="$inst_conf";; esac
+ case "$inst_cp"   in ?*) CP="$inst_cp";; esac
+ case "$inst_mv"   in ?*) MV="$inst_mv";; esac
 @@ -101,6 +106,20 @@
    fi
  fi
@@ -51,7 +51,7 @@
  # If no arguments, install everything
  
  if [ $# -gt 0 ]; then
-@@ -166,12 +185,24 @@
+@@ -166,12 +185,30 @@
    fi
  done
  
@@ -60,9 +60,15 @@
 +echo $com ""
 +
 +if [ -f ../doc/spec.texinfo ]; then
++    makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
++    echo ${CP} exim_overview.info ${INFO_DIRECTORY}
++    ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
 +    makeinfo --no-split --output exim.info ../doc/spec.texinfo
 +    echo ${CP} exim.info ${INFO_DIRECTORY}
 +    ${real} ${CP} exim.info ${INFO_DIRECTORY}
++    makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
++    echo ${CP} exim_filter.info ${INFO_DIRECTORY}
++    ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
 +fi
 +
  # If there is no configuration file, install the default,
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index e8892bc5ec9a..15320d7afc08 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -1,14 +1,16 @@
-bin/exim
-bin/eximon
-bin/eximon.bin
-bin/exim_dumpdb
-bin/exim_fixdb
-bin/exim_tidydb
-bin/exinext
-bin/exiwhat
-bin/exim_dbmbuild
-bin/exicyclog
-bin/exigrep
-bin/eximstats
+sbin/exim
+sbin/eximon
+sbin/eximon.bin
+sbin/exim_dumpdb
+sbin/exim_fixdb
+sbin/exim_tidydb
+sbin/exinext
+sbin/exiwhat
+sbin/exim_dbmbuild
+sbin/exicyclog
+sbin/exigrep
+sbin/eximstats
 etc/exim/configure
+info/exim_overview.info
 info/exim.info
+info/exim_filter.info