Move "package-name" back to bsd.pkg.mk, as it is needed there.

Make dependency calculation work correctly for "print-summary-data", and
thus for "readme".

3 files changed, 35 insertions, 23 deletions

diff --git a/mk/bsd.pkg.data.mk b/mk/bsd.pkg.data.mk
index 6c68a57a188..9327d64030d 100644
--- a/mk/bsd.pkg.data.mk
+++ b/mk/bsd.pkg.data.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.data.mk,v 1.1.2.1 2004/11/23 18:25:35 tv Exp $
+#	$NetBSD: bsd.pkg.data.mk,v 1.1.2.2 2004/11/23 20:39:19 tv Exp $
 #
 # bsd.pkg.mk fragments for exporting data in human-readable or machine
 # parseable formats.
@@ -10,21 +10,33 @@
 #
 # Targets:
 #
+## README.html (internal only)
+## binpkg-list
+## cdrom-readme
 ## check
+## describe
 ## fetch-list
 ## fetch-list-recursive (internal only)
 ## fetch-list-one-pkg (internal only)
 ## info
 ## lint
 ## list
+## make-readme-html-help (internal only)
+## print-build-depends-list
+## print-run-depends-list
+## print-summary-data
+## readme [readmes]
 ## show-all-depends-dirs
 ## show-depends-dirs
 ## show-distfiles
 ## show-downlevel
 ## show-installed-depends
+## show-license [show-licence]
 ## show-needs-update
 ## show-pkgsrc-dir
+## show-pkgtools-version
 ## show-root-dirs
+## show-vulnerabilities-html (internal only)
 #
 
 # show both build and run depends directories (non-recursively)
@@ -273,25 +285,6 @@ fetch-list-one-pkg:
 .  endfor
 .endif # !empty(_ALLFILES)
 
-# Set to "html" by the README.html target to generate HTML code,
-# or to "svr4" to print SVR4 (Solaris, ...) short package names, from
-# SVR4_PKGNAME variable.
-# 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>
-
-.PHONY: 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>'
-.elif (${PACKAGE_NAME_TYPE} == "svr4")
-	@${ECHO} ${SVR4_PKGNAME}
-.else
-	@${ECHO} ${PKGNAME}
-.endif # PACKAGE_NAME_TYPE
-
 .PHONY: 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}
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index bbf20a1c7f6..f7c2b7d7acd 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1540.2.5 2004/11/23 18:25:35 tv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1540.2.6 2004/11/23 20:39:19 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -3102,6 +3102,25 @@ run-depends-list:
 	fi
 .endfor
 
+# Set to "html" by the README.html target to generate HTML code,
+# or to "svr4" to print SVR4 (Solaris, ...) short package names, from
+# SVR4_PKGNAME variable.
+# 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>
+
+.PHONY: 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>'
+.elif (${PACKAGE_NAME_TYPE} == "svr4")
+	@${ECHO} ${SVR4_PKGNAME}
+.else
+	@${ECHO} ${PKGNAME}
+.endif # PACKAGE_NAME_TYPE
+
 # Build a package but don't check the package cookie
 
 .PHONY: repackage
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 9302a43e2bc..188c5ef88b2 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.177.2.3 2004/11/23 18:25:35 tv Exp $
+# $NetBSD: bsd.prefs.mk,v 1.177.2.4 2004/11/23 20:39:19 tv Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -308,7 +308,7 @@ PKG_PHASES=	fetch checksum depends extract patch
 .elif make(extract)
 PKG_PHASES=	fetch checksum depends extract
 .elif make(depends) || \
-      make(show-depends-dirs)
+      make(show-depends-dirs) || make(print-summary-data)
 PKG_PHASES=	fetch checksum depends
 .elif make(checksum)
 PKG_PHASES=	fetch checksum