[pkgsrc/trunk]: pkgsrc/mk fix problem with shlib handling not being done on D...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e4e6643060d
branches:  trunk
changeset: 460153:9e4e6643060d
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Aug 23 08:09:17 2003 +0000

description:
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.

diffstat:

 mk/bsd.pkg.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 600da098d704 -r 9e4e6643060d mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Aug 23 03:57:49 2003 +0000
+++ b/mk/bsd.pkg.mk     Sat Aug 23 08:09:17 2003 +0000
@@ -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 @@
 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 @@
                                }                                       \
                                { 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 @@
                                }                                       \
                                { 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]; \