[pkgsrc/trunk]: pkgsrc/mk PKGNAME and PKGPATH will never contain characters t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/89199b67e89b
branches:  trunk
changeset: 532178:89199b67e89b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Aug 13 09:45:49 2007 +0000

description:
PKGNAME and PKGPATH will never contain characters that need to be
escaped for HTML output.

diffstat:

 mk/bsd.pkg.readme.mk |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 259a0233cf89 -r 89199b67e89b mk/bsd.pkg.readme.mk
--- a/mk/bsd.pkg.readme.mk      Mon Aug 13 09:31:43 2007 +0000
+++ b/mk/bsd.pkg.readme.mk      Mon Aug 13 09:45:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.readme.mk,v 1.11 2007/08/06 19:28:17 adrianp Exp $
+# $NetBSD: bsd.pkg.readme.mk,v 1.12 2007/08/13 09:45:49 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and encapsulates the
 # code to produce README.html files in each package directory.
@@ -37,9 +37,7 @@
 # This variable is passed down via build-depends-list and run-depends-list
 PACKAGE_NAME_TYPE?=    name
 
-_HTML_PKGNAME=         ${PKGNAME:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g}
-_HTML_PKGPATH=         ${PKGPATH:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g}
-_HTML_PKGLINK=         <a href="../../${_HTML_PKGPATH}/README.html">${_HTML_PKGNAME}</a>
+_HTML_PKGLINK=         <a href="../../${PKGPATH}/README.html">${PKGNAME}</a>
 
 .PHONY: package-name
 .if !target(package-name)
@@ -56,7 +54,7 @@
 .PHONY: make-readme-html-help
 .if !target(make-readme-html-help)
 make-readme-html-help:
-       @${ECHO} '${PKGNAME:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g}</a>: <TD>'${COMMENT:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g:Q}
+       @${ECHO} '${PKGNAME}</a>: <TD>'${COMMENT:Q}
 .endif # !target(make-readme-html-help)
 
 # Show (non-recursively) all the packages this package depends on.