From owner-svn-ports-head@FreeBSD.ORG Mon Sep 1 20:55:34 2014 Return-Path: Delivered-To: svn-ports-head@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 75410C50; Mon, 1 Sep 2014 20:55:34 +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 472D4104D; Mon, 1 Sep 2014 20:55:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s81KtY0v059038; Mon, 1 Sep 2014 20:55:34 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s81KtXDr059036; Mon, 1 Sep 2014 20:55:33 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201409012055.s81KtXDr059036@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 1 Sep 2014 20:55:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366956 - in head/misc: susv2 susv3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2014 20:55:34 -0000 Author: mandree Date: Mon Sep 1 20:55:33 2014 New Revision: 366956 URL: http://svnweb.freebsd.org/changeset/ports/366956 QAT: https://qat.redports.org/buildarchive/r366956/ Log: STAGE and simplify do-install. Modified: head/misc/susv2/Makefile head/misc/susv3/Makefile Modified: head/misc/susv2/Makefile ============================================================================== --- head/misc/susv2/Makefile Mon Sep 1 20:51:09 2014 (r366955) +++ head/misc/susv2/Makefile Mon Sep 1 20:55:33 2014 (r366956) @@ -12,11 +12,10 @@ COMMENT= Single UNIX Specification Versi RESTRICTED= Redistribution of the documents is not permitted -USES= tar:bzip2 +USES= tar:bzip2 NO_BUILD= yes PORTDOCS= * -NO_STAGE= yes .include .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) @@ -24,13 +23,7 @@ IGNORE= may not be redistributed becaus .endif do-install: - @${MKDIR} ${DOCSDIR} - @${FIND} ${WRKSRC} | ${SED} -e 's#^${WRKSRC}##' | while read file; do \ - if ${TEST} -d "${WRKSRC}$$file"; then \ - ${MKDIR} "${DOCSDIR}$$file"; \ - else \ - ${INSTALL_DATA} "${WRKSRC}$$file" "${DOCSDIR}$$file"; \ - fi; \ - done + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DOCSDIR} .include Modified: head/misc/susv3/Makefile ============================================================================== --- head/misc/susv3/Makefile Mon Sep 1 20:51:09 2014 (r366955) +++ head/misc/susv3/Makefile Mon Sep 1 20:55:33 2014 (r366956) @@ -12,11 +12,10 @@ COMMENT= Single UNIX Specification Versi RESTRICTED= Redistribution of the documents is not permitted -USES= tar:bzip2 +USES= tar:bzip2 NO_BUILD= yes PORTDOCS= * -NO_STAGE= yes .include .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) @@ -24,18 +23,7 @@ IGNORE= may not be redistributed becaus .endif do-install: - @${MKDIR} ${DOCSDIR} - @${FIND} ${WRKSRC} | ${SED} -e 's#^${WRKSRC}##' | while read file; do \ - if ${TEST} -d "${WRKSRC}$$file"; then \ - ${MKDIR} "${DOCSDIR}$$file"; \ - else \ - if ${TEST} -L "${WRKSRC}$$file"; then \ - ${LN} -s "`${LS} -l \"${WRKSRC}$$file\" | ${SED} -e 's/^.*> //'`" \ - "${DOCSDIR}$$file"; \ - else \ - ${INSTALL_DATA} "${WRKSRC}$$file" "${DOCSDIR}$$file"; \ - fi; \ - fi; \ - done + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} .include