From owner-svn-ports-head@FreeBSD.ORG Sat Jul 19 18:41:18 2014 Return-Path: Delivered-To: svn-ports-head@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 ED644E80; Sat, 19 Jul 2014 18:41:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA88F2373; Sat, 19 Jul 2014 18:41:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6JIfHQe007633; Sat, 19 Jul 2014 18:41:17 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6JIfHiB007630; Sat, 19 Jul 2014 18:41:17 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407191841.s6JIfHiB007630@svn.freebsd.org> From: Adam Weinberger Date: Sat, 19 Jul 2014 18:41:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362277 - in head/mail/atmail: . files 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.18 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: Sat, 19 Jul 2014 18:41:18 -0000 Author: adamw Date: Sat Jul 19 18:41:16 2014 New Revision: 362277 URL: http://svnweb.freebsd.org/changeset/ports/362277 QAT: https://qat.redports.org/buildarchive/r362277/ Log: Stage and use OPTIONS helpers. I added the same permissions stuff to the plist as was in the Makefile, but I really don't think that applying 755 to everything is necessary... Modified: head/mail/atmail/Makefile head/mail/atmail/files/pkg-message.in head/mail/atmail/pkg-plist Modified: head/mail/atmail/Makefile ============================================================================== --- head/mail/atmail/Makefile Sat Jul 19 18:38:55 2014 (r362276) +++ head/mail/atmail/Makefile Sat Jul 19 18:41:16 2014 (r362277) @@ -6,44 +6,26 @@ PORTVERSION= 1.0.4 CATEGORIES= mail MASTER_SITES= http://atmail.org/download/ DISTNAME= atmailopen -EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Open Source Webmail Client +USES= tar:tgz USE_PHP= mysql pcre session WRKSRC= ${WRKDIR}/${DISTNAME} NO_BUILD= yes SUB_FILES= pkg-message +PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -OPTIONS_DEFINE= LDAP MBSTRING -MBSTRING_DESC= Support for UTF8 folder names +OPTIONS_DEFINE= LDAP MBSTRING ICONV +MBSTRING_DESC= Support for UTF8 folder names -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MLDAP} -USE_PHP+= ldap -.endif - -.if ${PORT_OPTIONS:MMBSTRING} -USE_PHP+= mbstring -.endif - -.if ${PORT_OPTIONS:MICONV} -USE_PHP+= iconv -.endif +LDAP_USE= PHP=ldap +MBSTRING_USE= PHP=mbstring +ICONV_USE= PHP=iconv do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${CHMOD} -R 755 ${WWWDIR} - -post-install: - @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \ - >> ${TMPPLIST} - @${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' \ - >> ${TMPPLIST} - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${WWWDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) .include Modified: head/mail/atmail/files/pkg-message.in ============================================================================== --- head/mail/atmail/files/pkg-message.in Sat Jul 19 18:38:55 2014 (r362276) +++ head/mail/atmail/files/pkg-message.in Sat Jul 19 18:41:16 2014 (r362277) @@ -2,16 +2,15 @@ POST-INSTALL CONFIGURATION FOR ATMAIL ===================================== -1) Before the post-install of atmail ,please make sure -your SMTP server work well first. - Better turn off magic_quotes_gpc setting in the -php.ini. +1) Before the post-install of atmail, please make sure + your SMTP server work well first. + Better turn off magic_quotes_gpc setting in php.ini. 2) Add the following to your Apache configuration, and restart the server: ### Add the AcceptPathInfo directive only for Apache 2.0.30 or later. - Alias /atmail %%WWWDIR%%/ + Alias /atmail %%WWWDIR%% AcceptPathInfo On AllowOverride None Modified: head/mail/atmail/pkg-plist ============================================================================== --- head/mail/atmail/pkg-plist Sat Jul 19 18:38:55 2014 (r362276) +++ head/mail/atmail/pkg-plist Sat Jul 19 18:41:16 2014 (r362277) @@ -1,4 +1,6 @@ -@exec mkdir -p %D/www/atmail/users +@mode 755 +@owner %%WWWOWN%% +@group %%WWWGRP%% %%WWWDIR%%/CHANGELOG %%WWWDIR%%/LICENSE %%WWWDIR%%/README