Move all the dma(8) components into one single directory

Simplifying maintainance and options (only one place to deal with MK_DMAGENT)

This also makes packaging base less intrusive by getting a single point where
to add tags.

5 files changed, 96 insertions, 9 deletions

diff --git a/libexec/dma/Makefile.inc b/libexec/dma/Makefile.inc
new file mode 100644
index 0000000..cdc9cea
--- /dev/null
+++ b/libexec/dma/Makefile.inc
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.sinclude "${.CURDIR}/../../Makefile.inc"
+DMA_SOURCES=	${.CURDIR}/../../../contrib/dma
+.PATH:	${DMA_SOURCES}
+
+CFLAGS=	-I${DMA_SOURCES} \
+	-DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
+	-DCONF_PATH='"/etc/dma"' \
+	-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \
+	-DDMA_ROOT_USER='"mailnull"' \
+	-DDMA_GROUP='"mail"'
+BINGRP=	mail
diff --git a/libexec/dma/dma-mbox-create/Makefile b/libexec/dma/dma-mbox-create/Makefile
new file mode 100644
index 0000000..a745f59
--- /dev/null
+++ b/libexec/dma/dma-mbox-create/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+MAN=
+
+WARNS=	2
+
+PROG=	dma-mbox-create
+BINMODE=	4554
+
+.include <bsd.prog.mk>
diff --git a/libexec/dma/Makefile b/libexec/dma/dma/Makefile
index 65c73820..6a45a8d 100644
--- a/libexec/dma/Makefile
+++ b/libexec/dma/dma/Makefile
@@ -1,13 +1,5 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../contrib/dma
-
-CFLAGS=	-I${.CURDIR}/../../contrib/dma \
-	-DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
-	-DCONF_PATH='"/etc/dma"' \
-	-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \
-	-DDMA_ROOT_USER='"mailnull"' \
-	-DDMA_GROUP='"mail"'
 LIBADD=	ssl crypto
 
 PROG=	dma
@@ -24,10 +16,13 @@ SRCS=	aliases_parse.y \
 	spool.c \
 	util.c
 MAN8=	dma.8
+CONFS=	dma.conf
+CONFSDIR=	${ETCDIR}/dma
 YFLAGS+=	-i
 CLEANFILES=	aliases_parse.i
+FILES=	mailer.conf
+FILESDIR=	${SHAREDIR}/examples/dma
 
-BINGRP=	mail
 BINMODE=	2555
 
 .include <bsd.compiler.mk>
diff --git a/libexec/dma/dma/dma.conf b/libexec/dma/dma/dma.conf
new file mode 100644
index 0000000..2f50a4e
--- /dev/null
+++ b/libexec/dma/dma/dma.conf
@@ -0,0 +1,64 @@
+# $FreeBSD$
+#
+# Your smarthost (also called relayhost).  Leave blank if you don't want
+# smarthost support.
+#SMARTHOST
+
+# Use this SMTP port.  Most users will be fine with the default (25)
+#PORT 25
+
+# Path to your alias file.  Just stay with the default.
+#ALIASES /etc/aliases
+
+# Path to your spooldir.  Just stay with the default.
+#SPOOLDIR /var/spool/dma
+
+# SMTP authentication
+#AUTHPATH /etc/dma/auth.conf
+
+# Uncomment if yout want TLS/SSL support
+#SECURETRANSFER
+
+# Uncomment if you want STARTTLS support (only used in combination with
+# SECURETRANSFER)
+#STARTTLS
+
+# Uncomment if you have specified STARTTLS above and it should be allowed
+# to fail ("opportunistic TLS", use an encrypted connection when available
+# but allow an unencrypted one to servers that do not support it)
+#OPPORTUNISTIC_TLS
+
+# Path to your local SSL certificate
+#CERTFILE
+
+# If you want to use plain text SMTP login without using encryption, change
+# the SECURE entry below to INSECURE.  Otherwise plain login will only work
+# over a secure connection.  Use this option with caution.
+#SECURE
+
+# Uncomment if you want to defer your mails.  This is useful if you are
+# behind a dialup line.  You have to submit your mails manually with dma -q
+#DEFER
+
+# Uncomment if you want the bounce message to include the complete original
+# message, not just the headers.
+#FULLBOUNCE
+
+# The internet hostname dma uses to identify the host.
+# If not set or empty, the result of gethostname(2) is used.
+# If MAILNAME is an absolute path to a file, the first line of this file
+# will be used as the hostname.
+#MAILNAME mail.example.net
+
+# Masquerade envelope from addresses with this address/hostname.
+# Use this if mails are not accepted by destination mail servers because
+# your sender domain is invalid.
+# By default, MASQUERADE is not set.
+# Format: MASQUERADE [user@][host]
+# Examples:
+# MASQUERADE john@  on host "hamlet" will send all mails as john@hamlet
+# MASQUERADE percolator  will send mails as $username@percolator, e.g. fish@percolator
+# MASQUERADE herb@ert  will send all mails as herb@ert
+
+# Directly forward the mail to the SMARTHOST bypassing aliases and local delivery
+#NULLCLIENT
diff --git a/libexec/dma/dma/mailer.conf b/libexec/dma/dma/mailer.conf
new file mode 100644
index 0000000..53f42c2
--- /dev/null
+++ b/libexec/dma/dma/mailer.conf
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+sendmail  /usr/libexec/dma
+send-mail /usr/libexec/dma
+mailq     /usr/libexec/dma