[pkgsrc/trunk]: pkgsrc/mk/buildlink3 A couple packages (including the new boo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc777eda7f04
branches:  trunk
changeset: 476178:cc777eda7f04
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Jun 04 19:21:23 2004 +0000

description:
A couple packages (including the new boost) use "libfoo.so" as a directory
name -- this seems to be common among Jam-using packages.  So, make sure
to do the -L -l transform only if at the end of a word.  This unfortunately
doubles the number of regexes needed to match (one with $_sep, one with $).

While here, though, the expressions for .so, .so.X, .so.X.Y, and .so.X.Y.Z
can all be collapsed into only one set with the use of \(\.[0-9]\)*, so we
actually end up with *less* regexes than before.  :)

diffstat:

 mk/buildlink3/gen-transform.sh |  20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diffs (36 lines):

diff -r 47a1b4892f54 -r cc777eda7f04 mk/buildlink3/gen-transform.sh
--- a/mk/buildlink3/gen-transform.sh    Fri Jun 04 18:34:17 2004 +0000
+++ b/mk/buildlink3/gen-transform.sh    Fri Jun 04 19:21:23 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.26 2004/03/13 03:41:13 uebayasi Exp $
+# $NetBSD: gen-transform.sh,v 1.27 2004/06/04 19:21:23 tv Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -226,16 +226,14 @@
                case "$action" in
                transform|untransform)
                        @CAT@ >> $sedfile << EOF
-s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\.[0-9]*\.[0-9]*\.[0-9]*|-L\1 -l\2|g
-s|\($2\)/lib\([^/$_sep]*\)\.so\.[0-9]*\.[0-9]*\.[0-9]*|-L\1 -l\2|g
-s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\.[0-9]*\.[0-9]*|-L\1 -l\2|g
-s|\($2\)/lib\([^/$_sep]*\)\.so\.[0-9]*\.[0-9]*|-L\1 -l\2|g
-s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\.[0-9]*|-L\1 -l\2|g
-s|\($2\)/lib\([^/$_sep]*\)\.so\.[0-9]*|-L\1 -l\2|g
-s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so|-L\1 -l\2|g
-s|\($2\)/lib\([^/$_sep]*\)\.so|-L\1 -l\2|g
-s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.dylib|-L\1 -l\2|g
-s|\($2\)/lib\([^/$_sep]*\)\.dylib|-L\1 -l\2|g
+s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\(\.[0-9]*\)*\([$_sep]\)|-L\1 -l\2\4|g
+s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\(\.[0-9]*\)*$|-L\1 -l\2|g
+s|\($2\)/lib\([^/$_sep]*\)\.so\(\.[0-9]*\)*\([$_sep]\)|-L\1 -l\2\4|g
+s|\($2\)/lib\([^/$_sep]*\)\.so\(\.[0-9]*\)*$|-L\1 -l\2|g
+s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.dylib\([$_sep]\)|-L\1 -l\2\3|g
+s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.dylib$|-L\1 -l\2|g
+s|\($2\)/lib\([^/$_sep]*\)\.dylib\([$_sep]\)|-L\1 -l\2\3|g
+s|\($2\)/lib\([^/$_sep]*\)\.dylib$|-L\1 -l\2|g
 EOF
                        ;;
                esac