From owner-svn-ports-all@FreeBSD.ORG Thu Jan 16 23:34:37 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 37497813; Thu, 16 Jan 2014 23:34:37 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 22B5F14E7; Thu, 16 Jan 2014 23:34:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GNYbES058005; Thu, 16 Jan 2014 23:34:37 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GNYaWj058004; Thu, 16 Jan 2014 23:34:36 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401162334.s0GNYaWj058004@svn.freebsd.org> From: Rusmir Dusko Date: Thu, 16 Jan 2014 23:34:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339998 - head/graphics/cadubi 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, 16 Jan 2014 23:34:37 -0000 Author: nemysis Date: Thu Jan 16 23:34:36 2014 New Revision: 339998 URL: http://svnweb.freebsd.org/changeset/ports/339998 QAT: https://qat.redports.org/buildarchive/r339998/ Log: - Change PLIST_FILES, add PLIST_DIRS, remove PORTDATA - Support STAGEDIR - Add DOCS Option - Change REINPLACE_CMD, adjust to use ${PERL} and ${DATADIR} Modified: head/graphics/cadubi/Makefile Modified: head/graphics/cadubi/Makefile ============================================================================== --- head/graphics/cadubi/Makefile Thu Jan 16 23:30:59 2014 (r339997) +++ head/graphics/cadubi/Makefile Thu Jan 16 23:34:36 2014 (r339998) @@ -17,29 +17,30 @@ RUN_DEPENDS= p5-Term-ReadKey>=0:${PORTSD USES= perl5 NO_BUILD= yes -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} \ + %%DATADIR%%/help.txt \ + %%DATADIR%%/logo.txt +PLIST_DIRS= %%DATADIR%% -PORTDATA= * PORTDOCS= * -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS do-configure: - @${REINPLACE_CMD} -i '' -e 's|Bin/help|Bin/../share/cadubi/help|' \ + @${REINPLACE_CMD} -e \ + 's|/usr/local/stow/perl-5.8.x/bin/perl|${PERL}|; \ + s|$$Bin/help|${DATADIR}/help|' \ ${WRKSRC}/cadubi do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${MKDIR} ${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + @${MKDIR} ${STAGEDIR}${DATADIR} .for d in help.txt logo.txt - @(cd ${WRKSRC} && ${INSTALL_DATA} ${d} ${DATADIR}) + @(cd ${WRKSRC} && ${INSTALL_DATA} ${d} ${STAGEDIR}${DATADIR}) .endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/extras/ansi_term_codes.txt ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/extras/ansi_term_codes.txt ${STAGEDIR}${DOCSDIR} .include