From owner-svn-ports-head@FreeBSD.ORG Thu Dec 13 19:04:57 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 12CC6B7E; Thu, 13 Dec 2012 19:04:57 +0000 (UTC) (envelope-from beech@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EB3898FC08; Thu, 13 Dec 2012 19:04:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDJ4uG1095802; Thu, 13 Dec 2012 19:04:56 GMT (envelope-from beech@svn.freebsd.org) Received: (from beech@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDJ4u9M095797; Thu, 13 Dec 2012 19:04:56 GMT (envelope-from beech@svn.freebsd.org) Message-Id: <201212131904.qBDJ4u9M095797@svn.freebsd.org> From: Beech Rintoul Date: Thu, 13 Dec 2012 19:04:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308867 - head/www/hastymail2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 19:04:57 -0000 Author: beech Date: Thu Dec 13 19:04:56 2012 New Revision: 308867 URL: http://svnweb.freebsd.org/changeset/ports/308867 Log: - Update to 1.1 final. - Security vulnerabilities are fixed in this version. - Addresses the concerns on Report #165549 which was closed because no patch was forthcoming. PR: ports/172929 Submitted by: Neil Darlow Approved by: Maintainer timeout (> Two Weeks) Modified: head/www/hastymail2/Makefile (contents, props changed) head/www/hastymail2/distinfo (contents, props changed) Modified: head/www/hastymail2/Makefile ============================================================================== --- head/www/hastymail2/Makefile Thu Dec 13 18:57:37 2012 (r308866) +++ head/www/hastymail2/Makefile Thu Dec 13 19:04:56 2012 (r308867) @@ -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 @@ LICENSE= GPLv2 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 @@ -58,6 +59,14 @@ RUN_DEPENDS+= ${LOCALBASE}/share/pear/MD 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 @@ post-patch: 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 Modified: head/www/hastymail2/distinfo ============================================================================== --- head/www/hastymail2/distinfo Thu Dec 13 18:57:37 2012 (r308866) +++ head/www/hastymail2/distinfo Thu Dec 13 19:04:56 2012 (r308867) @@ -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