From 6d2172ee27317a2f057dddede1c34618a11480a2 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Tue, 17 Jun 2003 14:33:17 +0000
Subject: Change uptodate-digest check from excluding digest on 'digest-* |
 pkgchk-*)' to excluding when ! -f ${DISTINFO_FILE}. Now packages without
 distinfo do not need to build digest before installing (such as cpuflags)

---
 mk/bsd.pkg.mk | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'mk/bsd.pkg.mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 86b1627a0fb..ccf96583ed7 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1199 2003/06/14 21:13:13 grant Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1200 2003/06/17 14:33:17 abs Exp $
 #
 # This file is in the public domain.
 #
@@ -557,20 +557,14 @@ DIGEST_REQD=		20010302
 
 uptodate-digest:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	if [ ! -f ${DIGEST} -o ${DIGEST_VERSION} -lt ${DIGEST_REQD} ]; then \
-		case ${PKGNAME} in					\
-		digest-* | pkgchk-*)					\
-			;;						\
-		*)							\
-			{ cd ${_PKGSRCDIR}/pkgtools/digest;		\
-			${MAKE} clean;					\
-			if [ -f ${DIGEST} ]; then			\
-				${MAKE} ${MAKEFLAGS} deinstall;		\
-			fi;						\
-			${MAKE} ${MAKEFLAGS} ${DEPENDS_TARGET};		\
-			${MAKE} ${MAKEFLAGS} clean; } 			\
-			;;						\
-		esac							\
+	if [ -f ${DISTINFO_FILE} -a \( ! -f ${DIGEST} -o ${DIGEST_VERSION} -lt ${DIGEST_REQD} \) ]; then \
+		{ cd ${_PKGSRCDIR}/pkgtools/digest;			\
+		${MAKE} clean;						\
+		if [ -f ${DIGEST} ]; then				\
+			${MAKE} ${MAKEFLAGS} deinstall;			\
+		fi;							\
+		${MAKE} ${MAKEFLAGS} ${DEPENDS_TARGET};			\
+		${MAKE} ${MAKEFLAGS} clean; } 				\
 	fi
 
 # Latest version of pkgtools required for correct pkgsrc operation.
-- 
cgit v1.2.3