4 files changed, 30 insertions, 6 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 74e96187f5a1..1c2ec7ffbb89 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -182,5 +182,7 @@ pre-install:
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh ${PREFIX}/etc/rc.d
+	@${CAT} ${PKGMESSAGE}
+
 
 .include <bsd.port.mk>
diff --git a/mail/exim/files/patch-aa b/mail/exim/files/patch-aa
index 9d71d8104a39..47b2595e1088 100644
--- a/mail/exim/files/patch-aa
+++ b/mail/exim/files/patch-aa
@@ -57,7 +57,7 @@ This patch makes three changes to the exim_install script:
  
  # Install info files if the directory is defined and the Texinfo
  # source documentation is present.
-@@ -239,19 +234,21 @@
+@@ -239,23 +234,25 @@
    echo $com Info installation directory is ${INFO_DIRECTORY}
    echo $com ""
  
@@ -67,14 +67,16 @@ This patch makes three changes to the exim_install script:
    echo ${CP} exim_overview.info ${INFO_DIRECTORY}
    ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
    install-info --section="Exim" \
-       --entry "* Overview: (exim_overview).    Overview of the Exim system" \
+-      --entry "* Overview: (exim_overview).    Overview of the Exim system" \
++      --entry "* Exim Overview: (exim_overview).   Overview of the Exim system" \
        ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
 -  makeinfo --no-split --output exim.info ../doc/spec.texinfo
 +  makeinfo --no-validate --no-split --output exim.info ../doc/spec.texinfo
    echo ${CP} exim.info ${INFO_DIRECTORY}
    ${real} ${CP} exim.info ${INFO_DIRECTORY}
    install-info --section="Exim" \
-       --entry "* User guide: (exim).           Exim manual" \
+-      --entry "* User guide: (exim).           Exim manual" \
++      --entry "* Exim Specification: (exim).       Exim manual" \
        ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
 -  makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
 +  makeinfo --no-validate --no-split --output exim_filter.info \
@@ -82,3 +84,8 @@ This patch makes three changes to the exim_install script:
    echo ${CP} exim_filter.info ${INFO_DIRECTORY}
    ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
    install-info --section="Exim" \
+-      --entry "* Filtering: (exim_filter).     Filtering mail with Exim" \
++      --entry "* Exim Filtering: (exim_filter).    Filtering mail with Exim" \
+       ${INFO_DIRECTORY}/exim_filter.info ${INFO_DIRECTORY}/dir
+ fi
+ 
diff --git a/mail/exim/pkg-message b/mail/exim/pkg-message
new file mode 100644
index 000000000000..f2e1f7151740
--- /dev/null
+++ b/mail/exim/pkg-message
@@ -0,0 +1,15 @@
+The following documentation has been installed:
+
+    info 'Exim Overview'	-> Overview of Exim
+    info Exim			-> Exim Specification (User Guide)
+    info 'Exim Filtering'	-> Exim Filter Specification (for end-users)
+
+Postscript, PDF, HTML and plain text versions of these documents, as well
+as a comprehensive FAQ list, are available on the Exim web site:
+
+	http://www.exim.org/
+
+To activate Exim:
+
+1) Create exim/configure from exim/configure.sample .
+2) Use the rc.d/exim/sh script to start the Exim daemon .
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 33a4cbf85f0d..d0d5a83887ef 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -20,7 +20,7 @@ sbin/exiqsumm
 @unexec install-info --delete %D/info/exim_overview.info %D/info/dir
 @unexec install-info --delete %D/info/exim.info %D/info/dir
 @unexec install-info --delete %D/info/exim_filter.info %D/info/dir
-@exec install-info --section="Exim" --entry "* Overview: (exim_overview).    Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
-@exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/info/exim.info %D/info/dir
-@exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
+@exec install-info --section="Exim" --entry "* Exim Overview: (exim_overview).   Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
+@exec install-info --section="Exim" --entry "* Exim Specification: (exim).       Exim manual" %D/info/exim.info %D/info/dir
+@exec install-info --section="Exim" --entry "* Exim Filtering: (exim_filter).    Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
 @dirrm etc/exim