Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Sep 2014 20:55:33 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r366956 - in head/misc: susv2 susv3
Message-ID:  <201409012055.s81KtXDr059036@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 
 .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 <bsd.port.post.mk>

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 <bsd.port.pre.mk>
 
 .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 <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409012055.s81KtXDr059036>