diff -ur www/hastymail2.orig/Makefile www/hastymail2/Makefile
--- www/hastymail2.orig/Makefile	2011-09-17 09:42:11.000000000 +0100
+++ www/hastymail2/Makefile	2012-09-14 09:42:36.000000000 +0100
@@ -7,10 +7,10 @@
 
 PORTNAME=	hastymail2
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www mail
-MASTER_SITES=	SF/hastymail/Hastymail2%20Stable%20Releases/Hastymail2%201.01/
+MASTER_SITES=	SF/hastymail/Hastymail2%20Stable%20Releases/Hastymail2%201.1/
 DISTNAME=	hastymail2_${WIKEDVERSION}
 
 MAINTAINER=	graudeejs@gmail.com
@@ -21,22 +21,23 @@
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-CONFLICTS=      hastymail2-devel-1.[0-9]*
+CONFLICTS=      hastymail-* hastymail2-devel-*
 
-INSTALL_DIR?=	www/${PORTNAME}
 PLIST=		${WRKDIR}/pkg-plist
 
 WANT_PHP_WEB=	yes
-USE_PHP=	session imap pcre
+USE_PHP=	ctype pcre session xml
 
-WIKEDVERSION=	1_01
+WIKEDVERSION=	1_1
 WRKSRC=		${WRKDIR}/${PORTNAME}_${WIKEDVERSION}
 NO_BUILD=	yes
 FIND_SKIP_OPTS=	-not -name hastymail2.conf.example -not -name '*.orig'
 
 OPTIONS=	PGSQL	"Use PostgreSQL" off \
 		MYSQL	"Use MySQL" off \
-		DB	"Use older pear DB (instead of MDB2)" off
+		DB	"Use older pear DB (instead of MDB2)" off \
+		ICONV	"Support character set conversion" off \
+		MBSTRING "Support multi-byte character sets" off
 
 .include <bsd.port.pre.mk>
 
@@ -58,6 +59,14 @@
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
+.if defined(WITH_ICONV)
+USE_PHP+=	iconv
+.endif
+
+.if defined(WITH_MBSTRING)
+USE_PHP+=	mbstring
+.endif
+
 post-patch:
 	@${SED} -I.orig -e "s#'/etc/hastymail2/hastymail2.rc'#'${PREFIX}/etc/hastymail2/hastymail2.rc'#" \
 		${WRKSRC}/index.php
@@ -66,17 +75,17 @@
 
 pre-install:
 	@${FIND} -s -d ${WRKSRC}/ -type f ${FIND_SKIP_OPTS} \
-		| ${SED} "s#${WRKSRC}#${INSTALL_DIR}#g" > ${PLIST}
+		| ${SED} "s#${WRKSRC}#${WWWDIR_REL}#g" > ${PLIST}
 	@${ECHO_CMD} etc/hastymail2/hastymail2.conf.sample >> ${PLIST}
 	@${FIND} -s -d ${WRKSRC}/ -type d ${FIND_SKIP_OPTS} \
-		| ${SED} "s#${WRKSRC}#@dirrm ${INSTALL_DIR}#g" >> ${PLIST}
+		| ${SED} "s#${WRKSRC}#@dirrm ${WWWDIR_REL}#g" >> ${PLIST}
 	@${ECHO_CMD} @dirrmtry etc/hastymail2 >> ${PLIST}
 
 do-install:
-	@${MKDIR} ${PREFIX}/${INSTALL_DIR}
+	@${MKDIR} ${WWWDIR}
 	@cd ${WRKSRC} && ${FIND} . ${FIND_SKIP_OPTS} \
-		| ${PAX} -rwd ${PREFIX}/${INSTALL_DIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${INSTALL_DIR}
+		| ${PAX} -rwd ${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 	@${MKDIR} ${PREFIX}/etc/hastymail2
 	@${INSTALL_DATA} ${WRKSRC}/hastymail2.conf.example \
 		${PREFIX}/etc/hastymail2/hastymail2.conf.sample
diff -ur www/hastymail2.orig/distinfo www/hastymail2/distinfo
--- www/hastymail2.orig/distinfo	2010-12-16 23:05:48.000000000 +0000
+++ www/hastymail2/distinfo	2012-09-14 09:43:22.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (hastymail2_1_01.tar.gz) = 70e599ed0cae544bb1a2ea064dead7cdb1bb42d8fa7c46e9d2183d6aae7c73f6
-SIZE (hastymail2_1_01.tar.gz) = 1858492
+SHA256 (hastymail2_1_1.tar.gz) = 84a53fadfe943b334ea0e9c8c364fe1c4b3b3692ff8935e61743547901193a4e
+SIZE (hastymail2_1_1.tar.gz) = 2421216