Added mk/misc/category.mk, which contains the definitions that are only

useful for category Makefiles, as opposed to bsd.pkg.subdir.mk, which is
also relevant for the top-level directory. Adjusted the category Makefiles.

45 files changed, 132 insertions, 127 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index 5f7cef761ca..74893b04597 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2007/04/14 07:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2007/08/13 08:12:41 rillig Exp $
 #
 
 COMMENT=	Archivers
@@ -88,4 +88,4 @@ SUBDIR+=	zip1
 SUBDIR+=	zoo
 SUBDIR+=	zziplib
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/audio/Makefile b/audio/Makefile
index 3b024aeedf3..fe9bb420b44 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.360 2007/07/17 19:25:56 drochner Exp $
+# $NetBSD: Makefile,v 1.361 2007/08/13 08:12:42 rillig Exp $
 #
 
 COMMENT=	Audio tools
@@ -366,4 +366,4 @@ SUBDIR+=	xmradio
 SUBDIR+=	xsidplay
 SUBDIR+=	xwave
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 8c9565325b5..a62bd95751f 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/03/05 16:01:58 rmind Exp $
+# $NetBSD: Makefile,v 1.42 2007/08/13 08:12:42 rillig Exp $
 #
 
 COMMENT=	Benchmarking tools
@@ -42,4 +42,4 @@ SUBDIR+=	whetstone
 SUBDIR+=	xengine
 SUBDIR+=	zelibm
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/biology/Makefile b/biology/Makefile
index fd66b2c92d9..f45af71719c 100644
--- a/biology/Makefile
+++ b/biology/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/08/12 03:21:06 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/08/13 08:12:42 rillig Exp $
 #
 
 COMMENT=	Software for the biological sciences
@@ -28,4 +28,4 @@ SUBDIR+=	sewer
 SUBDIR+=	stride
 SUBDIR+=	xylem
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/cad/Makefile b/cad/Makefile
index e6a05e24270..195c135aeee 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2007/05/09 02:41:33 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.70 2007/08/13 08:12:43 rillig Exp $
 #
 
 COMMENT=	CAD tools
@@ -77,4 +77,4 @@ SUBDIR+=	wcalc-docs
 SUBDIR+=	xchiplogo
 SUBDIR+=	xcircuit
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/chat/Makefile b/chat/Makefile
index ea2a3d76fe8..99144343286 100644
--- a/chat/Makefile
+++ b/chat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2007/08/09 15:10:12 tnn Exp $
+# $NetBSD: Makefile,v 1.127 2007/08/13 08:12:43 rillig Exp $
 #
 
 COMMENT=	Communication programs
@@ -111,4 +111,4 @@ SUBDIR+=	zephyr
 SUBDIR+=	zephyr-mode
 SUBDIR+=	zircon
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/comms/Makefile b/comms/Makefile
index 4b6ca422efe..fd87f025734 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2007/06/28 18:52:17 mjl Exp $
+# $NetBSD: Makefile,v 1.69 2007/08/13 08:12:43 rillig Exp $
 #
 
 COMMENT=	Communication utilities
@@ -62,4 +62,4 @@ SUBDIR+=	xisp
 SUBDIR+=	xtel
 SUBDIR+=	zaptel-netbsd
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/converters/Makefile b/converters/Makefile
index 1610d258bf5..da1f5cceb58 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2007/05/29 01:06:26 schmonz Exp $
+# $NetBSD: Makefile,v 1.90 2007/08/13 08:12:43 rillig Exp $
 #
 
 COMMENT=	Document format and character code converters
@@ -75,4 +75,4 @@ SUBDIR+=	xlhtml
 SUBDIR+=	xlreader
 SUBDIR+=	yencode
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/cross/Makefile b/cross/Makefile
index adf68c8261f..8f24da50040 100644
--- a/cross/Makefile
+++ b/cross/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/22 19:07:12 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/08/13 08:12:44 rillig Exp $
 #
 
 COMMENT=	Cross-platform development utilities
@@ -25,4 +25,4 @@ SUBDIR+=	icdprog
 SUBDIR+=	mipsEEel-netbsd
 SUBDIR+=	uisp
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/crosspkgtools/Makefile b/crosspkgtools/Makefile
index d425897eecc..63c6ef29947 100644
--- a/crosspkgtools/Makefile
+++ b/crosspkgtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/06/06 22:58:55 kristerw Exp $
+# $NetBSD: Makefile,v 1.3 2007/08/13 08:12:44 rillig Exp $
 #
 
 COMMENT=	Tools for cross-building pkgsrc
@@ -12,4 +12,4 @@ SUBDIR+=	crosspkg-netbsd1-netwinder
 SUBDIR+=	crosspkg-netbsd1-shark
 SUBDIR+=	kwacross-netbsd1-arm
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/databases/Makefile b/databases/Makefile
index 4f0bf5194b4..71a4c2a34c5 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.231 2007/06/10 13:53:03 abs Exp $
+# $NetBSD: Makefile,v 1.232 2007/08/13 08:12:44 rillig Exp $
 #
 
 COMMENT=	Databases
@@ -207,4 +207,4 @@ SUBDIR+=	unixodbc-ODBCConfig
 SUBDIR+=	xsqlmenu
 SUBDIR+=	yasql
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/devel/Makefile b/devel/Makefile
index ca1c91db07a..dfbf5b305da 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.880 2007/08/06 20:30:30 seb Exp $
+# $NetBSD: Makefile,v 1.881 2007/08/13 08:12:45 rillig Exp $
 #
 
 COMMENT=	Development utilities
@@ -794,4 +794,4 @@ SUBDIR+=	yasm
 SUBDIR+=	z80-asm
 SUBDIR+=	zlib
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/editors/Makefile b/editors/Makefile
index 31a65d95c95..ea0de8a4cbd 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2007/06/11 13:40:39 markd Exp $
+# $NetBSD: Makefile,v 1.120 2007/08/13 08:12:45 rillig Exp $
 #
 
 COMMENT=	Editors
@@ -113,4 +113,4 @@ SUBDIR+=	xwpe
 SUBDIR+=	yudit
 SUBDIR+=	zile
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/emulators/Makefile b/emulators/Makefile
index a74db4b6283..b17ab1fe6e2 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2007/07/29 08:55:22 jlam Exp $
+# $NetBSD: Makefile,v 1.161 2007/08/13 08:12:45 rillig Exp $
 #
 
 COMMENT=	Emulators for other operating systems
@@ -191,4 +191,4 @@ SUBDIR+=	xyame
 SUBDIR+=	z26
 SUBDIR+=	zsnes
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/filesystems/Makefile b/filesystems/Makefile
index fd20bd91ea4..cb93c8e5402 100644
--- a/filesystems/Makefile
+++ b/filesystems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/08/09 21:43:57 agc Exp $
+# $NetBSD: Makefile,v 1.20 2007/08/13 08:12:46 rillig Exp $
 #
 
 COMMENT=	File systems, and file system related packages
@@ -24,4 +24,4 @@ SUBDIR+=	fuse-wikipediafs
 SUBDIR+=	py-fuse-bindings
 SUBDIR+=	u9fs
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/finance/Makefile b/finance/Makefile
index 6e301a1c308..d05ff33be4a 100644
--- a/finance/Makefile
+++ b/finance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/07/19 19:36:20 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/08/13 08:12:46 rillig Exp $
 #
 
 COMMENT=	Monetary, financial and related applications
@@ -14,4 +14,4 @@ SUBDIR+=	xfinans
 SUBDIR+=	xinvest
 SUBDIR+=	xquote
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/fonts/Makefile b/fonts/Makefile
index bc3b1cb9183..e26adbbe4ef 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2007/07/17 19:09:01 drochner Exp $
+# $NetBSD: Makefile,v 1.105 2007/08/13 08:12:46 rillig Exp $
 #
 
 COMMENT=	Fonts
@@ -151,4 +151,4 @@ SUBDIR+=	xorg-fontsTruetype
 SUBDIR+=	xorg-fontsType1
 SUBDIR+=	xorg-fontserver
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/games/Makefile b/games/Makefile
index 7c5078d93ee..b767bdebb08 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.288 2007/07/25 22:57:43 rillig Exp $
+# $NetBSD: Makefile,v 1.289 2007/08/13 08:12:46 rillig Exp $
 #
 
 COMMENT=	Games
@@ -278,4 +278,4 @@ SUBDIR+=	xzip
 SUBDIR+=	zombies
 SUBDIR+=	zoom
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/geography/Makefile b/geography/Makefile
index 1925bcba874..3692db36d5f 100644
--- a/geography/Makefile
+++ b/geography/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/08/11 02:54:08 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2007/08/13 08:12:46 rillig Exp $
 #
 
 COMMENT=	Software for geographical-related uses
@@ -29,4 +29,4 @@ SUBDIR+=	xrmap-flags
 SUBDIR+=	xrmap-hymns
 SUBDIR+=	xrmap-pdfmaps
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/graphics/Makefile b/graphics/Makefile
index a4f17a7f8de..8e519b203a1 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.465 2007/08/10 21:21:55 gdt Exp $
+# $NetBSD: Makefile,v 1.466 2007/08/13 08:12:46 rillig Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -339,4 +339,4 @@ SUBDIR+=	xv
 SUBDIR+=	xzgv
 SUBDIR+=	zphoto
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/ham/Makefile b/ham/Makefile
index 265e8f573d3..9211598412f 100644
--- a/ham/Makefile
+++ b/ham/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/07/02 16:36:33 wulf Exp $
+# $NetBSD: Makefile,v 1.23 2007/08/13 08:12:46 rillig Exp $
 #
 
 COMMENT=	Wireless communication tools and applications
@@ -36,4 +36,4 @@ SUBDIR+=	xdx
 SUBDIR+=	xlog
 SUBDIR+=	yaesu
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/inputmethod/Makefile b/inputmethod/Makefile
index 43ce86ac3d6..ac0111c8642 100644
--- a/inputmethod/Makefile
+++ b/inputmethod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/01/03 17:23:18 obache Exp $
+# $NetBSD: Makefile,v 1.24 2007/08/13 08:12:47 rillig Exp $
 #
 
 COMMENT=	Input method tools and libraries
@@ -40,4 +40,4 @@ SUBDIR+=	uim
 SUBDIR+=	unicon-im
 SUBDIR+=	xcin
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/lang/Makefile b/lang/Makefile
index fc3fd821390..fa98030118a 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.243 2007/06/05 05:50:16 wiz Exp $
+# $NetBSD: Makefile,v 1.244 2007/08/13 08:12:47 rillig Exp $
 #
 
 COMMENT=	Programming languages
@@ -185,4 +185,4 @@ SUBDIR+=	wsbasic
 SUBDIR+=	yabasic
 SUBDIR+=	yap
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/mail/Makefile b/mail/Makefile
index 642e839731b..9d631a55f17 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.327 2007/08/08 13:22:29 smb Exp $
+# $NetBSD: Makefile,v 1.328 2007/08/13 08:12:47 rillig Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -282,4 +282,4 @@ SUBDIR+=	xmailbox
 SUBDIR+=	xmailwatcher
 SUBDIR+=	yatsvrs
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/math/Makefile b/math/Makefile
index 30b295e4e1f..520e4bbb309 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.158 2007/05/13 14:39:16 wiz Exp $
+# $NetBSD: Makefile,v 1.159 2007/08/13 08:12:47 rillig Exp $
 #
 
 COMMENT=	Mathematics
@@ -162,4 +162,4 @@ SUBDIR+=	xmgr
 SUBDIR+=	yacas
 SUBDIR+=	yorick
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/mbone/Makefile b/mbone/Makefile
index 88b041b2f9f..23656d0217e 100644
--- a/mbone/Makefile
+++ b/mbone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/02/03 15:09:44 cube Exp $
+# $NetBSD: Makefile,v 1.18 2007/08/13 08:12:47 rillig Exp $
 #
 
 COMMENT=	Multi-cast backBone applications
@@ -16,4 +16,4 @@ SUBDIR+=	sdr
 SUBDIR+=	vat
 SUBDIR+=	vic
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/meta-pkgs/Makefile b/meta-pkgs/Makefile
index d5306115a13..dc4730a7f6c 100644
--- a/meta-pkgs/Makefile
+++ b/meta-pkgs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/08/10 17:57:24 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2007/08/13 08:12:47 rillig Exp $
 #
 
 COMMENT=	Collections of other packages
@@ -33,4 +33,4 @@ SUBDIR+=	xfce4
 SUBDIR+=	xfce4-extras
 SUBDIR+=	xorg
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/misc/Makefile b/misc/Makefile
index 5a08fee0152..7c83e308efe 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.281 2007/07/17 19:04:36 drochner Exp $
+# $NetBSD: Makefile,v 1.282 2007/08/13 08:12:47 rillig Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -211,4 +211,4 @@ SUBDIR+=	yelp
 SUBDIR+=	yrolo
 SUBDIR+=	zorro
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk
index 4c599beee4a..99ef3b30a48 100644
--- a/mk/bsd.pkg.subdir.mk
+++ b/mk/bsd.pkg.subdir.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.subdir.mk,v 1.67 2007/08/13 06:03:46 rillig Exp $
+#	$NetBSD: bsd.pkg.subdir.mk,v 1.68 2007/08/13 08:12:51 rillig Exp $
 #	Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
 #
@@ -121,46 +121,6 @@ README=	../templates/README.category
 
 HTMLIFY=	${SED} -e 's/&/\&amp;/g' -e 's/>/\&gt;/g' -e 's/</\&lt;/g'
 
-.if !target(README.html)
-.PHONY: README.html
-README.html: .PRECIOUS
-	@> $@.tmp
-.for entry in ${SUBDIR}
-.if defined(PKGSRCTOP)
-	@${ECHO} '<TR><TD VALIGN=TOP><a href="'${entry}/README.html'">'"`${ECHO} ${entry} | ${HTMLIFY}`"'</a>: <TD>' >> $@.tmp
-	@${ECHO} `cd ${entry} && ${RECURSIVE_MAKE} ${MAKEFLAGS} show-comment | ${HTMLIFY}` >> $@.tmp
-.else
-	@${ECHO} '<TR><TD VALIGN=TOP><a href="'${entry}/README.html'">'"`cd ${entry}; ${RECURSIVE_MAKE} ${MAKEFLAGS} make-readme-html-help`" >> $@.tmp
-.endif
-.endfor
-	@${SORT} -t '>' +3 -4 $@.tmp > $@.tmp2
-	@${AWK} '{ ++n } END { print n }' < $@.tmp2 > $@.tmp4
-.if exists(${.CURDIR}/DESCR)
-	@${HTMLIFY} ${.CURDIR}/DESCR > $@.tmp3
-.else
-	@> $@.tmp3
-.endif
-	@${CAT} ${README} | \
-		${SED} -e 's/%%CATEGORY%%/'"`${BASENAME} ${.CURDIR}`"'/g' \
-			-e '/%%NUMITEMS%%/r$@.tmp4' \
-			-e '/%%NUMITEMS%%/d' \
-			-e '/%%DESCR%%/r$@.tmp3' \
-			-e '/%%DESCR%%/d' \
-			-e '/%%SUBDIR%%/r$@.tmp2' \
-			-e '/%%SUBDIR%%/d' \
-		> $@.tmp5
-	@if [ -f $@ ] && ${CMP} -s $@.tmp5 $@ ; then \
-		${RM} $@.tmp5 ; \
-	else \
-		${ECHO_MSG} "===>  Creating README.html for ${_THISDIR_}${.CURDIR:T}" ; \
-		${MV} $@.tmp5 $@ ; \
-	fi
-	@${RM} -f $@.tmp $@.tmp2 $@.tmp3 $@.tmp4
-.for subdir in ${SUBDIR}
-	@cd ${subdir} && ${RECURSIVE_MAKE} ${MAKEFLAGS} "_THISDIR_=${_THISDIR_}${.CURDIR:T}/" ${_README_TYPE}
-.endfor
-.endif
-
 show-comment:
 	@if [ ${COMMENT:Q}"" ]; then					\
 		${ECHO} ${COMMENT:Q};					\
diff --git a/mk/misc/category.mk b/mk/misc/category.mk
new file mode 100644
index 00000000000..b0e3239b448
--- /dev/null
+++ b/mk/misc/category.mk
@@ -0,0 +1,45 @@
+# $NetBSD: category.mk,v 1.1 2007/08/13 08:12:51 rillig Exp $
+#
+# This file contains the variables and targets for category Makefiles.
+#
+
+.include "${.PARSEDIR}/common.mk"
+
+README.html: .PRECIOUS .PHONY
+	@> $@.tmp
+.for entry in ${SUBDIR}
+.if defined(PKGSRCTOP)
+	@${ECHO} '<TR><TD VALIGN=TOP><a href="'${entry}/README.html'">'"`${ECHO} ${entry} | ${HTMLIFY}`"'</a>: <TD>' >> $@.tmp
+	@${ECHO} `cd ${entry} && ${RECURSIVE_MAKE} ${MAKEFLAGS} show-comment | ${HTMLIFY}` >> $@.tmp
+.else
+	@${ECHO} '<TR><TD VALIGN=TOP><a href="'${entry}/README.html'">'"`cd ${entry}; ${RECURSIVE_MAKE} ${MAKEFLAGS} make-readme-html-help`" >> $@.tmp
+.endif
+.endfor
+	@${SORT} -t '>' +3 -4 $@.tmp > $@.tmp2
+	@${AWK} '{ ++n } END { print n }' < $@.tmp2 > $@.tmp4
+.if exists(${.CURDIR}/DESCR)
+	@${HTMLIFY} ${.CURDIR}/DESCR > $@.tmp3
+.else
+	@> $@.tmp3
+.endif
+	@${CAT} ${README} | \
+		${SED} -e 's/%%CATEGORY%%/'"`${BASENAME} ${.CURDIR}`"'/g' \
+			-e '/%%NUMITEMS%%/r$@.tmp4' \
+			-e '/%%NUMITEMS%%/d' \
+			-e '/%%DESCR%%/r$@.tmp3' \
+			-e '/%%DESCR%%/d' \
+			-e '/%%SUBDIR%%/r$@.tmp2' \
+			-e '/%%SUBDIR%%/d' \
+		> $@.tmp5
+	@if [ -f $@ ] && ${CMP} -s $@.tmp5 $@ ; then \
+		${RM} $@.tmp5 ; \
+	else \
+		${ECHO_MSG} "===>  Creating README.html for ${_THISDIR_}${.CURDIR:T}" ; \
+		${MV} $@.tmp5 $@ ; \
+	fi
+	@${RM} -f $@.tmp $@.tmp2 $@.tmp3 $@.tmp4
+.for subdir in ${SUBDIR}
+	@cd ${subdir} && ${RECURSIVE_MAKE} ${MAKEFLAGS} "_THISDIR_=${_THISDIR_}${.CURDIR:T}/" ${_README_TYPE}
+.endfor
+
+.include "${.PARSEDIR}/../bsd.pkg.subdir.mk"
diff --git a/multimedia/Makefile b/multimedia/Makefile
index ee24b7d1b60..91859c86d61 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2007/04/27 11:21:47 martti Exp $
+# $NetBSD: Makefile,v 1.108 2007/08/13 08:12:48 rillig Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -115,4 +115,4 @@ SUBDIR+=	xine-ui
 SUBDIR+=	xvid4conf
 SUBDIR+=	xvidcore
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/net/Makefile b/net/Makefile
index 48d239481b2..791b8271066 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.675 2007/07/29 21:36:10 seb Exp $
+# $NetBSD: Makefile,v 1.676 2007/08/13 08:12:48 rillig Exp $
 #
 
 COMMENT=	Networking tools
@@ -520,4 +520,4 @@ SUBDIR+=	yougrabber
 SUBDIR+=	ytalk
 SUBDIR+=	ywho
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/news/Makefile b/news/Makefile
index d263a6cd67b..a8aeeb5370d 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/22 19:33:49 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/08/13 08:12:48 rillig Exp $
 #
 
 COMMENT=	Network news
@@ -20,4 +20,4 @@ SUBDIR+=	tin
 SUBDIR+=	trn
 SUBDIR+=	xrn
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/parallel/Makefile b/parallel/Makefile
index 4f97470e149..b4695aadc49 100644
--- a/parallel/Makefile
+++ b/parallel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/02/07 14:35:02 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2007/08/13 08:12:48 rillig Exp $
 #
 
 COMMENT=	Applications dealing with parallelism in computing
@@ -15,4 +15,4 @@ SUBDIR+=	p5-Parallel-Pvm
 SUBDIR+=	pvm3
 SUBDIR+=	sge
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/pkgtools/Makefile b/pkgtools/Makefile
index 03345c6e74a..940124d1939 100644
--- a/pkgtools/Makefile
+++ b/pkgtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2007/06/19 19:51:35 joerg Exp $
+# $NetBSD: Makefile,v 1.85 2007/08/13 08:12:48 rillig Exp $
 #
 
 COMMENT=	Tools for use in the packages collection
@@ -53,4 +53,4 @@ SUBDIR+=	verifypc
 SUBDIR+=	x11-links
 SUBDIR+=	xpkgwedge
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/print/Makefile b/print/Makefile
index 17ec27552e3..bb169aef4d5 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.174 2007/06/15 21:50:14 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.175 2007/08/13 08:12:48 rillig Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -149,4 +149,4 @@ SUBDIR+=	xpdf-turkish
 SUBDIR+=	xpp
 SUBDIR+=	yup
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/regress/Makefile b/regress/Makefile
index d159a02a4d0..5ab9a9f3082 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/03/07 21:22:20 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2007/08/13 08:12:48 rillig Exp $
 #
 
 COMMENT=	Regression tests for pkgsrc infrastructure
@@ -18,4 +18,4 @@ SUBDIR+=	print-plist
 SUBDIR+=	subst
 SUBDIR+=	tools
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/security/Makefile b/security/Makefile
index f73b46baa4e..3a7d07f1962 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.301 2007/08/02 17:28:45 he Exp $
+# $NetBSD: Makefile,v 1.302 2007/08/13 08:12:49 rillig Exp $
 #
 
 COMMENT=	Security tools
@@ -271,4 +271,4 @@ SUBDIR+=	xmlsec1
 SUBDIR+=	yafic
 SUBDIR+=	zebedee
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/shells/Makefile b/shells/Makefile
index ddd35252455..959ddb37698 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/04/01 21:22:05 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2007/08/13 08:12:49 rillig Exp $
 #
 
 COMMENT=	Shells
@@ -29,4 +29,4 @@ SUBDIR+=	xsh
 SUBDIR+=	zsh
 SUBDIR+=	zsh-current
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/sysutils/Makefile b/sysutils/Makefile
index dc4e4ca7172..3d4642f8dd6 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.407 2007/08/08 12:01:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.408 2007/08/13 08:12:49 rillig Exp $
 #
 
 COMMENT=	System utilities
@@ -355,4 +355,4 @@ SUBDIR+=	xraidadmin
 SUBDIR+=	xuvmstat
 SUBDIR+=	zidrav
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/textproc/Makefile b/textproc/Makefile
index a2564a95a5e..9ade5517d6d 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.377 2007/07/28 09:57:16 seb Exp $
+# $NetBSD: Makefile,v 1.378 2007/08/13 08:12:49 rillig Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -373,4 +373,4 @@ SUBDIR+=	xslide
 SUBDIR+=	xt
 SUBDIR+=	yodl
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/time/Makefile b/time/Makefile
index 07fd8fa3115..70994e5019b 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2007/07/02 18:06:21 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2007/08/13 08:12:49 rillig Exp $
 #
 
 COMMENT=	Clocks, calendars, daily planners and other time related applications
@@ -101,4 +101,4 @@ SUBDIR+=	xfce4-timer-plugin
 SUBDIR+=	xtimer
 SUBDIR+=	xtu
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/wm/Makefile b/wm/Makefile
index 7628f319a23..ef022cef5fd 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2007/06/20 18:12:44 tnn Exp $
+# $NetBSD: Makefile,v 1.98 2007/08/13 08:12:49 rillig Exp $
 #
 
 COMMENT=	X11 window managers, configuration tools, and themes
@@ -88,4 +88,4 @@ SUBDIR+=	wmx-gnome
 SUBDIR+=	xfce4-wm
 SUBDIR+=	xfce4-wm-themes
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/www/Makefile b/www/Makefile
index f6053d193cf..087715a0be9 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.518 2007/08/05 05:57:09 obache Exp $
+# $NetBSD: Makefile,v 1.519 2007/08/13 08:12:49 rillig Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -407,4 +407,4 @@ SUBDIR+=	zope29
 SUBDIR+=	zope3
 SUBDIR+=	zopeedit
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"
diff --git a/x11/Makefile b/x11/Makefile
index f77159bd7eb..2f4c47a97ea 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.515 2007/08/08 17:42:51 joerg Exp $
+# $NetBSD: Makefile,v 1.516 2007/08/13 08:12:50 rillig Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -518,4 +518,4 @@ SUBDIR+=	xwud
 SUBDIR+=	xxkb
 SUBDIR+=	zenity
 
-.include "../mk/bsd.pkg.subdir.mk"
+.include "../mk/misc/category.mk"