[pkgsrc/pkgsrc-2004Q2]: pkgsrc/mk Pullup ticket 40 to the pkgsrc-2004Q2 branc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a705b322c2d1
branches:  pkgsrc-2004Q2
changeset: 476701:a705b322c2d1
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Jul 06 22:15:54 2004 +0000

description:
Pullup ticket 40 to the pkgsrc-2004Q2 branch, requested by Grant Beattie.

        Module Name:    pkgsrc
        Committed By:   salo
        Date:           Wed Jun 23 11:42:18 UTC 2004

        Modified Files:
                pkgsrc/mk: bsd.pkg.mk

        Log Message:
        In SUBST_SED.pkglocaledir, escape the rest of the line in the pattern.
        Saves trailing \ properly.

        Addresses PR pkg/26022 by Akio OBATA.

diffstat:

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

diffs (18 lines):

diff -r 7dc274819967 -r a705b322c2d1 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Jul 06 22:12:21 2004 +0000
+++ b/mk/bsd.pkg.mk     Tue Jul 06 22:15:54 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1468.2.1 2004/07/06 22:11:59 agc Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1468.2.2 2004/07/06 22:15:54 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -2123,7 +2123,7 @@
 SUBST_SED.pkglocaledir=                \
        -e 's|^\(localedir[     :]*=\).*|\1 ${_PKGLOCALEDIR}|'          \
        -e 's|^\(gnulocaledir[  :]*=\).*|\1 ${_PKGLOCALEDIR}|'          \
-       -e 's|\(-DLOCALEDIR[    ]*=\)[^         ]*\(.*\)|\1"\\"${_PKGLOCALEDIR}\\""\2|'
+       -e 's|\(-DLOCALEDIR[    ]*=\)[^         ]*\(\.\*\)|\1"\\"${_PKGLOCALEDIR}\\""\2|'
 .endif
 
 .if defined(REPLACE_PERL)