[pkgsrc/trunk]: pkgsrc/mk Renamed HTML_PKGNAME to _HTML_PKGLINK, which descri...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/776e0897fe4f
branches:  trunk
changeset: 500393:776e0897fe4f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Oct 07 17:39:28 2005 +0000

description:
Renamed HTML_PKGNAME to _HTML_PKGLINK, which describes its contents more
precisely. Added _HTML_PKGNAME and _HTML_PKGPATH variables for better
readability. Fixed quoting style in print-summary-data.

diffstat:

 mk/bsd.pkg.mk |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (45 lines):

diff -r b8463efc81f8 -r 776e0897fe4f mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Oct 07 17:39:26 2005 +0000
+++ b/mk/bsd.pkg.mk     Fri Oct 07 17:39:28 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1727 2005/10/07 16:57:14 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1728 2005/10/07 17:39:28 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -3542,14 +3542,15 @@
 # This variable is passed down via build-depends-list and run-depends-list
 PACKAGE_NAME_TYPE?=    name
 
-# Nobody should want to override this unless PKGNAME is simply bogus.
-HTML_PKGNAME=<a href="../../${PKGPATH:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g}/README.html">${PKGNAME:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g}</A>
+_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>
 
 .PHONY: package-name
 .if !target(package-name)
 package-name:
 .  if (${PACKAGE_NAME_TYPE} == "html")
-       @${ECHO} '<a href="../../${PKGPATH:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g}/README.html">${PKGNAME:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g}</A>'
+       @${ECHO} ${_HTML_PKGLINK:Q}
 .  elif (${PACKAGE_NAME_TYPE} == "svr4")
        @${ECHO} ${SVR4_PKGNAME}
 .  else
@@ -3918,11 +3919,11 @@
 .PHONY: print-summary-data
 .if !target(print-summary-data)
 print-summary-data:
-       @${ECHO} "depends ${PKGPATH} ${DEPENDS}"
-       @${ECHO} "build_depends ${PKGPATH} ${BUILD_DEPENDS}"
-       @${ECHO} "conflicts ${PKGPATH} ${CONFLICTS}"
-       @${ECHO} "index ${PKGPATH} ${PKGNAME}"
-       @${ECHO} htmlname ${PKGPATH} ${HTML_PKGNAME:Q}
+       @${ECHO} depends ${PKGPATH} ${DEPENDS:Q}
+       @${ECHO} build_depends ${PKGPATH} ${BUILD_DEPENDS:Q}
+       @${ECHO} conflicts ${PKGPATH} ${CONFLICTS:Q}
+       @${ECHO} index ${PKGPATH} ${PKGNAME:Q}
+       @${ECHO} htmlname ${PKGPATH} ${_HTML_PKGLINK:Q}
        @${ECHO} homepage ${PKGPATH} ${HOMEPAGE:Q}
        @${ECHO} wildcard ${PKGPATH} ${PKGWILDCARD:Q}
        @${ECHO} comment ${PKGPATH} ${COMMENT:Q}