Permalink
Browse files

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.
  • Loading branch information...
1 parent 5c07dbb commit 98ffd4ac84dc5da9649220d116253b07c2fe7c20 rillig committed Aug 13, 2007
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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}; \
Oops, something went wrong.

0 comments on commit 98ffd4a

Please sign in to comment.