Index: head/mail/mailsync/Makefile
===================================================================
--- head/mail/mailsync/Makefile	(revision 348457)
+++ head/mail/mailsync/Makefile	(revision 348458)
@@ -1,42 +1,38 @@
 # Created by: Maxim Tulyuk <mt@primats.org.ua>
 # $FreeBSD$
 
 PORTNAME=	mailsync
 PORTVERSION=	5.2.1
 PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mailsync is a way of keeping a collection of mailboxes synchronized
 
-LIB_DEPENDS=	c-client4.9:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	libc-client4.so:${PORTSDIR}/mail/cclient
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE=	yes
+USES=		gmake
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-c-client=${LOCALBASE}
 
-MAN1=		mailsync.1
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-NO_STAGE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/mailsync ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mailsync ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING NEWS README \
-		THANKS TODO ${DOCSDIR}
+		THANKS TODO ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ABSTRACT HACKING \
 		mail_open_close_flowchart.dia \
 		mail_open_close_flowchart.svg \
-		mail_open_close_flowchart2.svg ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync ${EXAMPLESDIR}
-.endif
+		mail_open_close_flowchart2.svg ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/mail/mailsync/pkg-plist
===================================================================
--- head/mail/mailsync/pkg-plist	(revision 348457)
+++ head/mail/mailsync/pkg-plist	(revision 348458)
@@ -1,15 +1,16 @@
 bin/mailsync
+man/man1/mailsync.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ABSTRACT
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart.dia
 %%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart.svg
 %%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart2.svg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailsync
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%