Index: head/mail/isync/Makefile
===================================================================
--- head/mail/isync/Makefile	(revision 408539)
+++ head/mail/isync/Makefile	(revision 408540)
@@ -1,35 +1,34 @@
 # Created by: eivind
 # $FreeBSD$
 
 PORTNAME=	isync
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Maintain local copies of remote IMAP folders w/synchronized flags
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+
 USES=		alias cpe
 CPE_VENDOR=	oswald_buddenhagen
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-sasl=${LOCALBASE} \
+		--with-ssl=${OPENSSLLIB:H}
 USE_OPENSSL=	yes
 USE_BDB=	46+
 
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${OPENSSLINC}
-LDFLAGS+=	-L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
+LDFLAGS+=	-L${BDB_LIB_DIR}
 
-OPTIONS_DEFINE=	DOCS
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|\$$(docdir)/examples|\$$(sysconfdir)|g' \
+	    ${WRKSRC}/src/Makefile.in ${WRKSRC}/src/compat/Makefile.in
 	@${REINPLACE_CMD} -e 's|-ansi||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
 
 .include <bsd.port.mk>
Index: head/mail/isync/pkg-plist
===================================================================
--- head/mail/isync/pkg-plist	(revision 408539)
+++ head/mail/isync/pkg-plist	(revision 408540)
@@ -1,9 +1,9 @@
 bin/get-cert
 bin/isync
 bin/mbsync
 bin/mdconvert
 man/man1/isync.1.gz
 man/man1/mbsync.1.gz
 man/man1/mdconvert.1.gz
-%%DOCSDIR%%/examples/isyncrc.sample
-%%DOCSDIR%%/examples/mbsyncrc.sample
+@sample etc/isyncrc.sample
+@sample etc/mbsyncrc.sample