From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 15 18:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D75EAF05 for ; Sat, 15 Mar 2014 18:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B4AB6386 for ; Sat, 15 Mar 2014 18:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2FIA0ES053470 for ; Sat, 15 Mar 2014 18:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2FIA03H053469; Sat, 15 Mar 2014 18:10:00 GMT (envelope-from gnats) Resent-Date: Sat, 15 Mar 2014 18:10:00 GMT Resent-Message-Id: <201403151810.s2FIA03H053469@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Adam Weinberger Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35F41B0B for ; Sat, 15 Mar 2014 18:03:25 +0000 (UTC) Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E6260326 for ; Sat, 15 Mar 2014 18:03:24 +0000 (UTC) Received: by apnoea.adamw.org (Postfix, from userid 0) id B2E1B11FAA3; Sat, 15 Mar 2014 14:03:18 -0400 (EDT) Message-Id: <20140315180318.B2E1B11FAA3@apnoea.adamw.org> Date: Sat, 15 Mar 2014 14:03:18 -0400 (EDT) From: Adam Weinberger To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/187610: [patch] ad a few more recommended php modules to mail/roundcube X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Adam Weinberger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Mar 2014 18:10:00 -0000 >Number: 187610 >Category: ports >Synopsis: [patch] ad a few more recommended php modules to mail/roundcube >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 15 18:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Adam Weinberger >Release: FreeBSD 10.0-STABLE i386 >Organization: >Environment: System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #2: Fri Mar 14 08:04:59 EDT 2014 root@apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386 >Description: There are a few more "recommended" php modules. It'd be nice to have them in the Makefile to register dependencies, and the features they add are quite nice. While at it, I also shorted up the Makefile by using OPTIONS helpers, and removed a couple instances where double-slashes were showing up. >How-To-Repeat: >Fix: --- roundcube.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 348359) +++ Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= roundcube DISTVERSION= 0.9.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES?= mail www MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:U} @@ -21,7 +22,7 @@ USE_PHP= pcre mbstring session iconv dom xml json intl zip filter IGNORE_WITH_PHP=52 -OPTIONS_DEFINE= SSL LDAP GD PSPELL NSC +OPTIONS_DEFINE= SSL LDAP GD PSPELL NSC DOCS FILEINFO MCRYPT EXIF OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT=MYSQL @@ -34,40 +35,26 @@ GD_DESC= Enable GD support (image conversion) PSPELL_DESC= Enable PSpell support (internal spellcheck) NSC_DESC= Install network spellchecker +FILEINFO_DESC= Enable attachment filetype detection support +MCRYPT_DESC= Enable encryption support +EXIF_DESC= Enable image upload metadata support +MYSQL_USE= PHP=pdo_mysql +PGSQL_USE= PHP=pgsql +SQLITE_USE= PHP=pdo_sqlite +SSL_USE= PHP=openssl +LDAP_USE= PHP=ldap +GD_USE= PHP=gd +PSPELL_USE= PHP=pspell +NSC_USE= PHP=pspell,simplexml +FILEINFO_USE= PHP=fileinfo +MCRYPT_USE= PHP=mcrypt +EXIF_USE= PHP=exif + .include -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= pdo_mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pdo_pgsql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_PHP+= pdo_sqlite -.endif - -.if ${PORT_OPTIONS:MSSL} -USE_PHP+= openssl -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_PHP+= ldap -.endif - -.if ${PORT_OPTIONS:MGD} -USE_PHP+= gd -.endif - -.if ${PORT_OPTIONS:MPSPELL} || ${PORT_OPTIONS:MNSC} -USE_PHP+= pspell -.endif - .if ${PORT_OPTIONS:MNSC} RCUBECOMP+= spellchecker.php -USE_PHP+= simplexml PLIST_SUB+= SPELLCHECK="" .else PLIST_SUB+= SPELLCHECK="@comment " @@ -82,17 +69,15 @@ @${FIND} ${WRKSRC} -name \*.orig -type f -delete do-install: - -${MKDIR} ${STAGEDIR}/${WWWDIR} - @cd ${WRKSRC} && ${COPYTREE_BIN} bin ${STAGEDIR}/${WWWDIR} + -${MKDIR} ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR} .for i in ${RCUBECOMP} - @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}/${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR} .endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}/${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif @(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \ ${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST} @${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \ --- roundcube.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: