From 14ae2a51128ffea8b99395474505c6d7591e8b15 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Tue, 19 Oct 1999 12:04:45 +0000
Subject: Be a bit more efficient when calculating whether patch-sum files have
 changed, and avoid extraneous gibberish at the end of a cmp(1) command, so
 that patch-sum creation works on Solaris.

---
 mk/bsd.pkg.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 4f824d4b9bb..f18823bf7b9 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.355 1999/10/14 05:31:22 fredb Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.356 1999/10/19 12:04:45 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -1825,6 +1825,7 @@ makepatchsum:
 		${ECHO} "$$" >> ${PATCH_SUM_FILE}.new;			\
 	fi;								\
 	${ECHO} "" >> ${PATCH_SUM_FILE}.new;				\
+	havepatches=0;							\
 	if [ -d ${PATCHDIR} ]; then					\
 		cd ${PATCHDIR};						\
 		for sumfile in "" patch-*; do				\
@@ -1833,11 +1834,12 @@ makepatchsum:
 			case $$sumfile in				\
 				patch-local-*) ;;			\
 				*.orig) continue ;;			\
-				*) ${ECHO} "MD5 ($$sumfile) = `${SED} -e '/\$$NetBSD.*/d' $$sumfile | ${MD5}`" >> ${PATCH_SUM_FILE}.new; \
+				*)	${ECHO} "MD5 ($$sumfile) = `${SED} -e '/\$$NetBSD.*/d' $$sumfile | ${MD5}`" >> ${PATCH_SUM_FILE}.new; \
+					havepatches=1 ;;		\
 			esac;						\
 		done;							\
 	fi;								\
-	if [ "`${AWK} -- '{nlines++} END {print nlines}' < ${PATCH_SUM_FILE}.new`" = "2" ]; then \
+	if [ $$havepatches = 0 ]; then					\
 		if [ -f "${PATCH_SUM_FILE}" ]; then			\
 			${ECHO} "This placeholder file is generated by the \`\`makepatchsum'' target" >> ${PATCH_SUM_FILE}.new; \
 			${ECHO} "whenever the patches directory is empty or missing. Its purpose" >> ${PATCH_SUM_FILE}.new; \
@@ -1850,9 +1852,9 @@ makepatchsum:
 			exit 0;						\
 		fi;							\
 	fi;								\
-	if cmp -s ${PATCH_SUM_FILE}.new ${PATCH_SUM_FILE} ""; then	\
+	if cmp -s ${PATCH_SUM_FILE}.new ${PATCH_SUM_FILE}; then		\
 		${RM} -f ${PATCH_SUM_FILE}.new;				\
-		${ECHO_MSG} ">> patch-sum file unchanged!";		\
+		${ECHO_MSG} ">> patch-sum file unchanged";		\
 	else								\
 		${MV} ${PATCH_SUM_FILE}.new ${PATCH_SUM_FILE};		\
 	fi)
-- 
cgit v1.2.3