3 files changed, 27 insertions, 17 deletions

diff --git a/www/hastymail2-devel/Makefile b/www/hastymail2-devel/Makefile
index a7d52ee274f1..6e004adccbd0 100644
--- a/www/hastymail2-devel/Makefile
+++ b/www/hastymail2-devel/Makefile
@@ -6,32 +6,34 @@
 #
 
 PORTNAME=	hastymail2
-PORTVERSION=	1.1
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	1.1.${HASTYMAIL_REV:S/.//g}
 CATEGORIES=	www mail
-MASTER_SITES=	SF/hastymail/Hastymail2%20Stable%20Releases/Hastymail2%201.01/
-DISTNAME=	hastymail2_${WIKEDVERSION}
+MASTER_SITES=	http://files.bsdroot.lv/my/FreeBSD/distfiles/hastymail2-devel/
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-devel-${HASTYMAIL_REV}
 
 MAINTAINER=	aldis@bsdroot.lv
 COMMENT=	Small, fast and secure yet powerful IMAP webmail
 
+LICENSE=	GPLv2
+
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-LICENSE=	GPLv2
-
 INSTALL_DIR?=	www/${PORTNAME}
 PLIST=		${WRKDIR}/pkg-plist
 
 WANT_PHP_WEB=	yes
 USE_PHP=	session imap pcre
 
-WIKEDVERSION=	1_01
-WRKSRC=		${WRKDIR}/${PORTNAME}_${WIKEDVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 FIND_SKIP_OPTS=	-not -name hastymail2.conf.example -not -name '*.orig'
 
+CONFLICTS=	hastymail2-1.[0-9]*
+
+HASTYMAIL_REV=	2011.08.22
+
 OPTIONS=	PGSQL	"Use PostgreSQL" off \
 		MYSQL	"Use MySQL" off \
 		DB	"Use older pear DB (instead of MDB2)" off
@@ -57,27 +59,27 @@ RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
 post-patch:
-	@${SED} -I.orig -e "s#'/etc/hastymail2/hastymail2.rc'#'${PREFIX}/etc/hastymail2/hastymail2.rc'#" \
+	@${SED} -I.orig -e "s#'/etc/hastymail2/hastymail2.rc'#'${ETCDIR}/hastymail2.rc'#" \
 		${WRKSRC}/index.php
-	@${SED} -I.orig -e "s# /etc/hastymail/hastyamil2.rc# ${PREFIX}/etc/hastymail2/hastyamil2.rc#" \
+	@${SED} -I.orig -e "s# /etc/hastymail/hastyamil2.rc# ${ETCDIR}/hastyamil2.rc#" \
 		${WRKSRC}/hastymail2.conf.example
 
 pre-install:
 	@${FIND} -s -d ${WRKSRC}/ -type f ${FIND_SKIP_OPTS} \
 		| ${SED} "s#${WRKSRC}#${INSTALL_DIR}#g" > ${PLIST}
-	@${ECHO_CMD} etc/hastymail2/hastymail2.conf.sample >> ${PLIST}
+	@${ECHO_CMD} %%ETCDIR%%/hastymail2.conf.sample >> ${PLIST}
 	@${FIND} -s -d ${WRKSRC}/ -type d ${FIND_SKIP_OPTS} \
 		| ${SED} "s#${WRKSRC}#@dirrm ${INSTALL_DIR}#g" >> ${PLIST}
-	@${ECHO_CMD} @dirrmtry etc/hastymail2 >> ${PLIST}
+	@${ECHO_CMD} @dirrmtry %%ETCDIR%% >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${PREFIX}/${INSTALL_DIR}
 	@cd ${WRKSRC} && ${FIND} . ${FIND_SKIP_OPTS} \
 		| ${PAX} -rwd ${PREFIX}/${INSTALL_DIR}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${INSTALL_DIR}
-	@${MKDIR} ${PREFIX}/etc/hastymail2
+	@${MKDIR} ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/hastymail2.conf.example \
-		${PREFIX}/etc/hastymail2/hastymail2.conf.sample
+		${ETCDIR}/hastymail2.conf.sample
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/hastymail2-devel/distinfo b/www/hastymail2-devel/distinfo
index 7277aaeba471..2f14db38fa26 100644
--- a/www/hastymail2-devel/distinfo
+++ b/www/hastymail2-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hastymail2_1_01.tar.gz) = 70e599ed0cae544bb1a2ea064dead7cdb1bb42d8fa7c46e9d2183d6aae7c73f6
-SIZE (hastymail2_1_01.tar.gz) = 1858492
+SHA256 (hastymail2-devel-2011.08.22.tar.gz) = ed0e4f480c2fd4d0bba50009ed70533436628cd8e4e3ed020117e40ef5a9f772
+SIZE (hastymail2-devel-2011.08.22.tar.gz) = 2253582
diff --git a/www/hastymail2-devel/files/pkg-message.in b/www/hastymail2-devel/files/pkg-message.in
index 6c080ed558b5..6d5fd9be6aaa 100644
--- a/www/hastymail2-devel/files/pkg-message.in
+++ b/www/hastymail2-devel/files/pkg-message.in
@@ -10,4 +10,12 @@ The proper config file path is:
 
 %%PREFIX%%/etc/hastymail2/hastymail2.conf
 
+after you edit config file run:
+
+  cd %%PREFIX%%/etc/hastymail2/
+  php %%PREFIX%%/www/hastymail2/install_scripts/install_config.php \
+    hastymail2.conf hastymail2.rc
+
+Note: if hastymail2.rc already exists, you must remove it
+
 ******************************************************