From owner-svn-ports-all@FreeBSD.ORG Sat Dec 13 13:08:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2DF562D; Sat, 13 Dec 2014 13:08:54 +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 D3AAA78B; Sat, 13 Dec 2014 13:08:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBDD8saf058470; Sat, 13 Dec 2014 13:08:54 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBDD8sWX058468; Sat, 13 Dec 2014 13:08:54 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201412131308.sBDD8sWX058468@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sat, 13 Dec 2014 13:08:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374655 - head/www/rt42 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.18-1 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: Sat, 13 Dec 2014 13:08:55 -0000 Author: matthew Date: Sat Dec 13 13:08:53 2014 New Revision: 374655 URL: https://svnweb.freebsd.org/changeset/ports/374655 QAT: https://qat.redports.org/buildarchive/r374655/ Log: Make the port 'poudriere testport' clean - Remove ${STAGEDIR}/usr/local/www/rt42 which is unused - Add ${DATADIR}/{etc,lib,plugins} as empty directories: these are used by RT extensions. - Use @dir() to manage directories created under /var. This will prevent the unconditional removal and replacement of the cache directories during updates, which results in those directories ending up with the wrong ownership. PR: 195871 Submitted by: me@nileshgr.com Modified: head/www/rt42/Makefile head/www/rt42/pkg-plist Modified: head/www/rt42/Makefile ============================================================================== --- head/www/rt42/Makefile Sat Dec 13 12:08:11 2014 (r374654) +++ head/www/rt42/Makefile Sat Dec 13 13:08:53 2014 (r374655) @@ -2,7 +2,7 @@ PORTNAME= rt DISTVERSION= 4.2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ PKGNAMESUFFIX= 42 @@ -198,6 +198,7 @@ pre-install: @${RM} -f ${WRKSRC}/lib/RT.pm.in post-install: + @${RM} -rf ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX} ${MKDIR} ${STAGEDIR}${DOCSDIR}/upgrade (cd ${WRKSRC}/etc && \ ${COPYTREE_SHARE} upgrade ${STAGEDIR}${DOCSDIR} "! -name *\.in") Modified: head/www/rt42/pkg-plist ============================================================================== --- head/www/rt42/pkg-plist Sat Dec 13 12:08:11 2014 (r374654) +++ head/www/rt42/pkg-plist Sat Dec 13 13:08:53 2014 (r374655) @@ -492,6 +492,7 @@ sbin/standalone_httpd %%PORTDOCS%%%%DOCSDIR%%/upgrade/vulnerable-passwords %%PORTDOCS%%%%DOCSDIR%%/web_deployment.pod %%PORTDOCS%%%%DOCSDIR%%/writing_extensions.pod +@dir %%DATADIR%%/etc %%DATADIR%%/fonts/Droid.README %%DATADIR%%/fonts/DroidSans.ttf %%DATADIR%%/fonts/DroidSansFallback.ttf @@ -1055,6 +1056,8 @@ sbin/standalone_httpd %%DATADIR%%/html/m/ticket/select_create_queue %%DATADIR%%/html/m/ticket/show %%DATADIR%%/html/m/tickets/search +@dir %%DATADIR%%/lib +@dir %%DATADIR%%/plugins %%DATADIR%%/po/ar.po %%DATADIR%%/po/bg.po %%DATADIR%%/po/ca.po @@ -1500,9 +1503,9 @@ sbin/standalone_httpd %%DATADIR%%/static/js/supersubs.js %%DATADIR%%/static/js/titlebox-state.js %%DATADIR%%/static/js/util.js -@unexec rmdir "/var/run/rt42/mason_data/cache" >/dev/null 2>&1 || : -@unexec rmdir "/var/run/rt42/mason_data/etc" >/dev/null 2>&1 || : -@unexec rmdir "/var/run/rt42/mason_data/obj" >/dev/null 2>&1 || : -@unexec rmdir "/var/run/rt42/mason_data" >/dev/null 2>&1 || : -@unexec rmdir "/var/run/rt42/session_data" >/dev/null 2>&1 || : -@unexec rmdir "/var/run/rt42" >/dev/null 2>&1 || : +@dir(www,www,755) /var/run/rt42/mason_data/cache +@dir(www,www,755) /var/run/rt42/mason_data/etc +@dir(www,www,755) /var/run/rt42/mason_data/obj +@dir(www,www,755) /var/run/rt42/mason_data +@dir(www,www,755) /var/run/rt42/session_data +@dir /var/run/rt42