pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/print Fix PRINT_PLIST_AWK patterns to use "${PKG_LOCAL...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6aa995e3339a
branches:  trunk
changeset: 511260:6aa995e3339a
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Apr 12 17:58:41 2006 +0000

description:
Fix PRINT_PLIST_AWK patterns to use "${PKG_LOCALTEXMFPREFIX}" instead of
its value.  Noted by reed@.

diffstat:

 print/teTeX/module.mk    |  4 +++-
 print/texmf-dirs/dirs.mk |  6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 0dcabae25481 -r 6aa995e3339a print/teTeX/module.mk
--- a/print/teTeX/module.mk     Wed Apr 12 17:49:07 2006 +0000
+++ b/print/teTeX/module.mk     Wed Apr 12 17:58:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.13 2006/04/06 06:22:37 reed Exp $
+# $NetBSD: module.mk,v 1.14 2006/04/12 17:58:41 minskim Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It takes care of rebuilding the ls-R database
@@ -31,6 +31,8 @@
 
 PRINT_PLIST_AWK+=      /^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \
                        { next; }
+PRINT_PLIST_AWK+=      /^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \
+                       { gsub(/${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, "$${PKG_LOCALTEXMFPREFIX}"); }
 
 # do not use tex.buildlink3.mk when the only accepted version is teTeX1 or teTeX2, to
 # allow bulk build to create packages
diff -r 0dcabae25481 -r 6aa995e3339a print/texmf-dirs/dirs.mk
--- a/print/texmf-dirs/dirs.mk  Wed Apr 12 17:49:07 2006 +0000
+++ b/print/texmf-dirs/dirs.mk  Wed Apr 12 17:58:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.6 2006/04/12 17:03:27 minskim Exp $
+# $NetBSD: dirs.mk,v 1.7 2006/04/12 17:58:41 minskim Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -45,8 +45,8 @@
 DEPENDS+=      texmf-dirs>=${_USE_TEXMF_DIRS}:../../print/texmf-dirs
 
 .  for dir in ${TEXMF_DIRS}
-PRINT_PLIST_AWK+=      /^@dirrm ${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\/|}\/${dir:S|/|\\/|g}$$/ \
-                               { print "@comment In texmf-dirs: " $$0; next; }
+PRINT_PLIST_AWK+=      /^@dirrm \$${PKG_LOCALTEXMFPREFIX}\/${dir:S|/|\\/|g}$$/ \
+                       { print "@comment In texmf-dirs: " $$0; next; }
 .  endfor
 .endif
 



Home | Main Index | Thread Index | Old Index