- Turn patch fetchable again

- Reorganize Makefile
- portlint(1)
- Use new style of rc.d script
- Bump PORTREVISION

PR:		93040
Submitted by:	Jean Milanez Melo <jmelo@freebsdbrasil.com.br>

4 files changed, 61 insertions, 12 deletions

diff --git a/mail/smtpd/files/patch-aa b/mail/smtpd/files/patch-aa
index f12359a..4c94abe 100644
--- a/mail/smtpd/files/patch-aa
+++ b/mail/smtpd/files/patch-aa
@@ -14,7 +14,7 @@
  #
  # The chroot directory
 -SPOOLDIR = /usr/spool/smtpd
-+SPOOLDIR = !!SPOOLBASE!!
++SPOOLDIR = ${SPOOLBASE}
  # Where to store messages, relative to SPOOLDIR above.
 -SPOOLSUBDIR = .
 +SPOOLSUBDIR = mqueue
diff --git a/mail/smtpd/files/pkg-message.in b/mail/smtpd/files/pkg-message.in
new file mode 100644
index 0000000..ae3b614
--- /dev/null
+++ b/mail/smtpd/files/pkg-message.in
@@ -0,0 +1,35 @@
+To enable smtpfwdd via rc.d script please add smtpd_enable="YES" 
+in your rc.conf.
+
+You must follow the next steps, as root, in order to finish the installation:
+
+1) Make sure uucp is a trusted user to sendmail.
+   To do this, check if your sendmail.cf has a line with "Tuucp"
+
+2) Disable sendmail from answering smtp requests, but make sure it
+   handles queue delivering.  You have two choices:
+
+   a) Start sendmail without the "-bd" flag, but with the "-q30m" one.
+   b) Do not start sendmail as a daemon, and add an entry in /etc/crontab
+      to run sendmail -q when needed.  For example, add the following line
+      to your /etc/crontab:
+*/30	*	*	*	*	root	/usr/sbin/sendmail -q
+
+   In any case, you'll most likely have to edit /etc/rc.conf to change
+   sendmail configuration.
+
+3) Add smtpd to your inetd.conf:
+	smtp stream tcp nowait root %%PREFIX%%/sbin/smtpd smtpd
+
+4) smtpd runs in a chrooted environment, so you must feed this environment
+   with any configuration file it needs.  Make a copy of /etc/resolv.conf
+   and /etc/localtime to %%SPOOLBASE%%/etc.  If you ever change any of these
+   files, remember to change the copies also.  Do not make a symbolic
+   link, as it will not work in the chrooted environment.
+
+5) Create your own %%SPOOLBASE%%/etc/smtpd_check_rules.  There are some
+   examples in that directory.  If have any problem, take a look at
+   http://www.obtuse.com/juniper-docs/man/smtpd_address_check.html.
+
+6) Reboot !   (Or restart all those daemons manually, if you know how :^) )
+
diff --git a/mail/smtpd/files/smtpd.in b/mail/smtpd/files/smtpd.in
new file mode 100644
index 0000000..93b2a55
--- /dev/null
+++ b/mail/smtpd/files/smtpd.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: smtpd
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to run smtpd:
+#
+# smtpd_enable (bool):		Set it to "YES" to enable smtpd.
+#				Default is "NO".
+#
+
+. %%RC_SUBR%%
+
+name="smtpd"
+rcvar=${name}_enable
+
+command=%%PREFIX%%/sbin/smtpfwdd
+
+load_rc_config ${name}
+
+: ${smtpd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/mail/smtpd/files/smtpd.sh b/mail/smtpd/files/smtpd.sh
deleted file mode 100644
index 3aaf433..0000000
--- a/mail/smtpd/files/smtpd.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-if [ $# -eq 0 -o "$1" = "start" ]; then
-  if [ -x !!PREFIX!!/sbin/smtpfwdd ] ; then
-    !!PREFIX!!/sbin/smtpfwdd
-    echo -n " smtpfwdd"
-  fi
-fi
-if [ "$1" = "stop" ]; then
-  killall smtpfwdd
-fi