From 3e632ea583ad33c541df35c77926841a74f22903 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Sat, 23 Aug 2003 08:09:17 +0000
Subject: fix problem with shlib handling not being done on Darwin for
 devel/gettext and other pkgs installing libraries ending in eg. `x.y.z.so'
 rather than `.so.x.y.z'.

also fix off-by-one bug in shlib handling awk script causing the
first .so entry to not be commented out in the PLIST when it should
be.

ok'd by jlam.
---
 mk/bsd.pkg.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 510ad8a843c..caf63511ec3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1242 2003/08/23 03:57:49 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1243 2003/08/23 08:09:17 grant Exp $
 #
 # This file is in the public domain.
 #
@@ -2464,7 +2464,7 @@ real-su-install: ${MESSAGE}
 do-shlib-handling:
 .if ${SHLIB_HANDLING} == "YES"
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	sos=`${EGREP} -h -x '.*/lib[^/]+\.so\.[0-9]+(\.[0-9]+)+' ${PLIST} || ${TRUE}`; \
+	sos=`${EGREP} -h -x '.*/lib[^/]+\.so' ${PLIST} || ${TRUE}`; \
 	if [ "$$sos" != "" ]; then					\
 		shlib_type=`${MAKE} ${MAKEFLAGS} show-shlib-type`;	\
 		if [ "${SHLIB_PLIST_MODE}" = "0" ]; then 		\
@@ -2511,7 +2511,7 @@ do-shlib-handling:
 				}					\
 				{ lines[NR] = $$0 }			\
 				END {					\
-					for (i = 1 ; i <= linkc ; i++)	\
+					for (i = 0 ; i <= linkc ; i++)	\
 						for (j = 1 ; j < NR ; j++) \
 							if (lines[j] == links[i]) \
 								lines[j] = "@comment " lines[j]; \
@@ -2604,7 +2604,7 @@ do-shlib-handling:
 				}					\
 				{ lines[NR] = $$0 }			\
 				END {					\
-					for (i = 1 ; i <= linkc ; i++)	\
+					for (i = 0 ; i <= linkc ; i++)	\
 						for (j = 1 ; j <= NR ; j++) \
 							if (lines[j] == links[i]) \
 								lines[j] = "@comment " lines[j]; \
-- 
cgit v1.2.3