From owner-svn-ports-all@FreeBSD.ORG Thu May 1 16:36:48 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 904DEE69; Thu, 1 May 2014 16:36:48 +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 7231F1111; Thu, 1 May 2014 16:36:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s41GamhY038135; Thu, 1 May 2014 16:36:48 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s41GamQ1038133; Thu, 1 May 2014 16:36:48 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201405011636.s41GamQ1038133@svn.freebsd.org> From: Adam Weinberger Date: Thu, 1 May 2014 16:36:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352759 - head/mail/squirrelmail X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2014 16:36:48 -0000 Author: adamw Date: Thu May 1 16:36:47 2014 New Revision: 352759 URL: http://svnweb.freebsd.org/changeset/ports/352759 QAT: https://qat.redports.org/buildarchive/r352759/ Log: Small cleanups, let pkg-create do permissions and ownerships its own way rather than invoking chown and chmod ourselves. Modified: head/mail/squirrelmail/Makefile head/mail/squirrelmail/pkg-plist Modified: head/mail/squirrelmail/Makefile ============================================================================== --- head/mail/squirrelmail/Makefile Thu May 1 16:28:52 2014 (r352758) +++ head/mail/squirrelmail/Makefile Thu May 1 16:36:47 2014 (r352759) @@ -97,13 +97,11 @@ do-install: @${MKDIR} ${STAGEDIR}${SQUIRRELDIR} ${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${SQUIRRELDIR} ${INSTALL_SCRIPT} ${WRKSRC}/configure ${STAGEDIR}${SQUIRRELDIR} - cd ${WRKSRC} && \ + (cd ${WRKSRC} && \ ${FIND} attach class config data functions help images include locale plugins po scripts src themes \ - | ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR} - ${CHMOD} 730 ${STAGEDIR}${SQUIRRELDIR}/attach - ${CHMOD} 750 ${STAGEDIR}${SQUIRRELDIR}/data + | ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${FIND} . | ${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Modified: head/mail/squirrelmail/pkg-plist ============================================================================== --- head/mail/squirrelmail/pkg-plist Thu May 1 16:28:52 2014 (r352758) +++ head/mail/squirrelmail/pkg-plist Thu May 1 16:36:47 2014 (r352759) @@ -1,7 +1,5 @@ etc/periodic/daily/111.clean-squirrelmail %%SQUIRRELDIR%%/attach/.htaccess -@exec chown %%SMUSER%%:%%SMGROUP%% %B -@exec chmod 730 %B %%SQUIRRELDIR%%/class/.htaccess %%SQUIRRELDIR%%/class/deliver/Deliver.class.php %%SQUIRRELDIR%%/class/deliver/Deliver_IMAP.class.php @@ -31,8 +29,6 @@ etc/periodic/daily/111.clean-squirrelmai %%SQUIRRELDIR%%/data/.htaccess @sample %%SQUIRRELDIR%%/data/default_pref.sample %%SQUIRRELDIR%%/data/index.php -@exec chown %%SMUSER%%:%%SMGROUP%% %B -@exec chmod 750 %B %%SQUIRRELDIR%%/functions/.htaccess %%SQUIRRELDIR%%/functions/abook_database.php %%SQUIRRELDIR%%/functions/abook_ldap_server.php @@ -502,13 +498,25 @@ etc/periodic/daily/111.clean-squirrelmai @dirrm %%SQUIRRELDIR%%/functions/encode @dirrm %%SQUIRRELDIR%%/functions/decode @dirrm %%SQUIRRELDIR%%/functions +@owner %%SMUSER%% +@group %%SMGROUP%% +@mode 0750 @dirrm %%SQUIRRELDIR%%/data +@mode +@group +@owner @dirrmtry %%SQUIRRELDIR%%/config @dirrm %%SQUIRRELDIR%%/class/mime @dirrm %%SQUIRRELDIR%%/class/helper @dirrm %%SQUIRRELDIR%%/class/deliver @dirrm %%SQUIRRELDIR%%/class +@owner %%SMUSER%% +@group %%SMGROUP%% +@mode 0730 @dirrmtry %%SQUIRRELDIR%%/attach +@mode +@group +@owner @dirrmtry %%SQUIRRELDIR%% @dirrmtry etc/periodic/daily @dirrmtry etc/periodic