From owner-svn-ports-all@FreeBSD.ORG Tue Oct 16 09:32:52 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E01B393; Tue, 16 Oct 2012 09:32:52 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D2498FC0C; Tue, 16 Oct 2012 09:32:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9G9WqX7005623; Tue, 16 Oct 2012 09:32:52 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9G9WqNE005621; Tue, 16 Oct 2012 09:32:52 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201210160932.q9G9WqNE005621@svn.freebsd.org> From: Adam Weinberger Date: Tue, 16 Oct 2012 09:32:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305960 - 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.14 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: Tue, 16 Oct 2012 09:32:52 -0000 Author: adamw Date: Tue Oct 16 09:32:51 2012 New Revision: 305960 URL: http://svn.freebsd.org/changeset/ports/305960 Log: Rather than using cp -R and warning about umask values, use cpio. As a result, this picks up an .htaccess in DOCSDIR that we were missing before. Also, prevent a patch remnant from getting installed. PORTREVISION bumped for plist change. Feature safe: yes Modified: head/mail/squirrelmail/Makefile Modified: head/mail/squirrelmail/Makefile ============================================================================== --- head/mail/squirrelmail/Makefile Tue Oct 16 09:28:20 2012 (r305959) +++ head/mail/squirrelmail/Makefile Tue Oct 16 09:32:51 2012 (r305960) @@ -7,7 +7,7 @@ PORTNAME= squirrelmail PORTVERSION= 1.4.22 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www MASTER_SITES= SF/${PORTNAME}/stable/${PORTVERSION} DISTNAME= ${PORTNAME}-webmail-${PORTVERSION} @@ -40,7 +40,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \ SUB_FILES= pkg-message pkg-install pkg-deinstall SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP} -PORTDOCS= * +PORTDOCS= * .htaccess CONFLICTS= squirreloutlook-[0-9]* @@ -82,7 +82,7 @@ post-patch: # Rearrange the documentation do-build: @${MV} ${WRKSRC}/themes/README.themes ${WRKSRC}/doc/ - @cd ${WRKSRC} ; for f in `find plugins -name "README*" -or \ + @cd ${WRKSRC} ; for f in `${FIND} plugins -name "README*" -or \ -name INSTALL -or -name CHANGES -or -name HISTORY`; \ do \ ${MKDIR} doc/`dirname $$f` ; \ @@ -93,26 +93,23 @@ do-build: ${MV} plugins/squirrelspell/doc/* doc/plugins/squirrelspell ; \ ${RM} -f doc/plugins/squirrelspell/index.php ; \ ${RM} -rf plugins/squirrelspell/doc + @${FIND} ${WRKSRC} -name '*.orig' -delete @${ECHO} "left_refresh=300" >> ${WRKSRC}/data/default_pref @${MV} ${WRKSRC}/config/config_local.php ${WRKSRC}/config/config_local.php.sample -pre-install: - @${ECHO} "Your umask should be lax while installing this. Like, 022 or something." - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - do-install: ${MKDIR} ${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${FILESDIR}/111.clean-squirrelmail ${PREFIX}/etc/periodic/daily ${MKDIR} ${SQUIRRELDIR} - @${CP} -pv ${WRKSRC}/index.php ${SQUIRRELDIR} - @${CP} -pv ${WRKSRC}/configure ${SQUIRRELDIR} + ${INSTALL_DATA} ${WRKSRC}/index.php ${SQUIRRELDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/configure ${SQUIRRELDIR} .for DIR in class config data functions help images include locale plugins po src themes - @${CP} -rpv ${WRKSRC}/${DIR} ${SQUIRRELDIR} + cd ${WRKSRC} && ${FIND} ${DIR} | ${CPIO} -pdmu --quiet ${SQUIRRELDIR} .endfor ${CHOWN} -R ${SMUSER}:${SMGROUP} ${SQUIRRELDIR}/data .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - @${CP} -Rv ${WRKSRC}/doc/* ${DOCSDIR} + cd ${WRKSRC}/doc && ${FIND} . | ${CPIO} -pdmu --quiet ${DOCSDIR} .endif post-install: