4 files changed, 24 insertions, 5 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index f0e59ed8594e..b9aa273d44c9 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -28,6 +28,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root.crt:${PORTSDIR}/security/ca-roots
 
 USE_RC_SUBR=	fetchmail
 FETCHMAILRC=	${PREFIX}/etc/fetchmailrc
+SUB_FILES=	pkg-message
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -166,4 +167,8 @@ post-install:
 		${CP} -p ${PREFIX}/etc/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc ; \
 	fi
 
+	@${ECHO_CMD} ""
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD} ""
+
 .include <bsd.port.post.mk>
diff --git a/mail/fetchmail/files/fetchmail.in b/mail/fetchmail/files/fetchmail.in
index 565af06ded51..5e6905590c4e 100644
--- a/mail/fetchmail/files/fetchmail.in
+++ b/mail/fetchmail/files/fetchmail.in
@@ -9,16 +9,17 @@
 # KEYWORD: shutdown
 
 #
-# Add the following lines to /etc/rc.conf to enable fetchmail:
+# Add the following lines to /etc/rc.conf to fetchmail in daemon
+# mode.
 #
 # fetchmail_enable="YES"
 #
-# There are two modes:
+# There are two variants:
 #
 #  * Single system-wide fetchmail daemon:
 #    - It is run as user `fetchmail_user' (default: fetchmail)
 #    - All configuration is contained in one global file
-#      `fetchmail_config' (default: %%PREFIX/etc/fetchmailrc),
+#      `fetchmail_config' (default: %%PREFIX%%/etc/fetchmailrc),
 #      that must be owned by `fetchmail_user' (mode 700)
 #    - The fetchmail daemon awakes to fetch mail every 
 #      `fetchmail_polling_interval' seconds (default: 900).
@@ -37,7 +38,7 @@
 #      defaults, i.e. for the user `user1' there are variables
 #      `fetchmail_user1_config' and `fetchmail_user1_polling_interval'
 #    - All commands (e.g. start, stop, awaken (see below)) can be either
-#      passed to all instances of the daemon (if %%PREFIX/etc/rc.d/fetchmail)
+#      passed to all instances of the daemon (if %%PREFIX%%/etc/rc.d/fetchmail)
 #      is run as root), or just to the instance belonging to the respective
 #      user.
 #
@@ -45,6 +46,12 @@
 #
 #  * `awaken': Sends a signal to the daemon(s) to check for new mail
 #     immediately
+#
+# Fetchmail configuration:
+#
+# In any case, you will need a working fetchmailrc file. Please consult
+# the man page fetchmail(1), the documentation in %%PREFIX%%/share/doc/fetchmail/
+# and/or the material found at http://fetchmail.berlios.de/.
 
 . %%RC_SUBR%%
 
diff --git a/mail/fetchmail/files/fetchmailrc.sample b/mail/fetchmail/files/fetchmailrc.sample
index cf2f29147890..a3ee62b1a748 100644
--- a/mail/fetchmail/files/fetchmailrc.sample
+++ b/mail/fetchmail/files/fetchmailrc.sample
@@ -1 +1,4 @@
-# Sample
+# Your fetchmail configuration goes here.
+#
+# See fetchmail(1), and/or use fetchmailconf (must not build the port
+# WITHOUT_X11).
diff --git a/mail/fetchmail/files/pkg-message.in b/mail/fetchmail/files/pkg-message.in
new file mode 100644
index 000000000000..7d79aa709075
--- /dev/null
+++ b/mail/fetchmail/files/pkg-message.in
@@ -0,0 +1,4 @@
+*********************************************************************
+*** For pointers how to configure fetchmail in daemon mode        ***
+*** please consult %%PREFIX%%/etc/rc.d/fetchmail.                 ***
+*********************************************************************