pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk In SUBST_SED.pkglocaledir, escape the rest of the l...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3313efbddd65
branches:  trunk
changeset: 476934:3313efbddd65
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Jun 23 11:42:18 2004 +0000

description:
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 e440a529ba1e -r 3313efbddd65 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Jun 23 11:13:12 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed Jun 23 11:42:18 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1469 2004/06/23 11:13:12 cjep Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1470 2004/06/23 11:42:18 salo 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)



Home | Main Index | Thread Index | Old Index