From b3dec5f5445ff427ef56c21dc156f9a7f8545f26 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 29 Oct 2001 19:21:18 +0000
Subject: On Solaris 7, when `find dir -name foo -name bar' in invoked,  only
 an implicit `-print' action is performed on bar and not on foo.  Surround the
 search pattern in \( ... \) and add an explict -print so that all of the
 results of the find are printed.

Problem noted and patch to fix this received in private email from Stoned
Elipot <seb@netbsd.org>.
---
 mk/bsd.buildlink.mk | 18 +++++++++---------
 mk/bsd.pkg.mk       |  7 ++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk
index 2a46c442927..680931e6c16 100644
--- a/mk/bsd.buildlink.mk
+++ b/mk/bsd.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink.mk,v 1.47 2001/10/25 16:45:03 jlam Exp $
+# $NetBSD: bsd.buildlink.mk,v 1.48 2001/10/29 19:21:19 jlam Exp $
 #
 # This Makefile fragment is included by package buildlink.mk files.  This
 # file does the following things:
@@ -244,15 +244,15 @@ MAKEFILE_PATTERNS+=	*.mk
 .if (${OBJECT_FMT} == "a.out") || defined(BUILDLINK_AOUT_DEBUG)
 REPLACE_LIBNAME_PATTERNS+=	${MAKEFILE_PATTERNS}
 _REPLACE_LIBNAME_PATTERNS_FIND=	\
-	${REPLACE_LIBNAME_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1}
+	\( ${REPLACE_LIBNAME_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \)
 _REPLACE_LIBNAME_CONFIGURE_PATTERNS_FIND=	\
-	-name "${CONFIGURE_SCRIPT:T}"
+	\( -name "${CONFIGURE_SCRIPT:T}" \)
 
 REPLACE_LIBNAMES_CONFIGURE+=	\
-	`cd ${WRKSRC}; ${FIND} . ${_REPLACE_LIBNAME_CONFIGURE_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}`
+	`cd ${WRKSRC}; ${FIND} . ${_REPLACE_LIBNAME_CONFIGURE_PATTERNS_FIND} -print | ${SED} -e 's|^\./||' | ${SORT}`
 
 REPLACE_LIBNAMES+=	\
-	`cd ${WRKSRC}; ${FIND} . ${_REPLACE_LIBNAME_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}`
+	`cd ${WRKSRC}; ${FIND} . ${_REPLACE_LIBNAME_PATTERNS_FIND} -print | ${SED} -e 's|^\./||' | ${SORT}`
 
 .if defined(HAS_CONFIGURE) || defined(GNU_CONFIGURE)
 _CONFIGURE_PREREQ+=	replace-libnames-configure
@@ -287,10 +287,10 @@ replace-libnames-makefiles:
 
 REPLACE_RPATH_PATTERNS+=	${MAKEFILE_PATTERNS}
 _REPLACE_RPATH_PATTERNS_FIND=	\
-	${REPLACE_RPATH_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1}
+	\( ${REPLACE_RPATH_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \)
 
 REPLACE_RPATH+=	\
-	`cd ${WRKSRC}; ${FIND} . ${_REPLACE_RPATH_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}`
+	`cd ${WRKSRC}; ${FIND} . ${_REPLACE_RPATH_PATTERNS_FIND} -print | ${SED} -e 's|^\./||' | ${SORT}`
 
 REPLACE_RPATH_SED+=	\
 	-e "s|-R[ 	]*${BUILDLINK_DIR}/|-R${LOCALBASE}/|g"
@@ -326,10 +326,10 @@ REPLACE_BUILDLINK_PATTERNS+=	*-config
 REPLACE_BUILDLINK_PATTERNS+=	*Conf.sh
 REPLACE_BUILDLINK_PATTERNS+=	*.pc
 _REPLACE_BUILDLINK_PATTERNS_FIND=	\
-	${REPLACE_BUILDLINK_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1}
+	\( ${REPLACE_BUILDLINK_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \)
 
 REPLACE_BUILDLINK+=	\
-	`cd ${WRKSRC}; ${FIND} . ${_REPLACE_BUILDLINK_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}`
+	`cd ${WRKSRC}; ${FIND} . ${_REPLACE_BUILDLINK_PATTERNS_FIND} -print | ${SED} -e 's|^\./||' | ${SORT}`
 
 .if defined(REPLACE_BUILDLINK)
 post-build: replace-buildlink
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 5429164a66d..3b2661b9f1d 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.837 2001/10/29 15:10:14 skrll Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.838 2001/10/29 19:21:18 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1525,14 +1525,15 @@ AUTOMAKE_PATTERNS+=	*.m4
 AUTOMAKE_PATTERNS+=	*.in
 AUTOMAKE_PATTERNS+=	configure
 _AUTOMAKE_PATTERNS_FIND=	\
-	${AUTOMAKE_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1}
+	\( ${AUTOMAKE_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \)
 
 _CONFIGURE_PREREQ+=	suppress-automake
 suppress-automake:
 .  if defined(HAS_CONFIGURE)
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	cd ${WRKSRC};							\
-	${FIND} . ${_AUTOMAKE_PATTERNS_FIND} | ${XARGS} ${TOUCH} ${TOUCH_ARGS}
+	${FIND} . ${_AUTOMAKE_PATTERNS_FIND} -print |			\
+		${XARGS} ${TOUCH} ${TOUCH_ARGS}
 .  else
 	${_PKG_SILENT}${_PKG_DEBUG}${TRUE}
 .  endif
-- 
cgit v1.2.3