pkg/41092: pkgtools/pkg_select SUBST_SED.path causes an incorrect substution.

[Steven Drake <sbd%users.sf.net@localhost>]

        Note: There was a bad value `mediu' for the field `Priority'.
        It was set to the default value of `medium'.

>Number:         41092
>Category:       pkg
>Synopsis:       pkgtools/pkg_select SUBST_SED.path causes an incorrect 
>substution.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Mar 29 04:20:00 +0000 2009
>Originator:     Steven Drake
>Release:        pkgsrc-2008Q4
>Organization:
>Environment:
System: Linux idran.drake.org.nz 2.6.29 #4 PREEMPT Fri Mar 27 17:12:35 NZDT 
2009 i686 pentium4 i386 GNU/Linux
Architecture: pentium4
Machine: i686
C library: GNU C Library stable release version 2.5, by Roland McGrath et al.

>Description:
In the SUBST_SED.path expressions the pattern to match '/usr/pkg' also matchs 
the begining of '/usr/pkgsrc' and causes an incorrect substution. 

ie. in the how-to-repeat examlpe it should read PKGSRCBASE=\"/usr/pkgsrc\"

>How-To-Repeat:
$ make show-vars VARNAMES="LOCALBASE PKGSRCDIR"
/usr/local
/usr/pkgsrc
$ make >/dev/null
$ grep 'PKGSRCBASE' work/pkg_select/Makefile
CFLAGS+=        -DPKGSRCBASE=\"/usr/localsrc\" -DPKGDB=\"/var/db/pkg\"

>Fix:
--- Makefile    12 Jun 2008 02:14:42 -0000      1.10
+++ Makefile    29 Mar 2009 04:13:28 -0000
@@ -27,7 +27,7 @@ SUBST_MESSAGE.path=   Adjusting path.
 SUBST_FILES.path=      Makefile pkg_select.1 ${PKGBASE}.conf.example
 SUBST_SED.path=                -e "s|/usr/pkgsrc|${PKGSRCDIR}|g"
 SUBST_SED.path+=       -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
-SUBST_SED.path+=       -e "s|/usr/pkg|${PREFIX}|g"
+SUBST_SED.path+=       -e "s|/usr/pkg/|${PREFIX}/|g"
 SUBST_SED.path+=       -e "s|/var/db/pkg|${PKG_DBDIR}|g"
 SUBST_SED.path+=       -e "s|/usr/bin/make|${MAKE}|g"