Attachment 111382 Details for Bug 152632 – file.txt

file.txt

file.txt (text/plain), 7.34 KB, created by Aldis Berjoza on 2010-11-28 02:00:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aldis Berjoza

Created: 2010-11-28 02:00:21 UTC

Size: 7.34 KB

patch

obsolete

>Files hastymail.bak/.Makefile.swp and hastymail/.Makefile.swp differ
>diff -ruN hastymail.bak/Makefile hastymail/Makefile
>--- hastymail.bak/Makefile	2010-11-28 03:34:24.780714838 +0200
>+++ hastymail/Makefile	2010-11-28 03:50:12.340502730 +0200
>@@ -5,49 +5,57 @@
> # $FreeBSD: ports/www/hastymail/Makefile,v 1.8 2009/09/02 15:01:54 amdmi3 Exp $
> #
> 
>-PORTNAME=		hastymail
>-PORTVERSION=		1.5
>-PORTREVISION=		3
>-CATEGORIES=		www
>-MASTER_SITES=		SF/${PORTNAME}/OldFiles
>+PORTNAME=	hastymail2
>+PORTVERSION=	1.1
>+PORTEPOCH=	1
>+CATEGORIES=	www mail
>+MASTER_SITES=	SF/hastymail/Hastymail2%20Stable%20Releases/Hastymail2%201.01/
>+DISTNAME=	hastymail2_1_01
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	aldis@bsdroot.lv
> COMMENT=	Small, fast and secure yet powerful IMAP webmail
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> NO_BUILD=	yes
> SUB_FILES=	pkg-message
> 
>+LICSENSE=	GPLv2
>+
> INSTALL_DIR?=	www/${PORTNAME}
>-PLIST=		${WRKDIR}/pkg-plist
>+PLIST=          ${WRKDIR}/pkg-plist
> 
> WANT_PHP_WEB=	yes
> USE_PHP=	session imap pcre
> 
>-.include <bsd.port.pre.mk>
>+WIKEDVERSION=	1_01
>+WRKSRC=		${WRKDIR}/${PORTNAME}_${WIKEDVERSION}
>+NO_BUILD=	yes
>+FIND_SKIP_OPTS=	-not -name hastymail2.conf.example -not -name '*.orig'
> 
>-# Don't install automatically CVS directories, patched files and the default config file.
>-FIND_SKIP_OPTS=	-not -name hastymail.conf-example -not -name '*.orig' \
>-		-not -name '*.bak' -not -path '*/CVS/*' -not -name CVS
>+.include <bsd.port.pre.mk>
> 
> post-patch:
>-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
>-		${WRKSRC}/lib/constant.php
>+	@${SED} -I.orig -e "s#'/etc/hastymail2/hastymail2.rc'#'${PREFIX}/etc/hastymail2/hastymail2.rc'#" \
>+		${WRKSRC}/index.php
>+	@${SED} -I.orig -e "s# /etc/hastymail/hastyamil2.rc# ${PREFIX}/etc/hastymail2/hastyamil2.rc#" \
>+		${WRKSRC}/hastymail2.conf.example
> 
> pre-install:
>-	@${FIND} -s -d ${WRKSRC}/ -type f ${FIND_SKIP_OPTS} | \
>-		${SED} "s?${WRKSRC}?${INSTALL_DIR}?g" >${PLIST}
>-	@${FIND} -s -d ${WRKSRC}/ -type d ${FIND_SKIP_OPTS} | \
>-		${SED} "s?${WRKSRC}?@dirrm ${INSTALL_DIR}?g" >> ${PLIST}
>-	@${ECHO_CMD} etc/hastymail.conf.sample >> ${PLIST}
>+	@${FIND} -s -d ${WRKSRC}/ -type f ${FIND_SKIP_OPTS} \
>+		| ${SED} "s#${WRKSRC}#${INSTALL_DIR}#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}
>+	@${ECHO_CMD} @dirrmtry etc/hastymail2 >> ${PLIST}
> 
> do-install:
> 	@${MKDIR} ${PREFIX}/${INSTALL_DIR}
>-	@cd ${WRKSRC} && ${FIND} . ${FIND_SKIP_OPTS} | \
>-		${PAX} -rwd ${PREFIX}/${INSTALL_DIR}
>+	@cd ${WRKSRC} && ${FIND} . ${FIND_SKIP_OPTS} \
>+		| ${PAX} -rwd ${PREFIX}/${INSTALL_DIR}
> 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${INSTALL_DIR}
>-	@${INSTALL_DATA} ${WRKSRC}/hastymail.conf-example \
>-		${PREFIX}/etc/hastymail.conf.sample
>+	@${MKDIR} ${PREFIX}/etc/hastymail2
>+	@${INSTALL_DATA} ${WRKSRC}/hastymail2.conf.example \
>+		${PREFIX}/etc/hastymail2/hastymail2.conf.sample
> 
> post-install:
> 	@${CAT} ${PKGMESSAGE}
>diff -ruN hastymail.bak/distinfo hastymail/distinfo
>--- hastymail.bak/distinfo	2010-11-28 03:34:24.780714838 +0200
>+++ hastymail/distinfo	2010-11-28 01:52:12.688537040 +0200
>@@ -1,3 +1,2 @@
>-MD5 (hastymail-1.5.tar.gz) = ca6699b30b59c87027eebc67a633384b
>-SHA256 (hastymail-1.5.tar.gz) = ea3a147e0a78650bf598e8ffe862eb6e50e2bf4e61e818efa241e03d51946eac
>-SIZE (hastymail-1.5.tar.gz) = 361269
>+SHA256 (hastymail2_1_01.tar.gz) = 70e599ed0cae544bb1a2ea064dead7cdb1bb42d8fa7c46e9d2183d6aae7c73f6
>+SIZE (hastymail2_1_01.tar.gz) = 1858492
>diff -ruN hastymail.bak/files/patch-lib-constant.php hastymail/files/patch-lib-constant.php
>--- hastymail.bak/files/patch-lib-constant.php	2010-11-28 03:34:24.779715853 +0200
>+++ hastymail/files/patch-lib-constant.php	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- lib/constant.php.orig Fri Jun  8 15:15:54 2007
>-+++ lib/constant.php      Fri Jun  8 15:16:10 2007
>-@@ -24,7 +24,7 @@
>- */
>- 
>- /* absolute path to the configuration file */
>--$config_file = '/etc/hastymail.conf';
>-+$config_file = '%%PREFIX%%/etc/hastymail.conf';
>- 
>- /* hastymail version */
>- $version = '1.5';
>diff -ruN hastymail.bak/files/pkg-message.in hastymail/files/pkg-message.in
>--- hastymail.bak/files/pkg-message.in	2010-11-28 03:34:24.779715853 +0200
>+++ hastymail/files/pkg-message.in	2010-11-28 03:36:07.580215189 +0200
>@@ -4,10 +4,10 @@
> Don't forget to edit your own config file. A sample config
> has been installed in:
> 
>-%%PREFIX%%/etc/hastymail.conf.sample
>+%%PREFIX%%/etc/hastymail2/hastymail2.conf.sample
> 
> The proper config file path is:
> 
>-%%PREFIX%%/etc/hastymail.conf
>+%%PREFIX%%/etc/hastymail2/hastymail2.conf
> 
> ******************************************************
>diff -ruN hastymail.bak/pkg-descr hastymail/pkg-descr
>--- hastymail.bak/pkg-descr	2010-11-28 03:34:24.779715853 +0200
>+++ hastymail/pkg-descr	2010-11-28 03:19:37.536095428 +0200
>@@ -1,8 +1,37 @@
>-Hastymail is a streamlined, secure, fast web based IMAP client written
>-in PHP. Hastymail is designed to have low server requirements and follow
>-internet standards for MIME, IMAP and SMTP communications. Hastymail is also
>-designed to work with all the major and not so major web browsers available.
>-Hastymail does not use frames, javascript, or cookies and all output is 100%
>-W3C compliant 4.01 transitional HTML.
>+Hastymail2 is a full featured IMAP/SMTP client written in PHP. Our goal is to
>+create a fast, secure, compliant web mail client that has great usability.
>+Hastymail2 is much more lightweight than most popular web based mail
>+applications but still maintains a competitive feature set. The project
>+originated as Hastymail in 2002, then was nearly completely rewritten as
>+Hastymail2 starting in January of 2008. We are very near our first stable
>+release of the second generation of Hastymail and development continues to be
>+active.
> 
>-WWW:	http://hastymail.sourceforge.net/
>+Features:
>+  * Compatible with PDAs, phones, text browsers, and all mainstream browsers
>+  * W3C valid UTF-8 XHTML pages that can be configured to be delivered as type
>+    application/xhtml-xml for supported browsers
>+  * Multilevel theme system using CSS, PHP templates, and icon sets
>+  * The ability to use a database for storing user settings, contacts, and
>+    plugin data, with support for both Postgresql and Mysql
>+  * Flexible and powerful plugin system with documentation, examples, and many
>+    plugins like a calendar, auto complete, sound notifications, HTML mail
>+    composition, and more
>+  * Tunable smart cache to balance IMAP activity and PHP session size to
>+    maximize performance for different configurations
>+  * AJAX updating using a lightweight and simple system
>+  * Small page sizes to minimize load time and bandwidth use. Average page
>+    sizes including javascript with AJAX updating, CSS, and images is less
>+    than 100K without compression or caching, 50K when using gzip compression,
>+    and less than 20K when using gzip and normal browser caching
>+  * Multiple interface languages and enhanced message character set handling
>+  * Custom built RFC compliant IMAP class that handles all IMAP communications
>+  * No special PHP requirements, compatible with PHP4 and PHP5
>+  * Advanced IMAP search capabilities
>+  * Vcard based contact management including import/export ability
>+  * IMAP SSL and STARTTLS* support
>+  * Flexible sessions including support for cookie-less sessions and random
>+    session ids*
>+  * Tons more!
>+
>+WWW: http://www.hastymail.org/

Actions: View

Attachments on bug 152632: 111382