5 files changed, 77 insertions, 14 deletions

diff --git a/mail/listmanager/Makefile b/mail/listmanager/Makefile
index acb36718ba4f..296652e380fd 100644
--- a/mail/listmanager/Makefile
+++ b/mail/listmanager/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	listmanager
 PORTVERSION=	2.108
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.listmanager.org/
 DISTNAME=	${PORTNAME}
@@ -22,29 +23,34 @@ EXTRACT_AFTER_ARGS=	${WRKDIR}
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
 WRKSRC=		${WRKDIR}
+PKGMESSAGE=	${WRKSRC}/pkg-message
 MAN8=		listmanager.8
 
+LISTMANAGER_HOME?=/var/listmanager
+
 pre-patch:
 	(cd ${WRKSRC} && ${TAR} xfz help.tar.gz)
 
+post-patch:
+	@ for file in listmanager.cf pkg-message setup; do \
+		${SED}	-e "s|@@VARPREFIX@@|${LISTMANAGER_HOME}|g" \
+			-e "s|@@INSPREFIX@@|${PREFIX}|g" \
+			 < ${FILESDIR}/$$file.in > ${WRKSRC}/$$file; \
+	done
+
 do-install:
 	@${MKDIR} ${PREFIX}/etc
-	@${MKDIR} ${PREFIX}/share/listmanager/db
-	@${MKDIR} ${PREFIX}/share/listmanager/files
 	@${MKDIR} ${PREFIX}/share/listmanager/help
-	@${MKDIR} ${PREFIX}/share/listmanager/synchfiles
-	${TOUCH} ${PREFIX}/etc/listmanager.cf
-	${INSTALL_DATA} ${WRKSRC}/help/* ${PREFIX}/share/listmanager/help
+	${INSTALL_DATA} ${WRKSRC}/listmanager.cf ${PREFIX}/etc/listmanager.cf.sample
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/listmanager
+	${INSTALL_DATA} ${WRKSRC}/ack ${PREFIX}/share/listmanager
+	${INSTALL_DATA} ${WRKSRC}/help/* ${PREFIX}/share/listmanager/help
+	${INSTALL_SCRIPT} ${WRKSRC}/setup ${PREFIX}/share/listmanager
 	${INSTALL_MAN} ${WRKSRC}/listmanager.8 ${PREFIX}/man/man8
 	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}${EXTRACT_SUFX} ${PREFIX}/sbin/listmanager
 	${CHMOD} 4510 ${PREFIX}/sbin/listmanager
 
 post-install:
-	@${ECHO} "************************************************************"
-	@${ECHO} "*  Please read ${PREFIX}/share/listmanager/INSTALL for      "
-	@${ECHO} "*  information on installing listmanager without using a    "
-	@${ECHO} "*  set-user-id root binary.                                 "
-	@${ECHO} "************************************************************"
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/listmanager/files/listmanager.cf.in b/mail/listmanager/files/listmanager.cf.in
new file mode 100644
index 000000000000..cc820ea1f088
--- /dev/null
+++ b/mail/listmanager/files/listmanager.cf.in
@@ -0,0 +1,9 @@
+executable	@@INSPREFIX@@/sbin/listmanager
+gzip		/usr/bin/gzip
+helpdir		@@INSPREFIX@@/share/listmanager/help
+homedir		@@VARPREFIX@@
+newaliases	/usr/sbin/newaliases
+queueflush	/usr/sbin/sendmail -qS%s -v
+sendmail	/usr/sbin/sendmail -oiTrue
+syslog		mail
+tempdir		@@VARPREFIX@@/tmp
diff --git a/mail/listmanager/files/pkg-message.in b/mail/listmanager/files/pkg-message.in
new file mode 100644
index 000000000000..9a663232371a
--- /dev/null
+++ b/mail/listmanager/files/pkg-message.in
@@ -0,0 +1,10 @@
+************************************************************
+*  Use @@INSPREFIX@@/share/listmanager/setup to setup the
+*  required configuration and directory structure for
+*  listmanager.  Note that this only has to be done on new
+*  installations.
+*
+*  Please read @@INSPREFIX@@/share/listmanager/INSTALL for
+*  information on installing listmanager without using a
+*  set-user-id root binary.
+************************************************************
diff --git a/mail/listmanager/files/setup.in b/mail/listmanager/files/setup.in
new file mode 100644
index 000000000000..90e824ea2ccd
--- /dev/null
+++ b/mail/listmanager/files/setup.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+CHMOD=/bin/chmod
+CP=/bin/cp
+MKDIR="/bin/mkdir -p"
+TOUCH=/usr/bin/touch
+
+LISTMGR_HOME=@@VARPREFIX@@
+PREFIX=@@INSPREFIX@@
+
+SUBDIRS="archives backup db files lists responses storage tmp"
+
+if [ ! -d ${LISTMGR_HOME} ]; then
+	${MKDIR} ${LISTMGR_HOME}
+	${CHMOD} 0751 ${LISTMGR_HOME}
+fi
+
+for dir in ${SUBDIRS}; do
+	if [ ! -d ${LISTMGR_HOME}/${dir} ]; then
+		${MKDIR} ${LISTMGR_HOME}/${dir}
+		${CHMOD} 0750 ${LISTMGR_HOME}/${dir}
+	fi
+done
+${CHMOD} 0751 ${LISTMGR_HOME}/lists
+
+if [ ! -e ${LISTMGR_HOME}/ignore ]; then
+	${TOUCH} ${LISTMGR_HOME}/ignore
+	${CHMOD} 0640 ${LISTMGR_HOME}/ignore
+fi
+
+if [ ! -e ${LISTMGR_HOME}/responses/ack ]; then
+	${CP} ${PREFIX}/share/listmanager/ack ${LISTMGR_HOME}/responses/ack
+	${CHMOD} 0640 ${LISTMGR_HOME}/responses/ack
+fi
+
+if [ ! -e ${PREFIX}/etc/listmanager.cf ]; then
+	${CP} ${PREFIX}/etc/listmanager.cf.sample ${PREFIX}/etc/listmanager.cf
+	${CHMOD} 0644 ${PREFIX}/etc/listmanager.cf
+fi
diff --git a/mail/listmanager/pkg-plist b/mail/listmanager/pkg-plist
index ca94bb6be319..f323bf78aa98 100644
--- a/mail/listmanager/pkg-plist
+++ b/mail/listmanager/pkg-plist
@@ -1,6 +1,7 @@
-etc/listmanager.cf
+etc/listmanager.cf.sample
 sbin/listmanager
 share/listmanager/INSTALL
+share/listmanager/ack
 share/listmanager/help/ACLs
 share/listmanager/help/Addresses
 share/listmanager/help/Archiving
@@ -166,8 +167,6 @@ share/listmanager/help/validfreq
 share/listmanager/help/verbose
 share/listmanager/help/verify
 share/listmanager/help/version
-@dirrm share/listmanager/db
-@dirrm share/listmanager/files
+share/listmanager/setup
 @dirrm share/listmanager/help
-@dirrm share/listmanager/synchfiles
 @dirrm share/listmanager