From owner-svn-ports-all@FreeBSD.ORG Sun Jun 15 03:01:18 2014 Return-Path: Delivered-To: svn-ports-all@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 ABC23130; Sun, 15 Jun 2014 03:01:18 +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 80FF72791; Sun, 15 Jun 2014 03:01:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5F31IaB051543; Sun, 15 Jun 2014 03:01:18 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5F31IXt051542; Sun, 15 Jun 2014 03:01:18 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406150301.s5F31IXt051542@svn.freebsd.org> From: Martin Wilke Date: Sun, 15 Jun 2014 03:01:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357812 - head/www/webcalendar 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 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: Sun, 15 Jun 2014 03:01:18 -0000 Author: miwi Date: Sun Jun 15 03:01:17 2014 New Revision: 357812 URL: http://svnweb.freebsd.org/changeset/ports/357812 QAT: https://qat.redports.org/buildarchive/r357812/ Log: - Stage support PR: 190998 Modified: head/www/webcalendar/Makefile Modified: head/www/webcalendar/Makefile ============================================================================== --- head/www/webcalendar/Makefile Sun Jun 15 03:00:35 2014 (r357811) +++ head/www/webcalendar/Makefile Sun Jun 15 03:01:17 2014 (r357812) @@ -32,10 +32,8 @@ OPTIONS_DEFAULT= MYSQL DB_DESC= Database backend DBASE_DESC= DBase database support -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MDOCS} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:tl} PORTDOCS= README \ WebCalendar-Database.html \ @@ -43,7 +41,6 @@ PORTDOCS= README \ WebCalendar-Styling.html \ WebCalendar-SysAdmin.html \ newwin.gif -.endif .if ${PORT_OPTIONS:MMYSQL} USE_PHP+= mysql @@ -83,17 +80,19 @@ pre-install: @${ECHO_CMD} @dirrmtry www/data >> ${PLIST} do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${WCDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${WCDIR} - @${FIND} ${PREFIX}/${WCDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 + @${MKDIR} ${STAGEDIR}${PREFIX}/${WCDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${WCDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${WCDIR} + @${FIND} ${STAGEDIR}${PREFIX}/${WCDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ ${WCDIR:S|^|%D/|}' >> ${TMPPLIST} + @${MKDIR} ${STAGEDIR}${PREFIX}/www/data \ + ${STAGEDIR}${PREFIX}/www/data-dist + @${ECHO_CMD} '@dirrmtry www/data' >> ${TMPPLIST} + @${ECHO_CMD} '@dirrmtry www/data-dist' >> ${TMPPLIST} post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include