diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 9 | ||||
| -rw-r--r-- | 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} "<TR><TD> ${MACHINE_ARCH}: <TD><a href=\"${PKG_URL}/$$pkg\"> <TD>(${OPSYS} ${OS_VERSION}) </a>)"; \ + pkgname=`${ECHO} $$pkg | ${SED} 's@.*/@@'`; \ + ${ECHO} "<TR><TD>${MACHINE_ARCH}:<TD><a href=\"${PKG_URL}/$$pkg\">$$pkgname</a> (${OPSYS} ${OS_VERSION})"; \ fi ; \ done ; \ ;; \ @@ -2456,7 +2457,7 @@ binpkg-list: arch=ava[1]; \ pkg=ava[2]; \ release=ava[3]; \ - print "<TR><TD><LI> " arch ": <TD>" urls[av] " <TD>(${OPSYS} " release ")"; \ + print "<TR><TD>" arch ":<TD>" urls[av] "<TD>(${OPSYS} " release ")"; \ } \ } ' | sort \ ;; \ @@ -2566,7 +2567,7 @@ README.html: .PRECIOUS @[ -s $@.tmp2 ] || ${ECHO} "<I>(none)</I>" >> $@.tmp2 @${ECHO} ${PKGNAME} | ${HTMLIFY} >> $@.tmp3 @${MAKE} binpkg-list >> $@.tmp4 - @[ -s $@.tmp4 ] || ${ECHO} "<I>(no precompiled binaries available)</I>" >> $@.tmp4 + @[ -s $@.tmp4 ] || ${ECHO} "<TR><TD><I>(no precompiled binaries available)</I>" >> $@.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 @@ -<!-- $NetBSD: README.pkg,v 1.13 1999/12/06 23:06:45 abs Exp $ --> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<!-- $NetBSD: README.pkg,v 1.14 2000/05/31 22:16:17 wiz Exp $ --> <html> <head> <title>The NetBSD Packages Collection: %%PORT%%</title> </head> -<body bgcolor=#ffffff> +<body bgcolor="#ffffff"> <a href="http://www.mckusick.com/beastie/mainpage/copyright.html"> <img align=right src="../../templates/pkg-daemon.gif" alt="Daemon Power" @@ -52,10 +53,11 @@ This package requires the following package(s) to run: Select one of the links below to <FONT COLOR=red>download</FONT> the package in precompiled binary form for the following machine architectures: -<UL> +<TABLE> %%BIN_PKGS%% -</UL> +</TABLE> +<p> The NetBSD packages collection is designed to permit easy <a href="../../README">installation from source</a> - particularly useful if the latest binary package is |