Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/imap-uw/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- Makefile	21 May 2009 15:21:35 -0000	1.87
+++ Makefile	12 Jan 2010 00:12:00 -0000
@@ -15,12 +15,20 @@
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
 PKGNAMESUFFIX=	-uw
-DISTNAME=	imap-${PORTVERSION}
-DISTFILES=	${DISTNAME}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
 
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	University of Washington IMAP4rev1/POP2/POP3 mail servers
 
+LIB_DEPENDS=	c-client4.9:${PORTSDIR}/mail/cclient
+
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+SUB_FILES=	pkg-message
+
+MAN1=		dmail.1 mailutil.1 tmail.1
+MAN8=		ipopd.8 imapd.8
+
+ALL_TARGET=	bsf
+
 # This port must have the same SSL settings as mail/cclient, which it depends on
 # To make MBX format the default mailbox format, change the settings of cclient
 
@@ -29,21 +37,13 @@
 		DRAC "Dynamically open MTA for relaying" off \
 		NETSCAPE_BRAIN_DAMAGE "See Makefile for documentation" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-LIB_DEPENDS=	c-client4.9:${PORTSDIR}/mail/cclient
 .if defined(WITH_DRAC)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 MAKE_ARGS+=	WITH_DRAC=yes
 .endif
 
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-MAN1=		dmail.1 mailutil.1 tmail.1
-MAN8=		ipopd.8 imapd.8
-
-ALL_TARGET=	bsf
 .if defined(WITHOUT_SSL)
 MAKE_ARGS+=	SSLTYPE=none SSLDIR=${OPENSSLBASE}
 .else
@@ -61,6 +61,7 @@
 .endif
 # See src/imapd/Makefile for more information about these three options.
 
+.include <bsd.port.pre.mk>
 pre-build:
 	@${SH} ${PKGREQ}.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
 .if !defined(WITHOUT_SSL)
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	1 Jun 2003 20:49:37 -0000	1.8
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-The ipop2d, ipop3d, and imapd daemons should be invoked by your
-/etc/inetd.conf file with lines such as:
-
-pop2    stream  tcp     nowait  root    /usr/local/libexec/ipop2d   ipop2d
-pop3    stream  tcp     nowait  root    /usr/local/libexec/ipop3d   ipop3d
-imap4   stream  tcp     nowait  root    /usr/local/libexec/imapd    imapd
-
-If PAM authentication support has been compiled in you will need to add
-something like the following lines to /etc/pam.conf (PAM authentication is
-default):
-
-imap	auth	required	pam_unix.so
-imap	account	required	pam_unix.so
-imap	session	required	pam_unix.so
-pop3	auth	required	pam_unix.so
-pop3	account	required	pam_unix.so
-pop3	session	required	pam_unix.so
-
-The pam_unix module does not have session support, so we do not use it for
-session management. Be sure to read up on pam.conf(5).
-
-===>   NB: IMAP-UW now rejects non-encrypted logins by default. To change this
-===>   behaviour, recompile and reinstall cclient and imap-uw ports with one of
-===>   the following make variables defined:
-
-WITHOUT_SSL - build without SSL/encryption support.
-WITH_SSL_AND_PLAINTEXT - build with SSL/encryption support, but allow
-non-encrypted logins.
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	12 Jan 2010 00:12:00 -0000
@@ -0,0 +1,28 @@
+The ipop2d, ipop3d, and imapd daemons should be invoked by your
+/etc/inetd.conf file with lines such as:
+
+pop2    stream  tcp     nowait  root    %%PREFIX%%/libexec/ipop2d   ipop2d
+pop3    stream  tcp     nowait  root    %%PREFIX%%/libexec/ipop3d   ipop3d
+imap4   stream  tcp     nowait  root    %%PREFIX%%/libexec/imapd    imapd
+
+If PAM authentication support has been compiled in you will need to add
+something like the following lines to /etc/pam.conf (PAM authentication is
+default):
+
+imap	auth	required	pam_unix.so
+imap	account	required	pam_unix.so
+imap	session	required	pam_unix.so
+pop3	auth	required	pam_unix.so
+pop3	account	required	pam_unix.so
+pop3	session	required	pam_unix.so
+
+The pam_unix module does not have session support, so we do not use it for
+session management. Be sure to read up on pam.conf(5).
+
+===>   NB: IMAP-UW now rejects non-encrypted logins by default. To change this
+===>   behaviour, recompile and reinstall cclient and imap-uw ports with one of
+===>   the following make variables defined:
+
+WITHOUT_SSL - build without SSL/encryption support.
+WITH_SSL_AND_PLAINTEXT - build with SSL/encryption support, but allow
+non-encrypted logins.