- Move from sasl2 => sasl in options.mk

- Update the TODO
- Move mt creation out of the INSTALL to ${FILESDIR}

sendmailX/INSTALL

@@ -1,15 +1,10 @@
-# $NetBSD: INSTALL,v 1.2 2005/07/19 01:44:48 adrian_p Exp $
+# $NetBSD: INSTALL,v 1.3 2005/07/19 22:49:42 adrian_p Exp $
 
 # directories and files
 SMXQD=@VARBASE@/spool/smx
 DEFEDB=${SMXQD}/defedb
-SMXETC=/etc/smx
-MT=@SMXETC@/mt
 LOGDIR=${SMXQD}
 
-# get the hostname
-MYHOST=`@HOSTNAME@`
-
 case ${STAGE} in
 
 POST-INSTALL)
@@ -55,15 +50,6 @@ POST-INSTALL)
 	${CHMOD} 0700 ${SMXQD}/ibdb/ibdb
 	${CHMOD} 0750 ${SMXQD}/smtps 
 
-	# create initial mailertable
-	${CAT} > ${MT} <<EOF
-local.host	lmtp:
-${MYHOST}	lmtp:
-EOF
-
-	${CHMOD} 0644 ${MT}
-	${CHOWN} smxm:smxm ${MT}
-
 	;;
 
 esac

sendmailX/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/19 01:44:49 adrian_p Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/19 22:49:42 adrian_p Exp $
 
 DISTNAME=	smX-${VERSION}
 PKGNAME=	sendmailX-${VERSION}
@@ -20,7 +20,7 @@ VERSION=	0.0.Alpha8.0
 # the functionality ATM to add a user to a group and that's what we need
 # this for.
 #
-USERMOD=	/usr/sbin/usermod
+USERMOD?=	/usr/sbin/usermod
 
 EGDIR=		${PREFIX}/share/examples/smX
 FILES_SUBST+=	PREFIX=${PREFIX} SMXCNF=${SMXCNF} USERMOD=${USERMOD}
@@ -57,6 +57,7 @@ RCD_SCRIPTS=		sendmailx
 CONF_FILES_PERMS=	${EGDIR}/smx.conf ${SMXCNF} smx smx 0644
 CONF_FILES_PERMS+=	${EGDIR}/aliases ${SMXCNFDIR}/aliases smxm smxm 0644
 CONF_FILES_PERMS+=	${EGDIR}/Makefile ${SMXCNFDIR}/Makefile smxm smxm 0644
+CONF_FILES_PERMS+=	${EGDIR}/mt ${SMXCNFDIR}/mt smxm smxm 0644
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
@@ -74,5 +75,6 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/smx.conf ${EGDIR}/smx.conf
 	${INSTALL_DATA} ${WRKDIR}/Makefile ${EGDIR}/Makefile
 	${INSTALL_DATA} ${FILESDIR}/aliases ${EGDIR}/aliases
+	${INSTALL_DATA} ${FILESDIR}/mt ${EGDIR}/mt
 
 .include "../../mk/bsd.pkg.mk"

sendmailX/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/07/19 01:44:49 adrian_p Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/07/19 22:49:42 adrian_p Exp $
 bin/mailq
 bin/qmgrctl
 bin/runas
@@ -17,5 +17,6 @@ sbin/mcp
 share/examples/smX/Makefile
 share/examples/smX/aliases
 share/examples/smX/smx.conf
+share/examples/smX/mt
 @dirrm include/smX
 @dirrm share/examples/smX

sendmailX/TODO

@@ -2,11 +2,9 @@
   out of the box
 
 - sendmailx, sendailX, smx or smX - choose one and stick to it
-- move all the config files to @PKG_SYSCONFDIR@/smx
 - write a proper startup script
 - fix the current example smx.conf file (see TODO in the file)
 - fix files/Makefile (createmap)
-- fix HOSTNAME in INSTALL
 
 - Test TLS support
 - Test SASL support

sendmailX/files/mt

@@ -0,0 +1,4 @@
+# $NetBSD: mt,v 1.1 2005/07/19 22:49:42 adrian_p Exp $
+
+local.host	lmtp:                 
+localhost	lmtp:

sendmailX/options.mk

@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2005/07/18 19:13:20 adrian_p Exp $
+# $NetBSD: options.mk,v 1.4 2005/07/19 22:49:42 adrian_p Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmailX
-PKG_SUPPORTED_OPTIONS=	tls sasl2
+PKG_SUPPORTED_OPTIONS=	tls sasl
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,7 +17,7 @@ CFLAGS+=		-DSM_USE_TLS
 ###
 ### Use SASLv2 for SMTP AUTH
 ###
-.if !empty(PKG_OPTIONS:Msasl2)
+.if !empty(PKG_OPTIONS:Msasl)
 .	include "../../security/cyrus-sasl2/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-SASL
 CFLAGS+=		-DSM_USE_SASL