From owner-freebsd-ports  Sun Apr 27 06:17:44 1997
Return-Path: <owner-ports>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id GAA11189
          for ports-outgoing; Sun, 27 Apr 1997 06:17:44 -0700 (PDT)
Received: from bsd.fs.bauing.th-darmstadt.de (bsd.fs.bauing.th-darmstadt.de [130.83.63.241])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id GAA11184
          for <ports@freebsd.org>; Sun, 27 Apr 1997 06:17:42 -0700 (PDT)
Received: from campa.panke.de (anonymous221.ppp.cs.tu-berlin.de [130.149.17.221])
	by bsd.fs.bauing.th-darmstadt.de (8.8.5/8.8.5) with ESMTP id PAA24441
	for <ports@freebsd.org>; Sun, 27 Apr 1997 15:17:38 +0200 (MET DST)
Received: (from wosch@localhost) by campa.panke.de (8.8.5/8.6.12) id OAA05490; Sun, 27 Apr 1997 14:23:23 +0200 (MET DST)
Date: Sun, 27 Apr 1997 14:23:23 +0200 (MET DST)
Message-Id: <199704271223.OAA05490@campa.panke.de>
From: Wolfram Schneider <wosch@apfel.de>
To: ports@freebsd.org
Subject: `make describe' improvement
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
Sender: owner-ports@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk


The following patch makes `make describe' three times faster.

Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.256
diff -u -r1.256 bsd.port.mk
--- bsd.port.mk	1997/04/21 00:24:51	1.256
+++ bsd.port.mk	1997/04/27 10:39:45
@@ -1545,23 +1545,29 @@
 #
 .if !target(describe)
 describe:
-	@${ECHO} -n "${PKGNAME}|${.CURDIR}|"
-	@${ECHO} -n "${PREFIX}|"
-	@if [ -f ${COMMENT} ]; then \
+	@${ECHO} -n "${PKGNAME}|${.CURDIR}|"; \
+	${ECHO} -n "${PREFIX}|"; \
+	if [ -f ${COMMENT} ]; then \
 		${ECHO} -n "`${CAT} ${COMMENT}`"; \
 	else \
 		${ECHO} -n "** No Description"; \
-	fi
-	@if [ -f ${DESCR} ]; then \
+	fi; \
+	if [ -f ${DESCR} ]; then \
 		${ECHO} -n "|${DESCR}"; \
 	else \
 		${ECHO} -n "|/dev/null"; \
-	fi
-	@${ECHO} -n "|${MAINTAINER}|${CATEGORIES}|"
-	@cd ${.CURDIR} && ${ECHO} -n `make depends-list|sort -u`
-	@${ECHO} -n "|"
-	@cd ${.CURDIR} && ${ECHO} -n `make package-depends|sort -u`
-	@${ECHO} ""
+	fi; \
+	${ECHO} -n "|${MAINTAINER}|${CATEGORIES}|"; \
+	case "A${FETCH_DEPENDS}B${BUILD_DEPENDS}C${LIB_DEPENDS}D${DEPENDS}E" in \
+		ABCDE) ;; \
+		*) cd ${.CURDIR} && ${ECHO} -n `make depends-list|sort -u`;; \
+	esac; \
+	${ECHO} -n "|"; \
+	case "A${RUN_DEPENDS}B${LIB_DEPENDS}C${DEPENDS}D" in \
+		ABCD) ;; \
+		*) cd ${.CURDIR} && ${ECHO} -n `make package-depends|sort -u`;; \
+	esac; \
+	${ECHO} ""
 .endif
 
 .if !target(readmes)