From owner-svn-ports-all@FreeBSD.ORG Sat May 24 18:17:11 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 76E2CAAA; Sat, 24 May 2014 18:17:11 +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 63268208A; Sat, 24 May 2014 18:17:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OIHB7x030832; Sat, 24 May 2014 18:17:11 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OIHA7Y030824; Sat, 24 May 2014 18:17:10 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201405241817.s4OIHA7Y030824@svn.freebsd.org> From: Olli Hauer Date: Sat, 24 May 2014 18:17:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355070 - in head/www: amphetadesk css-mode.el 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: Sat, 24 May 2014 18:17:11 -0000 Author: ohauer Date: Sat May 24 18:17:10 2014 New Revision: 355070 URL: http://svnweb.freebsd.org/changeset/ports/355070 QAT: https://qat.redports.org/buildarchive/r355070/ Log: - add stage support Modified: head/www/amphetadesk/Makefile head/www/amphetadesk/pkg-plist head/www/css-mode.el/Makefile head/www/css-mode.el/pkg-plist Modified: head/www/amphetadesk/Makefile ============================================================================== --- head/www/amphetadesk/Makefile Sat May 24 18:10:10 2014 (r355069) +++ head/www/amphetadesk/Makefile Sat May 24 18:17:10 2014 (r355070) @@ -25,7 +25,8 @@ LICENSE_NAME= The Clarified Artistic Lic LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE= ${WRKSRC}/docs/LICENSE -USE= perl5 +USES= perl5 +USE_PERL5= run USE_RC_SUBR= ${PORTNAME} NO_BUILD= yes @@ -35,12 +36,8 @@ NO_BUILD= yes SUB_LIST+= PERL="${PERL}" .endif -.ifndef(NOPORTDOCS) -PORTDOCS= \ - * -.endif +PORTDOCS= * -NO_STAGE= yes .include post-patch: @@ -71,49 +68,47 @@ post-configure: do-install: ## create site_perl # dirs - @${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk - @cd ${WRKSRC}/lib && \ + @${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${STAGEDIR}${PREFIX}|}/AmphetaDesk + @(cd ${WRKSRC}/lib && \ ${FIND} * -type d ! -empty -print0 | \ ${XARGS} -0 -x -n 10 -I {} \ - ${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{} + ${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${STAGEDIR}${PREFIX}|}/AmphetaDesk/{}) # files - @cd ${WRKSRC}/lib && \ + (cd ${WRKSRC}/lib && \ ${FIND} * -type f -name "*pm" -print0 | \ ${XARGS} -0 -x -n 10 -I {} \ - ${INSTALL_DATA} {} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{} + ${INSTALL_DATA} {} ${SITE_PERL:S|${LOCALBASE}|${STAGEDIR}${PREFIX}|}/AmphetaDesk/{}) # script - @${INSTALL_DATA} ${WRKSRC}/AmphetaDesk.pl \ - ${PREFIX}/bin/AmphetaDesk-real - @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \ - ${PREFIX}/bin/AmphetaDesk + ${INSTALL_DATA} ${WRKSRC}/AmphetaDesk.pl \ + ${STAGEDIR}${PREFIX}/bin/AmphetaDesk-real + ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \ + ${STAGEDIR}${PREFIX}/bin/AmphetaDesk ## docs -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for ext in html txt xml - @${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${STAGEDIR}${DOCSDIR} .endfor - @${MKDIR} ${DOCSDIR}/images + @${MKDIR} ${STAGEDIR}${DOCSDIR}/images .for ext in gif jpg - @${INSTALL_DATA} ${WRKSRC}/docs/images/*.${ext} \ - ${DOCSDIR}/images + ${INSTALL_DATA} ${WRKSRC}/docs/images/*.${ext} \ + ${STAGEDIR}${DOCSDIR}/images .endfor -.endif ## lists - @${MKDIR} ${DATADIR}/lists - @${INSTALL_DATA} ${WRKSRC}/data/lists/services-channels-recent.xml \ - ${DATADIR}/lists + @${MKDIR} ${STAGEDIR}${DATADIR}/lists + ${INSTALL_DATA} ${WRKSRC}/data/lists/services-channels-recent.xml \ + ${STAGEDIR}${DATADIR}/lists ## templates # dirs - @cd ${WRKSRC} && \ + (cd ${WRKSRC} && \ ${FIND} templates -type d ! -empty -print0 | \ ${XARGS} -0 -x -n 10 -I {} \ - ${MKDIR} ${DATADIR}/{} + ${MKDIR} ${STAGEDIR}${DATADIR}/{}) # files .for ext in gif html ico png pict - @cd ${WRKSRC} && \ + (cd ${WRKSRC} && \ ${FIND} templates -type f -name "*.${ext}" -print0 | \ ${XARGS} -0 -x -n 10 -I {} \ - ${INSTALL_DATA} {} ${DATADIR}/{} + ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{}) .endfor .include Modified: head/www/amphetadesk/pkg-plist ============================================================================== --- head/www/amphetadesk/pkg-plist Sat May 24 18:10:10 2014 (r355069) +++ head/www/amphetadesk/pkg-plist Sat May 24 18:17:10 2014 (r355070) @@ -39,18 +39,15 @@ bin/AmphetaDesk-real %%DATADIR%%/templates/default/popup.html %%DATADIR%%/templates/default/tpl_footer.html %%DATADIR%%/templates/default/tpl_header.html -@dirrm %%DATADIR%%/templates/default/images +@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS +@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk +@dirrm %%SITE_PERL%%/AmphetaDesk/Text/Template +@dirrm %%SITE_PERL%%/AmphetaDesk/Text +@dirrm %%SITE_PERL%%/AmphetaDesk/XML +@dirrm %%SITE_PERL%%/AmphetaDesk +@dirrm %%DATADIR%%/lists @dirrm %%DATADIR%%/templates/default/gui +@dirrm %%DATADIR%%/templates/default/images @dirrm %%DATADIR%%/templates/default @dirrm %%DATADIR%%/templates -@dirrm %%DATADIR%%/lists @dirrm %%DATADIR%% -@dirrm %%SITE_PERL%%/AmphetaDesk/XML -@dirrm %%SITE_PERL%%/AmphetaDesk/Text/Template -@dirrm %%SITE_PERL%%/AmphetaDesk/Text -@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS -@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk -@dirrm %%SITE_PERL%%/AmphetaDesk -@dirrmtry %%SITE_PERL%% -@dirrmtry lib/perl5/site_perl -@dirrmtry lib/perl5 Modified: head/www/css-mode.el/Makefile ============================================================================== --- head/www/css-mode.el/Makefile Sat May 24 18:10:10 2014 (r355069) +++ head/www/css-mode.el/Makefile Sat May 24 18:17:10 2014 (r355070) @@ -28,18 +28,15 @@ DOCSDIR= ${PREFIX}/share/doc/css-mode PLIST_SUB= ELISP_SUBDIR=${ELISP_SUBDIR} XELISP_SUBDIR=${XELISP_SUBDIR} -NO_STAGE= yes do-install: - @${MKDIR} ${PREFIX}/${ELISP_SUBDIR} - ${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${PREFIX}/${ELISP_SUBDIR}/ + @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISP_SUBDIR} + ${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${ELISP_SUBDIR} # For XEmacs - @${MKDIR} ${PREFIX}/${XELISP_SUBDIR} - ${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${PREFIX}/${XELISP_SUBDIR}/ + @${MKDIR} ${STAGEDIR}${PREFIX}/${XELISP_SUBDIR} + ${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${XELISP_SUBDIR} post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${_DISTDIR}/doco.html ${DOCSDIR}/css-mode-doc.html -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${_DISTDIR}/doco.html ${STAGEDIR}${DOCSDIR}/css-mode-doc.html .include Modified: head/www/css-mode.el/pkg-plist ============================================================================== --- head/www/css-mode.el/pkg-plist Sat May 24 18:10:10 2014 (r355069) +++ head/www/css-mode.el/pkg-plist Sat May 24 18:17:10 2014 (r355070) @@ -1,6 +1,6 @@ -%%ELISP_SUBDIR%%/css-mode.el %%XELISP_SUBDIR%%/css-mode.el %%PORTDOCS%%%%DOCSDIR%%/css-mode-doc.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry lib/xemacs/site-lisp +%%ELISP_SUBDIR%%/css-mode.el +@dirrmtry %%XELISP_SUBDIR%% @dirrmtry lib/xemacs +%%PORTDOCS%%@dirrm %%DOCSDIR%%