From owner-svn-ports-all@FreeBSD.ORG Thu Mar 27 13:28:59 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 C936E5B1; Thu, 27 Mar 2014 13:28:59 +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 B5AE1FE6; Thu, 27 Mar 2014 13:28:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RDSxYJ092670; Thu, 27 Mar 2014 13:28:59 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RDSxGj092668; Thu, 27 Mar 2014 13:28:59 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201403271328.s2RDSxGj092668@svn.freebsd.org> From: Pawel Pekala Date: Thu, 27 Mar 2014 13:28:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349337 - head/devel/cons-test 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, 27 Mar 2014 13:29:00 -0000 Author: pawel Date: Thu Mar 27 13:28:58 2014 New Revision: 349337 URL: http://svnweb.freebsd.org/changeset/ports/349337 QAT: https://qat.redports.org/buildarchive/r349337/ Log: - Add staging support - Remove leading article from COMMENT - Define DOCS option, switch to PORTDOCS - Remove pkg-message, it contained only copyright info which can be found inside package contents Deleted: head/devel/cons-test/pkg-message Modified: head/devel/cons-test/Makefile head/devel/cons-test/pkg-plist Modified: head/devel/cons-test/Makefile ============================================================================== --- head/devel/cons-test/Makefile Thu Mar 27 13:23:10 2014 (r349336) +++ head/devel/cons-test/Makefile Thu Mar 27 13:28:58 2014 (r349337) @@ -3,7 +3,7 @@ PORTNAME= cons-test PORTVERSION= 2.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.dsmit.com/cons/stable/ \ http://www.gnu.org/software/cons/stable/ \ @@ -12,7 +12,7 @@ MASTER_SITES= http://www.dsmit.com/cons/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A test bed for `Cons' development +COMMENT= Test bed for `Cons' development LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING @@ -27,54 +27,32 @@ PLIST_SUB= CONS_VER="${PORTVERSION}" CON DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/-test//}-${PORTVERSION}/test -MANCOMPRESSED= yes -MAN1= cons-test.1 - CONS_TEST= cons-${PORTVERSION}/test -DOCS= CHANGES COPYRIGHT README TODO Tests.txt +PORTDOCS= CHANGES COPYRIGHT README TODO Tests.txt TESTS= 1..83,101..147 TEST_LIBS= Cmd.pm Cons.pm -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e 's:/usr/lib:${PREFIX}/lib:g' \ ${WRKSRC}/cons-test do-install: -# -# Install the script -# - ${INSTALL_SCRIPT} ${WRKSRC}/cons-test \ - ${PREFIX}/bin -# -# Install the tests -# - ${MKDIR} ${PREFIX}/lib/${CONS_TEST}/t + ${INSTALL_SCRIPT} ${WRKSRC}/cons-test ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${CONS_TEST}/t ${PERL} -e 'for (${TESTS}) {$$f=sprintf "t%04d.t", $$_;\ $$x= "${INSTALL_DATA} ${WRKSRC}/t/$$f \ - ${PREFIX}/lib/${CONS_TEST}/t";\ + ${STAGEDIR}${PREFIX}/lib/${CONS_TEST}/t";\ printf "$$x\n"; system $$x;}' -# -# Install the test libraries -# - ${MKDIR} ${PREFIX}/lib/${CONS_TEST}/Test/Cmd - ${INSTALL_DATA} ${WRKSRC}/Test/Cmd.pm ${PREFIX}/lib/${CONS_TEST}/Test + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${CONS_TEST}/Test/Cmd + ${INSTALL_DATA} ${WRKSRC}/Test/Cmd.pm \ + ${STAGEDIR}${PREFIX}/lib/${CONS_TEST}/Test ${INSTALL_DATA} ${WRKSRC}/Test/Cmd/Cons.pm \ - ${PREFIX}/lib/${CONS_TEST}/Test/Cmd -# -# Install the man pages -# + ${STAGEDIR}${PREFIX}/lib/${CONS_TEST}/Test/Cmd ${INSTALL_MAN} ${WRKSRC}/cons-test.1.gz \ - ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) -# -# Install the documentation -# - ${MKDIR} ${DOCSDIR} -.for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} \ - ${DOCSDIR} -.endfor -.endif + ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Modified: head/devel/cons-test/pkg-plist ============================================================================== --- head/devel/cons-test/pkg-plist Thu Mar 27 13:23:10 2014 (r349336) +++ head/devel/cons-test/pkg-plist Thu Mar 27 13:28:58 2014 (r349337) @@ -1,10 +1,4 @@ bin/cons-test -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/Tests.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% lib/%%CONS_TEST%%/t/t0001.t lib/%%CONS_TEST%%/t/t0002.t lib/%%CONS_TEST%%/t/t0003.t @@ -137,6 +131,8 @@ lib/%%CONS_TEST%%/t/t0146.t lib/%%CONS_TEST%%/t/t0147.t lib/%%CONS_TEST%%/Test/Cmd.pm lib/%%CONS_TEST%%/Test/Cmd/Cons.pm +man/man1/cons-test.1.gz +%%PORTDOCS%%@dirrmtry share/doc/cons-%%CONS_VER%% @dirrm lib/%%CONS_TEST%%/Test/Cmd @dirrm lib/%%CONS_TEST%%/Test @dirrm lib/%%CONS_TEST%%/t