From 2f6c5d032eb4e360806b95703e4db4797eae239c Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 31 May 2000 22:16:16 +0000 Subject: make auto-generated README.html for packages HTML-3.2-compliant --- mk/bsd.pkg.mk | 9 +++++---- templates/README.pkg | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 203c768c88e..29f37917074 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.447 2000/05/31 21:25:48 jwise Exp $ +# $NetBSD: bsd.pkg.mk,v 1.448 2000/05/31 22:16:16 wiz Exp $ # # This file is in the public domain. # @@ -2420,7 +2420,8 @@ binpkg-list: for pkg in ${PKGREPOSITORYSUBDIR}/${PKGNAME:C/-[^-]*$/-[0-9]*/}${PKG_SUFX} ; \ do \ if [ -f "$$pkg" ] ; then \ - ${ECHO} " ${MACHINE_ARCH}: (${OPSYS} ${OS_VERSION}) )"; \ + pkgname=`${ECHO} $$pkg | ${SED} 's@.*/@@'`; \ + ${ECHO} "${MACHINE_ARCH}:$$pkgname (${OPSYS} ${OS_VERSION})"; \ fi ; \ done ; \ ;; \ @@ -2456,7 +2457,7 @@ binpkg-list: arch=ava[1]; \ pkg=ava[2]; \ release=ava[3]; \ - print "
  • " arch ": " urls[av] " (${OPSYS} " release ")"; \ + print "" arch ":" urls[av] "(${OPSYS} " release ")"; \ } \ } ' | sort \ ;; \ @@ -2566,7 +2567,7 @@ README.html: .PRECIOUS @[ -s $@.tmp2 ] || ${ECHO} "(none)" >> $@.tmp2 @${ECHO} ${PKGNAME} | ${HTMLIFY} >> $@.tmp3 @${MAKE} binpkg-list >> $@.tmp4 - @[ -s $@.tmp4 ] || ${ECHO} "(no precompiled binaries available)" >> $@.tmp4 + @[ -s $@.tmp4 ] || ${ECHO} "(no precompiled binaries available)" >> $@.tmp4 @${SED} -e 's|%%PORT%%|'"`${MAKE} package-path | ${HTMLIFY}`"'|g' \ -e '/%%PKG%%/r $@.tmp3' \ -e '/%%PKG%%/d' \ diff --git a/templates/README.pkg b/templates/README.pkg index af5c200fe90..7b5c7f6b324 100644 --- a/templates/README.pkg +++ b/templates/README.pkg @@ -1,9 +1,10 @@ - + + The NetBSD Packages Collection: %%PORT%% - + Daemon Powerdownload the package in precompiled binary form for the following machine architectures: -