Index: head/mail/archivesmtp/Makefile
===================================================================
--- head/mail/archivesmtp/Makefile	(revision 362853)
+++ head/mail/archivesmtp/Makefile	(revision 362854)
@@ -1,53 +1,47 @@
 # Created by: Netherby <netherby@dancingfortune.com>
 # $FreeBSD$
 
 PORTNAME=	archivesmtp
-PORTVERSION=	1.1.b1
+PORTVERSION=	1.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dancingfortune.com/projects/archivesmtp/files/
 
 MAINTAINER= ports@FreeBSD.org
 COMMENT=	SMTP mail archiver
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 LIBS+=		${PTHREAD_LIBS}\
 		-lmilter
-MAKE_ENV+=	LDADD="${LIBS}"\
-		BINDIR="${PREFIX}/sbin"\
-		MANDIR="${MANPREFIX}/man/man"\
-		NO_MANCOMPRESS="yes"
+MAKE_ENV+=	LDADD="${LIBS}"
 
 USE_RC_SUBR=	archivesmtp
 SUB_FILES=	pkg-message
-SUB_LIST+=	SOCKETBASE=${SOCKETBASE}\
-		SOCKETDIR=${SOCKETDIR}
+SUB_LIST+=	SOCKETBASE="${SOCKETBASE}"\
+		SOCKETDIR="${SOCKETDIR}"
 PLIST_SUB+=	${SUB_LIST}
 
-MAN8=		archivesmtp.8
-
 # Path for unix/local socket (by default also used for pid file)
 SOCKETBASE?=	/var/run
 SOCKETDIR?=	archivesmtp
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # Sets up libmilter dependencies and options
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 pre-build:
 	# Copy BSD Makefiles into build tree
 	${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile
 	${CP} ${FILESDIR}/src-Makefile ${WRKSRC}/src/Makefile
 
+do-install:
+	${INSTALL} -s ${WRKSRC}/src/archivesmtp ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/src/archivesmtp.8 ${STAGEDIR}${PREFIX}/man/man8
+
 post-install:
 	# Install sample configuration file
-	${INSTALL_DATA} ${WRKSRC}/src/archivesmtp.conf.sample ${PREFIX}/etc
-	# Create directory for unix/local socket
-	${MKDIR} ${SOCKETBASE}/${SOCKETDIR}
-	${CHOWN} nobody ${SOCKETBASE}/${SOCKETDIR}
-	${CHMOD} 755 ${SOCKETBASE}/${SOCKETDIR}
-	# Print post install message
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKSRC}/src/archivesmtp.conf.sample ${STAGEDIR}${PREFIX}/etc
+	# Create socket directory
+	@${MKDIR} ${STAGEDIR}${SOCKETBASE}/${SOCKETDIR}
 
 .include <bsd.port.post.mk>
Index: head/mail/archivesmtp/distinfo
===================================================================
--- head/mail/archivesmtp/distinfo	(revision 362853)
+++ head/mail/archivesmtp/distinfo	(revision 362854)
@@ -1,2 +1,2 @@
-SHA256 (archivesmtp-1.1.b1.tar.gz) = 0b4c8ddb15262721801c929fd104549c63d569af82ba9aaa5d26294ad88f72d8
-SIZE (archivesmtp-1.1.b1.tar.gz) = 101835
+SHA256 (archivesmtp-1.2.tar.gz) = b3ec9e21271dbfd130b2603a9c6f98d1091d9ff9d675094f74a21b2f3b099c54
+SIZE (archivesmtp-1.2.tar.gz) = 120810
Index: head/mail/archivesmtp/files/archivesmtp.in
===================================================================
--- head/mail/archivesmtp/files/archivesmtp.in	(revision 362853)
+++ head/mail/archivesmtp/files/archivesmtp.in	(revision 362854)
@@ -1,26 +1,30 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: archivesmtp
 # BEFORE: mail
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
 name="archivesmtp"
-rcvar=archivesmtp_enable
+rcvar=`set_rcvar`
 
 command="%%PREFIX%%/sbin/${name}"
 
 # Read settings and set defaults
 load_rc_config "$name"
 
 : ${archivesmtp_enable="NO"}
 : ${archivesmtp_chuser="nobody"}
 : ${archivesmtp_socket="unix:%%SOCKETBASE%%/%%SOCKETDIR%%/mta.sock"}
 : ${archivesmtp_config="%%PREFIX%%/etc/archivesmtp.conf"}
 : ${archivesmtp_pidfile="%%SOCKETBASE%%/%%SOCKETDIR%%/run.pid"}
+# archivesmtp_flags= May be used to set optional behaviours.
 
 pidfile="${archivesmtp_pidfile}"
 
-command_args="${archivesmtp_flags} -p ${archivesmtp_socket} -f ${archivesmtp_config} -u ${archivesmtp_chuser} -r ${archivesmtp_pidfile} &"
+command_args="-p ${archivesmtp_socket} -f ${archivesmtp_config} -u ${archivesmtp_chuser} -r ${archivesmtp_pidfile} ${archivesmtp_flags} &"
 
 run_rc_command "$1"
Index: head/mail/archivesmtp/pkg-descr
===================================================================
--- head/mail/archivesmtp/pkg-descr	(revision 362853)
+++ head/mail/archivesmtp/pkg-descr	(revision 362854)
@@ -1,9 +1,9 @@
 ArchiveSMTP is a mail archiver designed to be run on an SMTP mail server. It
 uses rule-based matching to collect and store mail passing through an MTA to
 specific locations in mbox format. Adding headers and piping output to other
 programs is also supported. The libmilter interface is used and must be
 supported by the MTA for ArchiveSMTP to work.
 
-Version: 1.1.b1
+Version: 1.2
 
 WWW: http://www.dancingfortune.com/projects/archivesmtp/
Index: head/mail/archivesmtp/pkg-plist
===================================================================
--- head/mail/archivesmtp/pkg-plist	(revision 362853)
+++ head/mail/archivesmtp/pkg-plist	(revision 362854)
@@ -1,7 +1,7 @@
 sbin/archivesmtp
 etc/archivesmtp.conf.sample
-@stopdaemon archivesmtp
+man/man8/archivesmtp.8.gz
+@owner nobody
+@mode 755
 @exec mkdir -p %%SOCKETBASE%%/%%SOCKETDIR%%
-@exec chown nobody %%SOCKETBASE%%/%%SOCKETDIR%%
-@cwd %%SOCKETBASE%%
-@dirrm %%SOCKETDIR%%
+@dirrmtry %%SOCKETBASE%%/%%SOCKETDIR%%